roles/home/common.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./fish.nix ./git.nix ./helix.nix ];
+  imports = [ ./zsh.nix ./git.nix ./helix.nix ];
 
   home = {
     packages = with pkgs; [

roles/home/fish.nix

@@ -1,27 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  home.packages = with pkgs; [ any-nix-shell fishPlugins.tide fishPlugins.bass ];
-
-  programs.fish = {
-    enable = true;
-
-    shellAbbrs = {
-      "_" = "sudo";
-    };
-    
-    shellInit = ''
-      # avoid macOS updates to destroy nix
-#      if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
-#        source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
-#      end
-
-      any-nix-shell fish --info-right | source
-#      source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
-
-      # disable autosuggestions
-      set -g fish_autosuggestion_enabled 0
-    '';
-  };
-}
-