refactoring shell stuff

flake.lock

@@ -137,11 +137,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1751337127,
+        "lastModified": 1751361224,
-        "narHash": "sha256-mP8SC6SWFZiji6DH65PObaKUphLLCN8FoiXmVztdR5o=",
+        "narHash": "sha256-x7+c5lFhoZapaQGvkyExaF8mt5u29+4l0DJwQWUspH4=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "3e2b295e2dcad08449f48669a2d1ef2596b2e5d3",
+        "rev": "6ab8bb6826895f1ac82366eddeed184a69729e5a",
         "type": "github"
       },
       "original": {
@@ -541,11 +541,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751336185,
+        "lastModified": 1751384836,
-        "narHash": "sha256-ptnVr2x+sl7cZcTuGx/0BOE2qCAIYHTcgfA+/h60ml0=",
+        "narHash": "sha256-7xRbl/VLXxE5DzJmk1wdKWJmPx8rAfNC/a6mXtqp5cc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "96354906f58464605ff81d2f6c2ea23211cbf051",
+        "rev": "479f8889675770881033878a1c114fbfc6de7a4d",
         "type": "github"
       },
       "original": {
@@ -662,11 +662,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751031069,
+        "lastModified": 1751375534,
-        "narHash": "sha256-5TnciluG7MGHoH5abAuC8UwRVrdEu7gKcpkz/bKb9N4=",
+        "narHash": "sha256-9z1W64dDVtVxqgPzUbjIQqRfygg1hdivUOZ6d/H+yFg=",
         "owner": "nix-community",
         "repo": "nh",
-        "rev": "992aa30f55d35395b129376f16809319a9b23b16",
+        "rev": "d0abb8eebe32f79ce4659e68dd777cf497a5d3d2",
         "type": "github"
       },
       "original": {
@@ -832,11 +832,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1750837715,
+        "lastModified": 1751379130,
-        "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
+        "narHash": "sha256-TObxiGbuX/4FbOnzDRvznfMUjIgS+d71+BetT35EOB8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
+        "rev": "8b1f894089789eb39eacf0d6891d1e17cc3a84ab",
         "type": "github"
       },
       "original": {
@@ -1453,11 +1453,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1751044827,
+        "lastModified": 1751383914,
-        "narHash": "sha256-hoaujl57LLq8YxIDUKF4HNKp9I6rkqhy8DfC8OOE2js=",
+        "narHash": "sha256-v+lQnPqTUVuo/aL8pZ5kJWo9VwWUjlGTenq4FXRzYYY=",
         "owner": "Alexays",
         "repo": "Waybar",
-        "rev": "8516d457ad63880e359cb650581deb52d9fc3559",
+        "rev": "88766de1ee496c57af3823557c43d435ced3daa1",
         "type": "github"
       },
       "original": {
@@ -1500,11 +1500,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1750745566,
+        "lastModified": 1751352443,
-        "narHash": "sha256-uu3LULgJSgVBWYgdf3Za9T/kTNCu394togdfRIEqWdg=",
+        "narHash": "sha256-psuDPdulVRIl2DvVCvNfl4ZkKhUlZ/9/RvHc7vWr0js=",
         "owner": "wez",
         "repo": "wezterm",
-        "rev": "2deb317ec069b8f94ec1282253faaa71a8d997fc",
+        "rev": "54675c9c35788466f7828f5d722832bd1f310a62",
         "type": "github"
       },
       "original": {
@@ -1599,11 +1599,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751321974,
+        "lastModified": 1751383329,
-        "narHash": "sha256-0NtaKDtjY8Gmj++e8ZzpFkKFp6+7AcBW+Qefj4LihAk=",
+        "narHash": "sha256-52dUY8jEkuXEIZINYb+AVsrmw6FxMhBAG3K9J/2qiSo=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "03b5b1e1540b03e77e22a66379c3cddc3a7197f5",
+        "rev": "f29a4fece3b76c3e4579d67e2cf0cb8037f6a351",
         "type": "github"
       },
       "original": {

homes/emenel/default.nix

@@ -69,6 +69,15 @@ in
       GTRASH_PUT_RM_MODE = "true";
     };
 
+    file = {
+      ".signature".source = ./dotfiles/dot_signature;
+      ".local/bin" = {
+        source = ./dotfiles/dot_local/bin;
+        recursive = true;
+      };
+      ".ssh/config".source = ./dotfiles/dot_ssh/config;
+    };
+
     stateVersion = "25.05";
   };
 
@@ -138,27 +147,13 @@ in
       GSK_RENDERER = "ngl";
       QT_QPA_PLATFORM = "xcb";
       MOZ_ENABLE_WAYLAND = 1;
-      # XCURSOR_SIZE = 32;
-      # XCURSOR_THEME = "Bibata-Modern-Classic";
       DISPLAY = ":0";
       WAYLAND_DISPLAY="wayland-1";
       ELECTRON_OZONE_PLATFORM_HINT = "auto";
     };
-  };
+    tmpfiles.rules = [
-
+      "L /home/emenel/mounts - - - - /mnt"
-  systemd.user.tmpfiles.rules = [
+      "L /home/emenel/Documents - - - - /home/emenel/documents"
-    "L /home/emenel/mounts - - - - /mnt"
+    ];
-    "L /home/emenel/Documents - - - - /home/emenel/documents"
-  ];
-
-  home = {
-    file = {
-      ".signature".source = ./dotfiles/dot_signature;
-      ".local/bin" = {
-        source = ./dotfiles/dot_local/bin;
-        recursive = true;
-      };
-      ".ssh/config".source = ./dotfiles/dot_ssh/config;
-    };
   };
 }

modules/home/niri.nix

@@ -517,7 +517,6 @@ in
               action = spawn "/home/emenel/.local/bin/niri-screenshot-window";
               hotkey-overlay.title = "Screenshot Window";
             };
-
             "Mod+4" = {
               action = screenshot;
               hotkey-overlay.title = "Screenshot";
@@ -530,10 +529,11 @@ in
             # moving the mouse or pressing any other key.
             "Mod+Shift+P" = {
               action = power-off-monitors;
+              hotkey-overlay.title = "Power Off Monitors";
             };
             "Mod+Shift+Alt+P" = {
               hotkey-overlay.title = "Turn Laptop Display On";
-              action = spawn "niri msg output eDP-1 on";
+              action = spawn "niri" "msg" "output" "eDP-1" "on";
               allow-when-locked = true;
             };
           };

modules/home/shell-conf.nix

@@ -34,7 +34,7 @@
     unzip
     zip
     tldr
-    pkgs-stable.rich-cli
+    rich-cli
     gnupg
     imagemagick
 
@@ -84,20 +84,29 @@
     trash-cli
     poppler_utils
 
-    fishPlugins.foreign-env
-    fishPlugins.fzf-fish
-    fishPlugins.bass
-    fishPlugins.autopair
-    fishPlugins.forgit
-    fishPlugins.colored-man-pages
-
     television
     bash-env-json
     bash-env-nushell
     nufmt
     vivid
+
+    caddy
   ];
 
+  home.shellAliases = {
+    "em" = "emacsclient -n -r";
+    "fg" = "job unfreeze";
+    "emm" = "emacsclient -nw";
+    "gtr" = "gtrash restore";
+    "rmr" = "gtrash restore";
+    "rm" = "gtrash put";
+    "lg" = "lazygit";
+    "cat" = "bat --plain";
+    "sbcl" = "rlwrap sbcl";
+    "yabup" = "yabridgectl sync --prune";
+    "serve" = "caddy file-server -l :1234 -r";
+  };
+
   programs = {
     carapace = {
       enable = true;
@@ -117,6 +126,9 @@
         };
       };
     };
+    pay-respects = {
+      enable = true;
+    };
     zoxide = {
       enable = true;
     };
@@ -177,16 +189,6 @@
   xdg.configFile."rbw".source = ./shell-conf/rbw;
   xdg.configFile."isd_tui/config.yaml".source = ./shell-conf/isd_tui/config.yaml;
 
-  home.file.".config/fish/functions" = {
-    source = ./shell-conf/fish/functions;
-    recursive = true;
-  };
-
-  home.file.".config/fish/completions" = {
-    source = ./shell-conf/fish/completions;
-    recursive = true;
-  };
-
   home.file.".local/share/flf".source = ./shell-conf/flf;
 
 }

modules/home/shell-conf/fish/fish.nix

@@ -1,18 +1,16 @@
 { config, lib, pkgs, ... }:
 
 {
+  home.packages = with pkgs; [
+    fishPlugins.foreign-env
+    fishPlugins.fzf-fish
+    fishPlugins.bass
+    fishPlugins.autopair
+    fishPlugins.colored-man-pages
+  ];
+
   programs.fish = {
     enable = true;
-    shellAliases = {
-      "em" = "emacsclient -n -r";
-      "emm" = "emacsclient -nw";
-      "mkdir" = "mkdir -pv";
-      "gtr" = "gtrash restore";
-      "rmr" = "gtrash restore";
-      "rm" = "gtrash put";
-      "lg" = "lazygit";
-      "cat" = "bat --plain";
-    };
 
     # change fzf variable search to C-M-v
     interactiveShellInit = ''
@@ -31,4 +29,14 @@
       }
     ];
   };
+
+  home.file.".config/fish/functions" = {
+    source = ./functions;
+    recursive = true;
+  };
+
+  home.file.".config/fish/completions" = {
+    source = ./completions;
+    recursive = true;
+  };
 }

modules/home/shell-conf/nushell/config.nu

@@ -2,8 +2,6 @@
 $env.config.completions.external.completer = $fish_completer
 $env.LS_COLORS = (vivid generate one-dark)
 
-
-
 def --env doomup [...args] {
   doom sync ...$args
   doom gc
@@ -13,3 +11,11 @@ def --env doomup [...args] {
 def --env lla [...args] {
     ls -alm ...$args | select name size type mode
 }
+
+# def --env pullall [] {
+
+# }
+
+def pdf-compress [...args] {
+    gs -sDEVICE=pdfwrite -dPDFSETTINGS=/printer -dNOPAUSE -dBATCH -sOutputFile=output.pdf $args
+}

modules/home/shell-conf/nushell/nushell.nix

@@ -4,22 +4,14 @@
   programs.nushell = {
     enable = true;
     shellAliases = {
-      "em" = "emacsclient -n -r";
       "ls" = "ls -m";
+      "ll" = "ls -m";
       "la" = "ls -am";
       "lz" = "eza -l";
       "lza" = "eza -al";
-      "emm" = "emacsclient -nw";
+      "y" = "job spawn { wezterm --config-file ~/.config/wezterm/launcher.lua start --always-new-process --cwd (pwd) yazi }";
-      "gtr" = "gtrash restore";
-      "rmr" = "gtrash restore";
-      "rm" = "gtrash put";
-      "lg" = "lazygit";
-      "cat" = "bat --plain";
-      "y" = "wezterm --config-file ~/.config/wezterm/launcher.lua start --always-new-process --cwd (pwd) yazi &";
-      "sbcl" = "rlwrap sbcl";
-      "yabup" = "yabridgectl sync --prune";
     };
-    # configFile.source = ./config.nu;
+    configFile.source = ./config.nu;
     loginFile.text = ''
       ${pkgs.figlet}/bin/figlet -f ($env.HOME)/.local/share/flf/wavy.flf (hostname)
       '';

modules/home/yazi/init.lua

@@ -44,7 +44,7 @@ pref_by_location:setup({
 
     -- show_hidden: true|false (Optional) https://yazi-rs.github.io/docs/configuration/yazi#mgr.show_hidden
 
-    -- Match any folder with name "Downloads"
+    -- Match any folder with name "downloads"
     { location = ".*/downloads", sort = { "mtime", reverse = true, dir_first = false }, linemode = "time_and_size" },
   },
 })