OSShells, refactor shells to single option

nixosModules/apps/shells/zsh/default.nix

@@ -1,20 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  options = {
-    zsh.enable = lib.mkEnableOption "Enables zsh";
-    zsh.setDefault = lib.mkEnableOption "Sets zsh as the default user's shell";
-  };
-
-  config = lib.mkIf config.zsh.enable {
-    programs.zsh = {
-      enable = true;
-      enableCompletion = true;
-      autosuggestions.enable = true;
-      histFile = "$HOME/.config/zsh/history";
-      histSize = 2000;
-    };
-    users.defaultUserShell = lib.mkIf config.zsh.setDefault pkgs.zsh;
-    environment.shells = with pkgs; [ zsh ];
-  };
-}

nixosModules/apps/shells/zsh/shell.nix

@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+
+{
+  config = lib.mkIf (config.shell.defaultShell == "zsh") {
+    programs.zsh = {
+      enable = true;
+      enableCompletion = true;
+      autosuggestions.enable = true;
+      histFile = "$HOME/.config/zsh/history";
+      histSize = 2000;
+    };
+  };
+}