diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 9584f07b0945..c5c0f9d01215 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -40,6 +40,7 @@ in programs.bash = { + /* enable = mkOption { default = true; description = '' @@ -52,6 +53,7 @@ in ''; type = types.bool; }; + */ shellAliases = mkOption { default = config.environment.shellAliases // { which = "type -P"; }; @@ -114,7 +116,7 @@ in }; - config = mkIf cfg.enable { + config = /* mkIf cfg.enable */ { programs.bash = { diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 7bcf8da2c659..a3efad288ac2 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -168,7 +168,7 @@ in environment.systemPackages = [ pkgs.zsh ]; - users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; + #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; environment.shells = [ "/run/current-system/sw/bin/zsh" diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1a0c7c0168cf..0ee2caa28ea4 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -128,5 +128,6 @@ in zipModules ([] # Options that are obsolete and have no replacement. ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ] ++ obsolete' [ "boot" "initrd" "luks" "enable" ] +++ obsolete' [ "programs" "bash" "enable" ] )