From 74ec60d50d38c8b2f095ef2756a78a460325a225 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 11 Jan 2026 19:07:14 +0100 Subject: [PATCH 1/2] profile/zsh: init --- profiles/default.nix | 1 + profiles/zsh/default.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 profiles/zsh/default.nix diff --git a/profiles/default.nix b/profiles/default.nix index 4f95122..f454d45 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -23,5 +23,6 @@ ./update ./usb-iso ./webcam + ./zsh ]; } diff --git a/profiles/zsh/default.nix b/profiles/zsh/default.nix new file mode 100644 index 0000000..41edd59 --- /dev/null +++ b/profiles/zsh/default.nix @@ -0,0 +1,19 @@ +{ + 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; + }; +} From 5105f8b1a47e6261428a4f9cd1d4909f23f5d9ea Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 11 Jan 2026 19:20:56 +0100 Subject: [PATCH 2/2] machines: enable zsh by default --- machines/configurations.nix | 3 ++- modules/services/remote-build/default.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/configurations.nix b/machines/configurations.nix index a952899..8480a56 100644 --- a/machines/configurations.nix +++ b/machines/configurations.nix @@ -1,4 +1,4 @@ -{ self, ... }: +{ self, lib, ... }: let inherit (self.inputs) disko @@ -46,6 +46,7 @@ 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 e40f0bb..faa770c 100644 --- a/modules/services/remote-build/default.nix +++ b/modules/services/remote-build/default.nix @@ -19,7 +19,6 @@ in users.users.nixremote = { isSystemUser = true; group = "nixremote"; - shell = pkgs.bashInteractive; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYSzDdxqaNHmaaLqEvOK/vB65zvqoCebI3Nxzgg5smq root@workman" ];