Commit ba2d0a7

@@ -4,6 +4,10 @@
     enableCompletion = true;
   };
 
+  programs.fish = {
+    enable = true;
+  };
+
   programs.nushell = {
     enable = true;
     settings = {

@@ -39,12 +39,14 @@
     zoxide = {
       enable = true;
       enableBashIntegration = true;
+      enableFishIntegration = true;
       enableNushellIntegration = true;
     };
 
     carapace = {
       enable = true;
       enableBashIntegration = true;
+      enableFishIntegration = true;
       enableNushellIntegration = true;
     };
 
@@ -54,7 +56,6 @@
       settings = {
         base_url = "https://bitwarden.hpcesia.com/";
         email = "me@hpcesia.com";
-        pinentry = pkgs.pinentry-qt;
       };
     };
 

@@ -14,11 +14,11 @@ keybindings.apply(config)
 -- 关闭窗口时无提示
 config.window_close_confirmation = "NeverPrompt"
 
--- if wezterm.target_triple == 'x86_64-pc-windows-msvc' then
---   config.default_prog = { 'pwsh' }
--- else
---   config.default_prog = { 'bash' }
--- end
-config.default_prog = { "nu" }
+if wezterm.target_triple == 'x86_64-pc-windows-msvc' then
+  config.default_prog = { 'pwsh' }
+else
+  config.default_prog = { 'fish' }
+end
+-- config.default_prog = { "nu" }
 
 return config

@@ -68,9 +68,4 @@
     stylelint-lsp
     nodePackages.prettier
   ];
-
-  programs.nushell.extraConfig = ''
-    mkdir ($nu.data-dir | path join "vendor/autoload")
-    tinymist completion nushell | save -f ($nu.data-dir | path join "vendor/autoload/tinymist.nu")
-  '';
 }

@@ -3,6 +3,7 @@
     enable = true;
 
     enableBashIntegration = true;
+    enableFishIntegration = true;
     enableNushellIntegration = true;
 
     settings = builtins.fromTOML (builtins.readFile ./starship.toml);

@@ -2,6 +2,7 @@
   programs.yazi = {
     enable = true;
     enableBashIntegration = true;
+    enableFishIntegration = true;
     enableNushellIntegration = true;
     plugins = {
       git = pkgs.yaziPlugins.git;

@@ -1,10 +1,10 @@
-{nu-scripts, ...}: {
+{...}: {
   programs.zellij = {
     enable = true;
     settings = {
       show_startup_tips = false;
       show_release_notes = false;
-      default_shell = "nu";
+      default_shell = "fish";
     };
   };
 
@@ -26,8 +26,4 @@
   #     }
   #   }
   # '';
-
-  programs.nushell.extraConfig = ''
-    source ${nu-scripts}/custom-completions/zellij/zellij-completions.nu
-  '';
 }

@@ -8,6 +8,7 @@
     fastfetch
     helix
     nushell
+    fish
     git
 
     # archives

@@ -6,6 +6,7 @@
   # add user's shell into /etc/shells
   environment.shells = with pkgs; [
     bashInteractive
+    fish
     nushell
   ];
   # set user's default shell system-wide