From 1410b20e7db37e4a6842d45a54b403a21ccd6f9a Mon Sep 17 00:00:00 2001
From: Riley Apeldoorn <me@riley.lgbt>
Date: Fri, 27 May 2022 15:59:00 +0200
Subject: [PATCH] Pls work lmao

---
 common.nix                      | 6 +-----
 machines/sif/configuration.nix  | 6 +++++-
 machines/thor/configuration.nix | 5 ++++-
 modules/ssh.nix                 | 6 ++++++
 secrets/secrets.nix             | 8 ++++++--
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/common.nix b/common.nix
index e5d72f1..057e4ff 100644
--- a/common.nix
+++ b/common.nix
@@ -1,9 +1,7 @@
 # Holds common settings for *all* systems, including both servers and
 # clients.
 
-{ pkgs, oxalica, agenix, ... }: {
-
-	imports = [ agenix.nixosModule ];
+{ pkgs, oxalica, ... }: {
 
     nix = {
         trustedUsers = [ "riley" ];
@@ -27,8 +25,6 @@
         ];
     };
 
-    age.secrets."website-secret".file = ./secrets/website-secret.age;
-
     boot.cleanTmpDir = true;
 
     environment.systemPackages = [
diff --git a/machines/sif/configuration.nix b/machines/sif/configuration.nix
index 2b6425b..e6a2406 100644
--- a/machines/sif/configuration.nix
+++ b/machines/sif/configuration.nix
@@ -1,9 +1,11 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, agenix, ... }:
 
 {
 
     imports = [
 
+		agenix.nixosModule
+
 		../../modules
 
 		# Reverse proxy
@@ -28,6 +30,8 @@
 		vim
 	];
 
+    age.secrets."website-secret".file = ../../secrets/website-secret.age;
+
 	system.stateVersion = "21.11";
 
 	riley = {
diff --git a/machines/thor/configuration.nix b/machines/thor/configuration.nix
index 696b5d6..d220232 100644
--- a/machines/thor/configuration.nix
+++ b/machines/thor/configuration.nix
@@ -1,7 +1,8 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, agenix, ... }:
 
 {
 	imports = [
+    	agenix.nixosModule
 		./hardware-configuration.nix
 		../../modules
 	];
@@ -43,6 +44,8 @@
 		cockatrice
 	];
 
+    age.secrets."website-secret".file = ../../secrets/website-secret.age;
+
     devices = {
 
         # Audio devices
diff --git a/modules/ssh.nix b/modules/ssh.nix
index 434ed1b..3786b32 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -15,4 +15,10 @@
 		packages = with pkgs; [ openssh ];
 
 	};
+
+	users.users."root" = {
+    	openssh.authorizedKeys.keys = [
+			"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGk/nBXhr3xWtbXBBkCuwqE6OixpRXCfscfxibgcCsTR me@riley.lgbt"
+		];
+	};
 }
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 5988491..95020ca 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,4 +1,8 @@
-let commonKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOIXreYQgV6lS0rJ1NlAbgq3Iv5FJ8o1MOr08NhLTGFG";
+let sif  = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOIXreYQgV6lS0rJ1NlAbgq3Iv5FJ8o1MOr08NhLTGFG";
+    thor = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILniE+LdfdV9V9+Zj5gJXqKEv1CzQaEySy1u5OdbKa8d root@thor";
 in {
-	"website-secret.age".publicKeys = [ commonKey ];
+	"website-secret.age".publicKeys = [
+    	thor
+    	sif
+	];
 }