From 2667d3877d72f6cf3aa310203262631e43fe6d71 Mon Sep 17 00:00:00 2001 From: Caroline Larimore Date: Mon, 14 Apr 2025 18:48:49 -0700 Subject: migration: misc copenhagen config --- hosts/copenhagen/configuration.nix | 15 --------------- hosts/copenhagen/home/c.nix | 15 --------------- snowfall/systems/x86_64-linux/copenhagen/default.nix | 18 +++++++++++++++++- 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/hosts/copenhagen/configuration.nix b/hosts/copenhagen/configuration.nix index 3f6c089..f8fc2f6 100644 --- a/hosts/copenhagen/configuration.nix +++ b/hosts/copenhagen/configuration.nix @@ -14,19 +14,4 @@ ]; }; }; - - programs = { - gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - }; - - services = { - pcscd.enable = true; - }; - - environment.systemPackages = with pkgs; [ - ffmpeg - ]; } diff --git a/hosts/copenhagen/home/c.nix b/hosts/copenhagen/home/c.nix index 5212ddd..3420731 100644 --- a/hosts/copenhagen/home/c.nix +++ b/hosts/copenhagen/home/c.nix @@ -7,17 +7,6 @@ ../../../roles/home ]; - home.persistence."/persist/home/c" = { - allowOther = true; - - directories = [ - ".gnupg" - ".ssh" - - ".local/bin" - ]; - }; - home.roles = { dev = { enable = true; @@ -25,9 +14,5 @@ }; }; - home.packages = with pkgs; [ - cloc - ]; - home.stateVersion = "23.11"; } diff --git a/snowfall/systems/x86_64-linux/copenhagen/default.nix b/snowfall/systems/x86_64-linux/copenhagen/default.nix index 00bd761..e7f7a35 100644 --- a/snowfall/systems/x86_64-linux/copenhagen/default.nix +++ b/snowfall/systems/x86_64-linux/copenhagen/default.nix @@ -15,6 +15,8 @@ with lib; with lib.${namespace}; { impermanence.home.enable = true; }; + suites.common.enable = true; + services = { ssh = { enable = true; @@ -33,7 +35,7 @@ with lib; with lib.${namespace}; { enable = true; port = 25566; }; - + zenith = { enable = true; port = 25569; @@ -42,5 +44,19 @@ with lib; with lib.${namespace}; { }; }; + services = { + pcscd.enable = true; + udev.enable = true; + }; + + snowfallorg.users."c" = { + admin = true; + }; + + users.users = { + root.hashedPasswordFile = "/secrets/passwords/root"; + "c".hashedPasswordFile = "/secrets/passwords/c"; + }; + system.stateVersion = "23.11"; } \ No newline at end of file -- cgit v1.2.3