modularizing

flake.lock

@@ -70,11 +70,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1741710368,
+        "lastModified": 1741771598,
-        "narHash": "sha256-P9Qt8QQC6cFssiIvNEmj8BabRZS7EWMqCrA3oNj70x4=",
+        "narHash": "sha256-nEfO1JskMvwDa0cf13LHdQO/QCM1ioCr8nU+ZOIO+ug=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "2695d53827b4200a195f932a5beb47fe5f9e3213",
+        "rev": "04d8748de599621ca0ae7f9766c489adf45d63de",
         "type": "github"
       },
       "original": {
@@ -339,11 +339,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741701235,
+        "lastModified": 1741785612,
-        "narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=",
+        "narHash": "sha256-3NFLoC7AdenUJQHzPiHDYVBEgEIH6mGSbdx7GFbRURA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e",
+        "rev": "144f13f535be35c906241043f6bfcf21c1c419a0",
         "type": "github"
       },
       "original": {
@@ -726,11 +726,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1741686876,
+        "lastModified": 1741758053,
-        "narHash": "sha256-Kt37Zm9YcQoe/aRVbPFydZcfwIrEAg/U+iz3FcxsOZs=",
+        "narHash": "sha256-rnPHLxMtJXpX8xo2Sb70iTidsUdXhuKT9673FQQzFzI=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "fa230971ab63885ba5666588a7b78f75f73d5a85",
+        "rev": "cbd000ded3527a860178556090bdb4e8df3b5370",
         "type": "github"
       },
       "original": {
@@ -1447,11 +1447,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1741140299,
+        "lastModified": 1741757154,
-        "narHash": "sha256-Y2bPO92Yg5HcH5ORvrVOQb4wRGEapGEteHXGtNvboxk=",
+        "narHash": "sha256-Gr0m144I3kTZ4HZxOpAnQYyyhvyAAN0lEMrSQ3HyxMI=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "10cb041a80bb815cc1789cfa305923f1f9e3713d",
+        "rev": "3c50b7da7963e299e47295352c9a1da1c37b4254",
         "type": "github"
       },
       "original": {
@@ -1469,11 +1469,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1741677570,
+        "lastModified": 1741760227,
-        "narHash": "sha256-huQexOJPJ+tASUxRw8cAXTPvu6Qh043hatH+PFGBgeg=",
+        "narHash": "sha256-5yZ3FQZFG0DSssr8NRa+JWGOojHLDFG2L+icNVnj+tw=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "faee35fc44bd6cfe924410f1a3dc3b8b8eb12fa5",
+        "rev": "abfbd1cd9f0dd428d134f257ec89c25dac842b65",
         "type": "github"
       },
       "original": {

homes/emenel/default.nix

@@ -21,28 +21,13 @@
       ]
 
       (with pkgs; [
-        # sambaFull
         dconf
-        # xorg.libX11
-        # xorg.libxcb
-        # freetype
-        # alsa-utils
-        # alsa-oss
-        # dbus
         cifs-utils
         sops
-
+        (btop.override { cudaSupport = true; rocmSupport = true; })
         ispell
         (aspellWithDicts (dicts: with dicts; [ en en-computers en-science es fr ]))
         texlive.combined.scheme-full
-
-        # spice
-        # spice-gtk
-        # spice-protocol
-        # virt-viewer
-
-
-        # borgbackup
       ])
     ];
 
@@ -102,45 +87,6 @@
     pandoc.enable = true;
     password-store.enable = true;
 
-    git = {
-      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";
-        };
-        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";
-        };
-      };
-      aliases = {
-        co = "checkout";
-        cm = "commit -m";
-        aa = "add .";
-        p = "push";
-      };
-    };
-
     borgmatic = {
       enable = true;
       backups = {

homes/emenel/dotfiles/dot_config/fish/functions/beet-import.fish

@@ -1,5 +0,0 @@
-#!/usr/bin/env fish
-
-function beet-import --description 'import new music on media server from the import dir'
-    ssh media@media-server -x "beet import -amw ~/import/"
-end

homes/media/default.nix

@@ -9,6 +9,7 @@
   home = {
     packages = with pkgs; [
       beets
+      btop
     ];
 
     username = "media";

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,6 +1,12 @@
 { pkgs, ... }:
 
 {
+  home.packages = with pkgs; [
+    # git-annex
+    bfg-repo-cleaner
+    delta
+  ];
+
   programs.git = {
     enable = true;
     lfs = {
@@ -35,7 +41,7 @@
     aliases = {
       co = "checkout";
       cm = "commit -m";
-        aa = "add .";
+      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