common/nginx.nix

@@ -2,6 +2,8 @@
 
 {
   services.nginx = {
+    enable = true;
+
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
     recommendedProxySettings = true;
@@ -26,4 +28,6 @@
     acceptTerms = true;
     defaults.email = "accounts@katherina.rocks"; # TODO: replace with more appropriate email
   };
+
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
 }

common/users/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./qenya.nix
-    ./richard.nix
-  ];
-}

common/users/richard.nix

@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let keys = import ../../keys.nix;
-in
-{
-  users.users.richard = {
-    isNormalUser = true;
-    home = "/home/richard";
-    openssh.authorizedKeys.keys = keys.users.richard;
-    uid = 1002;
-  };
-}

hive.nix

@@ -24,11 +24,10 @@ in {
       (import "${sources.home-manager}/nixos")
       (import "${sources.agenix}/modules/age.nix")
       ./pinning.nix
-      ./common/nginx.nix
       ./common/ssh.nix
       ./common/sudo.nix
       ./common/utilities.nix
-      ./common/users
+      ./users/qenya.nix
     ];
   };
 

hosts/yevaud/forgejo.nix

@@ -1,13 +1,14 @@
 { config, lib, pkgs, ... }:
 
 {
+  imports = [
+    ../../common/nginx.nix
+  ];
+
   # TODO: email out
   # TODO: interface customisation
 
-  services = {
+  services.nginx.virtualHosts = {
-    nginx = {
-      enable = true;
-      virtualHosts = {
     "git.qenya.tel" = {
       forceSSL = true;
       enableACME = true;
@@ -19,9 +20,8 @@
       locations."/".return = "301 https://git.qenya.tel$request_uri";
     };
   };
-    };
 
-    forgejo = {
+  services.forgejo = {
     enable = true;
     stateDir = "/data/forgejo";
     settings = {
@@ -43,7 +43,4 @@
       service.DISABLE_REGISTRATION = true;
     };
   };
-  };
-
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
 }

keys.nix

@@ -1,16 +0,0 @@
-{
-  machines = {
-    tohru = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8wuGzF0Y7SaH9aimo3SmCz99MTQwL+rEVhx0jsueU root@tohru";
-    yevaud = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHUAgyQhl390yUObLUI+jEbuNrZ2U6+8px628DolD+T root@yevaud";
-    orm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGc9rkcdOVWozBFj3kLVnSyUQQbyyH+UG+bLawanQkRQ root@orm";
-  };
-
-  users = {
-    qenya = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on qenya@tohru"
-    ];
-    richard = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHAuYWPfYVKdjBY/gBMt2n11Seb+hMqjui1PQ6C4ph8i richard@tress"
-    ];
-  };
-}

secrets/secrets.nix

@@ -1,4 +1,6 @@
 let
-  keys = ../ssh-keys.nix;
+  tohru = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8wuGzF0Y7SaH9aimo3SmCz99MTQwL+rEVhx0jsueU root@tohru";
+  yevaud = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHUAgyQhl390yUObLUI+jEbuNrZ2U6+8px628DolD+T root@yevaud";
+  systems = [ tohru yevaud ];
 in
 { }

users/qenya.nix

@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
 
-let keys = import ../../keys.nix;
-in
 {
   users.users.qenya = {
     isNormalUser = true;
@@ -11,7 +9,9 @@ in
       "networkmanager" # UI wifi configuration
       "dialout" # access to serial ports
     ];
-    openssh.authorizedKeys.keys = keys.users.qenya;
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on qenya@tohru"
+    ];
     uid = 1001;
   };