From c2f512114950a50d86bdcc7ea022d356fef454b1 Mon Sep 17 00:00:00 2001 From: catvayor Date: Wed, 3 Apr 2024 11:13:50 +0200 Subject: [PATCH] fixed missing zsh --- make-iso.sh | 2 +- users/root.nix | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/make-iso.sh b/make-iso.sh index 92da59b..0c3394b 100755 --- a/make-iso.sh +++ b/make-iso.sh @@ -1,3 +1,3 @@ #!/bin/sh drv=$(colmena eval -E "{ nodes, ... }: nodes.kat-iso.config.system.build.isoImage" --instantiate --show-trace) -nix-store --realize --add-root "installer-iso-image" --indirect $drv +nom-build $drv diff --git a/users/root.nix b/users/root.nix index 20d0108..7908440 100644 --- a/users/root.nix +++ b/users/root.nix @@ -2,14 +2,17 @@ { config, lib, pkgs, mods, ... }: { programs.zsh.enable = true; - users.users.root.shell = pkgs.zsh; + users.users.root = { + shell = pkgs.zsh; + } // lib.attrsets.optionalAttrs ssh { + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA16foz+XzwKwyIR4wFgNIAE3Y7AfXyEsUZFVVz8Rie catvayor@katvayor" + ]; + }; home-manager.users.root = { home.stateVersion = "23.11"; imports = with mods.home; [ neovim zsh ]; }; } // lib.attrsets.optionalAttrs ssh { - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA16foz+XzwKwyIR4wFgNIAE3Y7AfXyEsUZFVVz8Rie catvayor@katvayor" - ]; services.openssh.enable = true; }