cleanup

nix/home-manager/progs/borg.nix

@@ -9,18 +9,19 @@
         # stuff in my home directory:
         ++ (map (f: "${homeDirectory}/${f}") [
           ".zen"
-          "dotfiles"
+          ".local/share/fish"
+          ".gnupg"
           ".config/home-manager"
           ".config/Signal"
+          ".wallpaper.png"
+          ".ssh"
+
+          "dotfiles"
           "Documents"
           "projects"
           "Pictures"
           "school"
-          ".wallpaper.png"
-          ".ssh"
           "justfile"
-          ".local/share/fish"
-          ".gnupg"
         ]);
 
       excludeHomeManagerSymlinks = true;

nix/home-manager/progs/fish.nix

@@ -13,30 +13,34 @@
     PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch
   '';
 
-  shellAliases = {
-    c = "${pkgs.cargo}/bin/cargo";
-    cr = "${pkgs.cargo}/bin/cargo run";
-    cb = "${pkgs.cargo}/bin/cargo build";
+  shellAliases =
+    let
+      eza_common = "${pkgs.eza}/bin/eza --color=always --group-directories-first";
+    in
+    {
+      c = "${pkgs.cargo}/bin/cargo";
+      cr = "${pkgs.cargo}/bin/cargo run";
+      cb = "${pkgs.cargo}/bin/cargo build";
 
-    # from DistroTube's dot files: Changing "ls" to "eza"
-    ls = "${pkgs.eza}/bin/eza -al --color=always --group-directories-first";
-    la = "${pkgs.eza}/bin/eza -a --color=always --group-directories-first";
-    ll = "${pkgs.eza}/bin/eza -l --color=always --group-directories-first";
-    lt = "${pkgs.eza}/bin/eza -aT --color=always --group-directories-first";
+      # from DistroTube's dot files: Changing "ls" to "eza"
+      ls = "${eza_common} -al";
+      la = "${eza_common} -a";
+      ll = "${eza_common} -l";
+      lt = "${eza_common} -aT";
 
-    # gets the largest files in a git repo's history
-    "git-size" = ''
-      ${pkgs.git}/bin/git rev-list --objects --all |
-              ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' |
-              ${pkgs.gnused}/bin/sed -n 's/^blob //p' |
-              ${pkgs.coreutils}/bin/sort --numeric-sort --key=2 |
-              ${pkgs.coreutils}/bin/cut -c 1-12,41- |
-              ${pkgs.coreutils}/bin/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest'';
+      # gets the largest files in a git repo's history
+      "git-size" = ''
+        ${pkgs.git}/bin/git rev-list --objects --all |
+                ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' |
+                ${pkgs.gnused}/bin/sed -n 's/^blob //p' |
+                ${pkgs.coreutils}/bin/sort --numeric-sort --key=2 |
+                ${pkgs.coreutils}/bin/cut -c 1-12,41- |
+                ${pkgs.coreutils}/bin/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest'';
 
-    #aliases for (I think) macos commands
-    pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy";
-    pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste";
-  };
+      #aliases for (I think) macos commands
+      pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy";
+      pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste";
+    };
 
   shellInit = ''
     fish_add_path ~/.local/bin

nix/home-manager/progs/niri.nix

@@ -38,7 +38,7 @@
   binds = with config.lib.niri.actions; {
     #application launcher
     "Mod+Space".action = spawn [
-      "rofi"
+      "${pkgs.rofi-wayland}/bin/rofi"
       "-show"
       "combi"
     ];