Clean up some duplicated definitions

homes/x86_64-linux/christopher@cobalt/config.nix

@@ -1,6 +1,5 @@
 {lib, ...}:
-with builtins; let
+with builtins;
-  # Determines whether the given file name ends with ".nix"
+  map
-  endsWithNix = fileName: substring (lib.trivial.max 0 (stringLength fileName - 4)) 4 fileName == ".nix";
+  (name: ./config + "/${name}")
-in
+  (filter (lib.strings.hasSuffix ".nix") (attrNames (readDir ./config)))
-  map (name: ./config + "/${name}") (filter endsWithNix (attrNames (readDir ./config)))

homes/x86_64-linux/christopher@cobalt/config/dev.nix

@@ -1,24 +1,18 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    # Dev tools
-    direnv
-    silver-searcher # ag search tool
     zx # Tool for writing better scripts
     trurl # Parsing and manipulating URLs via CLI
     onefetch # Git information tool
-    cloc # Line-of-code calc for entire project
     tokei # Like cloc
-    delta # Diffing tool
     zeal # Offline documentation browser
     just # Just a command runner
+    claude-code
 
     # Build tools
     cargo
     glibc
     gcc
 
-    claude-code
-
     php82
     php82Packages.composer
 
@@ -27,24 +21,8 @@
     nodejs_20.pkgs.pnpm
   ];
 
-  # `nix-shell` replacement for project development
-  # Most useful with `pkgs.direnv`
-  services.lorri.enable = true;
   programs.direnv.enable = true;
   programs.direnv.nix-direnv.enable = true;
 
   programs.go.enable = true;
-
-  programs.neovim = {
-    enable = false;
-    # defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-
-    # extraConfig = lib.fileContents ../fixtures/neovim/init.vim;
-
-    #plugins = with pkgs.vimPlugins; [
-    #  nvim-treesitter.withAllGrammars
-    #];
-  };
 }

homes/x86_64-linux/christopher@cobalt/config/fonts.nix

@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
+    font-manager
     nerd-fonts.monaspace # Patched fonts
     google-fonts # Google fonts
     monaspace

homes/x86_64-linux/christopher@cobalt/config/git.nix

@@ -4,7 +4,8 @@
     git
     gh
     gitAndTools.git-absorb
-    delta
+    delta # Diffing tool
+    onefetch # neofetch for git repos
 
     pkgs._elements.git-delete-stale
   ];

homes/x86_64-linux/christopher@cobalt/default.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   config,
-  lib,
   ...
 } @ all: {
   imports =

homes/x86_64-linux/christopher@cobalt/editors/nvim/default.nix

@@ -1,19 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  home.packages = with pkgs; [neovim ripgrep];
-
-  xdg.configFile.nvim.source = ./config;
-
-  # Install the packer.nvim plugin manager
-  home.file = {
-    ".local/state/nix/profile/share/nvim/site/pack/packer/start/packer.nvim".source = pkgs.fetchFromGitHub {
-      owner = "wbthomason";
-      repo = "packer.nvim";
-      rev = "ea0cc3c";
-      sha256 = "fLM+ptjMd1YNoJQEI0vvr4sjaay7dfpaGhvWUy91d1M=";
-    };
-  };
-}

homes/x86_64-linux/christopher@cobalt/global/terminal/default.nix

@@ -20,6 +20,7 @@ in {
     BROWSER = "firefox";
     TERMINAL = "kitty";
     EDITOR = "hx";
+    TERM = "xterm-color";
     # QT_QPA_PLATFORMTHEME = "qt5ct";
 
     # auto-run programs using nix-index-database

homes/x86_64-linux/christopher@cobalt/global/terminal/programs/cli.nix

@@ -1,33 +1,17 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  config,
-  ...
-}: {
   home.packages = with pkgs; [
     # Shell software
     fzf # Fuzzy finding
-    eza # ls alternative
+    bat # cat alternative
-    httpie # HTTP client / CURL alternative
     yazi # Terminal file manager
-
-    # Little thingies
-    gum
-
-    gh
-    gitAndTools.git-absorb
-    direnv
-
     zellij # terminal workspace
     silver-searcher # ag search tool
-    zx # Tool for writing better scripts
+    gum
-    trurl # Parsing and manipulating URLs via CLI
+
-    onefetch # Git information tool
+    httpie # HTTP client / CURL alternative
-    cloc # Line-of-code calc for entire project
-    delta # Diffing tool
 
     genact # Jibberish output ("I'm waiting for a compile.")
     cbonsai # Create bonsai trees
-    wtfutil
   ];
 
   programs = {

homes/x86_64-linux/christopher@cobalt/global/terminal/shell/aliases.nix

@@ -3,12 +3,12 @@
     elements = "just -f ~/.dotfiles/Justfile -d ~/.dotfiles";
     elem = "elements";
     g = "git";
-    copy = lib.mkDefault "xclip -sel clip";
+    copy = lib.mkDefault "wl-copy";
     inspect = "tmux -f ~/.tmux.inspect.conf new-session ssh inspect";
     ansi = "sed -r \"s/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[mGK]//g\"";
-    ssh = "TERM=xterm-color ssh";
     calc = "numbat --pretty-print never -e";
     pcalc = "numbat --pretty-print always -e";
+    cat = "bat";
     vim = "hx";
     vi = "hx";
   };