From 4afe36edd2137d8231ce9f44d9489ef8830a6b6e Mon Sep 17 00:00:00 2001
From: noe <git@kat.cafe>
Date: Sat, 23 Dec 2023 01:41:56 -0500
Subject: [PATCH] make ssh keys referenced

---
 nixos/base.nix                  |  1 +
 nixos/templates/proxmox-lxc.nix |  5 ++++-
 nixos/users/noe-keys.nix        |  7 +++++++
 nixos/users/noe.nix             | 11 +++--------
 4 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 nixos/users/noe-keys.nix

diff --git a/nixos/base.nix b/nixos/base.nix
index 78998ae..355442d 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -36,6 +36,7 @@
   programs.git.enable = true;
 
   users.defaultUserShell = pkgs.fish;
+  users.users.root.openssh.authorizedKeys.keys = import ./users/noe-keys.nix;
 
   services.openssh.enable = lib.mkDefault true;
 
diff --git a/nixos/templates/proxmox-lxc.nix b/nixos/templates/proxmox-lxc.nix
index dbb85c7..df07e17 100644
--- a/nixos/templates/proxmox-lxc.nix
+++ b/nixos/templates/proxmox-lxc.nix
@@ -1,9 +1,12 @@
 { pkgs, config, modulesPath, ... }: {
   imports = [
     (modulesPath + "/virtualisation/proxmox-lxc.nix")
-    ../../nixos/base.nix
   ];
 
+  system.stateVersion = "24.05";
+
+  users.users.root.openssh.authorizedKeys.keys = import ../users/noe-keys;
+
   environment.systemPackages = with pkgs; [
     bashInteractive 
   ];
diff --git a/nixos/users/noe-keys.nix b/nixos/users/noe-keys.nix
new file mode 100644
index 0000000..9f23433
--- /dev/null
+++ b/nixos/users/noe-keys.nix
@@ -0,0 +1,7 @@
+{
+  default =
+    [
+      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrjnDY3hlN3cOCMBpcoh4GWdnG5nc9ZeOXJ7MtJVL3I'' 
+      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBs6/s+973H28jOrvN0zr1eayT+thrs61l1qV7uFhw8I'' 
+    ];
+}
diff --git a/nixos/users/noe.nix b/nixos/users/noe.nix
index 4521f36..d4d4e11 100644
--- a/nixos/users/noe.nix
+++ b/nixos/users/noe.nix
@@ -1,16 +1,11 @@
 { config, pkgs, ... }: {
   users.users.noe = {
-    hashedPasswordFile = config.sops.secrets."users/noe/password".path;
+    #hashedPasswordFile = config.sops.secrets."users/noe/password".path;
     isNormalUser = true;
     extraGroups = [ "wheel" ];
     shell = pkgs.fish;
-    openssh.authorizedKeys.keys = [
-      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrjnDY3hlN3cOCMBpcoh4GWdnG5nc9ZeOXJ7MtJVL3I'' 
-      ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBs6/s+973H28jOrvN0zr1eayT+thrs61l1qV7uFhw8I'' 
-    ];
+    openssh.authorizedKeys.keys = import ./noe-keys.nix; 
   };
-  
-  users.users.root.openssh.authorizedKeys.keys = config.users.users.noe.openssh.authorizedKeys.keys;
 
   environment.systemPackages = [ pkgs.nixos-rebuild ];
   security.sudo.extraRules = [
@@ -26,5 +21,5 @@
     }
   ];
 
-  sops.secrets."users/noe/password".neededForUsers = true;
+  #sops.secrets."users/noe/password".neededForUsers = true;
 }