Switch default shell back to fish

flake.nix

@@ -20,7 +20,7 @@
         user = "xenia";
         system = "x86_64-linux";
         group = "users";
-        shell = "zsh";
+        shell = "fish";
         systemModules = [ ./system/hyprland.nix ];
         homeModules = [
           ./home/accounts/default.nix

home/default.nix

@@ -32,53 +32,40 @@
   };
   programs = {
     bash.enable = true;
-    fish.enable = true;
     nushell.enable = true;
-    zsh = {
+    fish = {
       enable = true;
-      enableAutosuggestions = true;
+      interactiveShellInit = "enable_transience";
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-      enableVteIntegration = true;
-      autocd = true;
-      dotDir = ".config/zsh";
-      historySubstringSearch.enable = true;
-      history.path = "${config.xdg.dataHome}/zsh/history";
-      initExtra = ''
-        xdg-query-program () {
-          FILETYPE=$(xdg-mime query filetype $@)
-          DEFAULT=$(xdg-mime query default $FILETYPE)
-          echo "$FILETYPE -> $DEFAULT"
-        }
-        rsync-local-config () {
-          HOST=$1
-          for TARGET in bat git emacs/init.el emacs/templates starship.toml; do
-            SOURCE="${config.xdg.configHome}/$TARGET"
-            TMP_TARGET=/tmp/rsync-local-config
-            TMP_SOURCE=$TMP_TARGET
-            NIX_SED="${pkgs.gnused}/bin/sed -i 's|/nix/.*/bin/||g'"
-            NIX_REPLACE="$NIX_SED $TMP_TARGET"
-            if [[ -e ${config.xdg.configHome}/$TARGET ]]; then
-              if [[ -d $SOURCE ]]; then
-                SOURCE=$SOURCE/
-                TMP_SOURCE=$TMP_SOURCE/
-                NIX_REPLACE="${pkgs.fd}/bin/fd -g '**' $TMP_TARGET -tfile -x $NIX_SED {};"
-              fi
-              ${pkgs.rsync}/bin/rsync -avzL --exclude=".git*" $SOURCE $TMP_TARGET
-              ${pkgs.coreutils}/bin/chmod u+rw -R $TMP_SOURCE
-              ${pkgs.bash}/bin/sh -c "$NIX_REPLACE"
-              ${pkgs.rsync}/bin/rsync -avzL --delete --exclude=".git*" $TMP_SOURCE $HOST:.config/$TARGET
-              ${pkgs.coreutils}/bin/rm -rf $TMP_SOURCE
-            fi
-          done
-        }
-      '';
-      oh-my-zsh = {
-        enable = true;
-        plugins = [ "colored-man-pages" "lol" "rand-quote" ];
-        theme = "";
-      };
     };
+    zsh.initExtra = ''
+      xdg-query-program () {
+        FILETYPE=$(xdg-mime query filetype $@)
+        DEFAULT=$(xdg-mime query default $FILETYPE)
+        echo "$FILETYPE -> $DEFAULT"
+      }
+      rsync-local-config () {
+        HOST=$1
+        for TARGET in bat git emacs/init.el emacs/templates starship.toml; do
+          SOURCE="${config.xdg.configHome}/$TARGET"
+          TMP_TARGET=/tmp/rsync-local-config
+          TMP_SOURCE=$TMP_TARGET
+          NIX_SED="${pkgs.gnused}/bin/sed -i 's|/nix/.*/bin/||g'"
+          NIX_REPLACE="$NIX_SED $TMP_TARGET"
+          if [[ -e ${config.xdg.configHome}/$TARGET ]]; then
+            if [[ -d $SOURCE ]]; then
+              SOURCE=$SOURCE/
+              TMP_SOURCE=$TMP_SOURCE/
+              NIX_REPLACE="${pkgs.fd}/bin/fd -g '**' $TMP_TARGET -tfile -x $NIX_SED {};"
+            fi
+            ${pkgs.rsync}/bin/rsync -avzL --exclude=".git*" $SOURCE $TMP_TARGET
+            ${pkgs.coreutils}/bin/chmod u+rw -R $TMP_SOURCE
+            ${pkgs.bash}/bin/sh -c "$NIX_REPLACE"
+            ${pkgs.rsync}/bin/rsync -avzL --delete --exclude=".git*" $TMP_SOURCE $HOST:.config/$TARGET
+            ${pkgs.coreutils}/bin/rm -rf $TMP_SOURCE
+          fi
+        done
+      }
+    '';
     eza = {
       enable = true;
       git = true;
@@ -97,13 +84,12 @@
       enable = true;
       nix-direnv.enable = true;
       enableBashIntegration = true;
-      enableZshIntegration = true;
       enableNushellIntegration = true;
     };
     fzf = {
       enable = true;
       enableBashIntegration = true;
-      enableZshIntegration = true;
+      enableFishIntegration = true;
     };
     bat.enable = true;
     git = {
@@ -173,7 +159,6 @@
     starship = {
       enable = true;
       enableBashIntegration = true;
-      enableZshIntegration = true;
       enableFishIntegration = true;
       enableNushellIntegration = true;
       settings = {