refactoring shell stuff

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";
-      "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";
+      "y" = "job spawn { wezterm --config-file ~/.config/wezterm/launcher.lua start --always-new-process --cwd (pwd) yazi }";
     };
-    # 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" },
   },
 })