keyboard mod changes, cleanup

modules/home/desktop.nix

@@ -155,6 +155,9 @@
 
     shaderbg
 
+    zulip
+    element-desktop
+
   ];
 
   home.pointerCursor = {

modules/home/shell-conf.nix

@@ -110,9 +110,9 @@
   };
 
   programs = {
-    carapace = {
-      enable = true;
-    };
+    # carapace = {
+    #   enable = true;
+    # };
     bash = {
       enable = true;
     };

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

@@ -16,8 +16,9 @@ def --env doomup [...args] {
   systemctl --user restart emacs.service
 }
 
-def --env lla [...args] {
-    ls -alm ...$args | select name type size modified mode user
+def --env lla [...pattern: glob] {
+    let pattern = if ($pattern | is-empty) { [ '.' ] } else { $pattern }
+    nuls -alm $pattern | select name type size modified mode user
 }
 
 # def --env pullall [] {

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

@@ -0,0 +1,19 @@
+        let fish_completer = {|spans|
+            let completions = fish --command $'complete "--do-complete=($spans | str join " ")"'
+            | from tsv --flexible --noheaders --no-infer
+            | rename value description
+
+            let has_paths = ($completions | any {|row| $row.value =~ '/' or $row.value =~ '\\.\\w+$' or $row.value =~ ' '})
+
+            if $has_paths {
+                $completions | update value {|row|
+                    if $row.value =~ ' ' {
+                        $"'($row.value)'"  # Wrap in single quotes
+                    } else {
+                        $row.value
+                    }
+                }
+            } else {
+                $completions
+            }
+         }

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

@@ -8,6 +8,7 @@
   programs.nushell = {
     enable = true;
     shellAliases = {
+      "nuls" = "ls";
       "ls" = "ls -m";
       "ll" = "ls -m";
       "la" = "ls -am";
@@ -16,6 +17,7 @@
       "y" = "job spawn { wezterm --config-file ~/.config/wezterm/launcher.lua start --always-new-process --cwd (pwd) yazi }";
     };
     configFile.source = ./config.nu;
+    envFile.source = ./env.nu;
     loginFile.text = ''
       ${pkgs.figlet}/bin/figlet -f ($env.HOME)/.local/share/flf/wavy.flf (hostname)
       '';
@@ -47,27 +49,6 @@
         };
       };
     };
-    extraEnv = ''
-        let fish_completer = {|spans|
-            let completions = fish --command $'complete "--do-complete=($spans | str join " ")"'
-            | from tsv --flexible --noheaders --no-infer
-            | rename value description
-
-            let has_paths = ($completions | any {|row| $row.value =~ '/' or $row.value =~ '\\.\\w+$' or $row.value =~ ' '})
-
-            if $has_paths {
-                $completions | update value {|row|
-                    if $row.value =~ ' ' {
-                        $"'($row.value)'"  # Wrap in single quotes
-                    } else {
-                        $row.value
-                    }
-                }
-            } else {
-                $completions
-            }
-         }
-      '';
     plugins = [ pkgs.nushellPlugins.skim ];
   };
 }

modules/home/yazi.nix

@@ -156,7 +156,7 @@
       };
       opener = {
         edit = [
-          { run = "emacsclient -r \"$@\""; desc = "emacsclient"; orphan = true; block = false; }
+          { run = "emacsclient -n -r \"$@\""; desc = "emacsclient"; orphan = true; block = false; }
           { run = "nano \"$@\""; desc = "nano"; orphan = false; block = true; }
         ];
         extract = [