diff --git a/machines/configurations.nix b/machines/configurations.nix index 8480a56..a952899 100644 --- a/machines/configurations.nix +++ b/machines/configurations.nix @@ -1,4 +1,4 @@ -{ self, lib, ... }: +{ self, ... }: let inherit (self.inputs) disko @@ -46,7 +46,6 @@ let } { my.profiles.core.enable = true; - my.profiles.zsh.enable = lib.mkDefault true; } ../modules ../profiles diff --git a/modules/services/remote-build/default.nix b/modules/services/remote-build/default.nix index faa770c..e40f0bb 100644 --- a/modules/services/remote-build/default.nix +++ b/modules/services/remote-build/default.nix @@ -19,6 +19,7 @@ in users.users.nixremote = { isSystemUser = true; group = "nixremote"; + shell = pkgs.bashInteractive; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYSzDdxqaNHmaaLqEvOK/vB65zvqoCebI3Nxzgg5smq root@workman" ]; diff --git a/profiles/default.nix b/profiles/default.nix index f454d45..4f95122 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -23,6 +23,5 @@ ./update ./usb-iso ./webcam - ./zsh ]; } diff --git a/profiles/zsh/default.nix b/profiles/zsh/default.nix deleted file mode 100644 index 41edd59..0000000 --- a/profiles/zsh/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.my.profiles.zsh; -in -{ - options.my.profiles.zsh = with lib; { - enable = mkEnableOption "zsh profile"; - }; - - config = lib.mkIf cfg.enable { - users.defaultUserShell = pkgs.zsh; - programs.zsh.enable = true; - }; -}