12 files changed, 49 insertions, 39 deletions
diff --git a/home/default.nix b/home/default.nix
index 035bdb6..f2111db 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -12,7 +12,6 @@
     ./evince
     ./feh
     ./firefox
-    ./fish
     ./flac
     ./gcloud
     ./git
@@ -27,6 +26,7 @@
     ./python
     ./scanner
     ./seahorse
+    ./shell
     ./ssh
     ./sublime-music
     ./terminal
@@ -36,6 +36,5 @@
     ./wm
     ./xdg
     ./yt-dlp
-    ./zsh
   ];
 }
diff --git a/home/direnv/default.nix b/home/direnv/default.nix
index f36a66c..9d8d419 100644
--- a/home/direnv/default.nix
+++ b/home/direnv/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let
   cfg = config.my.home.direnv;
-  fishEnabled = config.my.home.fish.enable;
+  fishEnabled = config.my.home.shell.name == "fish";
 in
 {
   options.my.home.direnv = with lib; {
diff --git a/home/fish/default.nix b/home/fish/default.nix
deleted file mode 100644
index 7ff4bbe..0000000
--- a/home/fish/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.my.home.fish;
-  swayEnabled = config.my.home.wm.windowManager == "sway";
-in
-{
-  options.my.home.fish = with lib; {
-    enable = mkEnableOption "fish configuration";
-  };
-  config.programs.fish = lib.mkIf cfg.enable {
-    enable = true;
-    interactiveShellInit = ''
-      set fish_greeting
-
-      # Tmux on terminal start, unless we're in a SSH connection
-      if status is-interactive
-        if test -z "$SSH_CONNECTION"
-          if not tmux has-session 2>/dev/null; or test -z "$TMUX"
-            exec tmux new-session -A -s 0
-          end
-        end
-      end
-    '';
-    loginShellInit = lib.mkIf swayEnabled ''
-      if test -z "$DISPLAY"; and test (tty) = "/dev/tty1"
-        exec sway
-      end
-    '';
-  };
-}
diff --git a/home/shell/default.nix b/home/shell/default.nix
new file mode 100644
index 0000000..35a6275
--- /dev/null
+++ b/home/shell/default.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let cfg = config.my.home.shell;
+in
+{
+  options.my.home.shell = {
+    name = mkOption {
+      default = "zsh";
+      type = types.enum [ "fish" "zsh" ];
+      example = "zsh";
+    };
+  };
+
+  imports = [ ./fish ./zsh ];
+}
diff --git a/home/shell/fish/default.nix b/home/shell/fish/default.nix
new file mode 100644
index 0000000..3a21b24
--- /dev/null
+++ b/home/shell/fish/default.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.shell;
+  swayEnabled = config.my.home.wm.windowManager == "sway";
+in
+{
+  config = lib.mkIf (cfg.name == "fish") {
+    programs.fish = {
+      enable = true;
+      interactiveShellInit = ''
+        set fish_greeting
+
+        # Tmux on terminal start, unless we're in a SSH connection
+        if status is-interactive
+          if test -z "$SSH_CONNECTION"
+            if not tmux has-session 2>/dev/null; or test -z "$TMUX"
+              exec tmux new-session -A -s 0
+            end
+          end
+        end
+      '';
+      loginShellInit = lib.mkIf swayEnabled ''
+        if test -z "$DISPLAY"; and test (tty) = "/dev/tty1"
+          exec sway
+        end
+      '';
+    };
+  };
+}
diff --git a/home/zsh/completion-style.zsh b/home/shell/zsh/completion-style.zsh
index 32bd6f4..32bd6f4 100644
--- a/home/zsh/completion-style.zsh
+++ b/home/shell/zsh/completion-style.zsh
diff --git a/home/zsh/default.nix b/home/shell/zsh/default.nix
index 21dbedd..14ddd6c 100644
--- a/home/zsh/default.nix
+++ b/home/shell/zsh/default.nix
@@ -1,12 +1,8 @@
 { config, pkgs, lib, ... }:
-let cfg = config.my.home.zsh;
+let cfg = config.my.home.shell;
 in
 {
-  options.my.home.zsh = with lib; {
-    enable = mkEnableOption "zsh configuration";
-  };
-
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.name == "zsh") {
     home.packages = with pkgs; [ zsh-completions ];
 
     programs.zsh = {
diff --git a/home/zsh/gerrit.zsh b/home/shell/zsh/gerrit.zsh
index 9766b2f..9766b2f 100644
--- a/home/zsh/gerrit.zsh
+++ b/home/shell/zsh/gerrit.zsh
diff --git a/home/zsh/options.zsh b/home/shell/zsh/options.zsh
index 6d39bc1..6d39bc1 100644
--- a/home/zsh/options.zsh
+++ b/home/shell/zsh/options.zsh
diff --git a/home/zsh/prompt.zsh b/home/shell/zsh/prompt.zsh
index 1c21d4b..1c21d4b 100644
--- a/home/zsh/prompt.zsh
+++ b/home/shell/zsh/prompt.zsh
diff --git a/home/zsh/sway.zsh b/home/shell/zsh/sway.zsh
index 69d5103..69d5103 100644
--- a/home/zsh/sway.zsh
+++ b/home/shell/zsh/sway.zsh
diff --git a/home/zsh/tmux.zsh b/home/shell/zsh/tmux.zsh
index 97944f5..97944f5 100644
--- a/home/zsh/tmux.zsh
+++ b/home/shell/zsh/tmux.zsh