modularizing

modules/home/emacs.nix

@@ -18,6 +18,10 @@ let
         epkgs.pdf-tools
         epkgs.all-the-icons
         epkgs.eldoc
+        epkgs.tablist
+        epkgs.parseedn
+        epkgs.parseclj
+        epkgs.track-changes
       ]
     ));
 in {

modules/home/git-conf.nix

@@ -1,42 +1,48 @@
 { pkgs, ... }:
 
 {
-   programs.git = {
+  home.packages = with pkgs; [
+    # git-annex
+    bfg-repo-cleaner
+    delta
+  ];
+
+  programs.git = {
+    enable = true;
+    lfs = {
       enable = true;
-      lfs = {
-        enable = true;
+    };
+    userEmail = "matt@emenel.ca";
+    userName = "Matt Nish-Lapidus";
+    ignores = [
+      ".DS_Store"
+    ];
+    extraConfig = {
+      core = {
+        editor = "$EDITOR";
+        pager = "${pkgs.delta}/bin/delta";
       };
-      userEmail = "matt@emenel.ca";
-      userName = "Matt Nish-Lapidus";
-      ignores = [
-        ".DS_Store"
-      ];
-      extraConfig = {
-        core = {
-          editor = "$EDITOR";
-          pager = "${pkgs.delta}/bin/delta";
-        };
-        interactive = {
-          diffFilter = "${pkgs.delta}/bin/delta --color-only";
-        };
-        delta = {
-          navigate = true;
-          dark = true;
-          line-numbers = true;
-          side-by-side = true;
-        };
-        merge = {
-          conflictstyle = "zdiff3";
-        };
-        init = {
-          defaultBranch = "main";
-        };
+      interactive = {
+        diffFilter = "${pkgs.delta}/bin/delta --color-only";
       };
-      aliases = {
-        co = "checkout";
-        cm = "commit -m";
-        aa = "add .";
-        p = "push";
+      delta = {
+        navigate = true;
+        dark = true;
+        line-numbers = true;
+        side-by-side = true;
+      };
+      merge = {
+        conflictstyle = "zdiff3";
+      };
+      init = {
+        defaultBranch = "main";
       };
     };
+    aliases = {
+      co = "checkout";
+      cm = "commit -m";
+      a = "add .";
+      p = "push";
+    };
+  };
 }

modules/home/shell-conf.nix

@@ -23,12 +23,9 @@
     zip
     tldr
     rich-cli
-    (btop-rocm.override { cudaSupport = true; })
     gnupg
     imagemagick
-    gnutls
-    # gettext
-    gnumake
+
     nix-du
     nix-melt
     usbutils
@@ -40,27 +37,22 @@
     exiftool
     libsecret
     shellcheck
-    # libffi.dev
-    # nodejs_18
-    # platformio-core
+
     icloudpd
     pkg-config
-    # ftgl
-    # gperf
+
+
     numbat
-    # glpng
+
     nurl
     fastfetch
     nvd
     ripgrep-all
     silver-searcher
-    # powertop
-    age
-    # kdotool
-    manix
 
+    age
+    manix
     caligula
-    # sqlite
 
     yaml-language-server
     typescript-language-server
@@ -85,8 +77,6 @@
     haskell-language-server
     emacs-lsp-booster
 
-    zstd
-
     black
     jsbeautifier
     typescript
@@ -100,9 +90,6 @@
 
     dua
 
-    # git-annex
-    bfg-repo-cleaner
-    delta
     tree
     emoji-picker
 
@@ -113,13 +100,14 @@
     fishPlugins.forgit
     fishPlugins.colored-man-pages
 
+    sox
+
     imgcat
     ghostscript
     playerctl
 
     tesseract
-    # alsa-utils
-    # alsa-tools
+
     dockfmt
 
     trash-cli