use s0

common/server/mailserver.nix

@@ -37,10 +37,6 @@ in
           # catchall for all domains
           aliases = map (domain: "@${domain}") domains;
         };
-        "cris@runyan.org" = {
-          hashedPasswordFile = "/run/agenix/cris-hashed-email-pw";
-          aliases = [ "chris@runyan.org" ];
-        };
         "robot@runyan.org" = {
           aliases = [
             "no-reply@neet.dev"
@@ -59,7 +55,6 @@ in
       certificateScheme = 3; # use let's encrypt for certs
     };
     age.secrets.hashed-email-pw.file = ../../secrets/hashed-email-pw.age;
-    age.secrets.cris-hashed-email-pw.file = ../../secrets/cris-hashed-email-pw.age;
     age.secrets.hashed-robots-email-pw.file = ../../secrets/hashed-robots-email-pw.age;
 
     # sendmail to use xxx@domain instead of xxx@mail.domain

flake.nix

@@ -55,7 +55,7 @@
     {
       nixosConfigurations =
         let
-          modules = system: hostname: with inputs; [
+          modules = system: with inputs; [
             ./common
             simple-nixos-mailserver.nixosModule
             agenix.nixosModules.default
@@ -63,13 +63,9 @@
             archivebox.nixosModule
             nix-index-database.nixosModules.nix-index
             ({ lib, ... }: {
-              config = {
+              config.environment.systemPackages = [
-                environment.systemPackages = [
+                agenix.packages.${system}.agenix
-                  agenix.packages.${system}.agenix
+              ];
-                ];
-
-                networking.hostName = hostname;
-              };
 
               # because nixos specialArgs doesn't work for containers... need to pass in inputs a different way
               options.inputs = lib.mkOption { default = inputs; };
@@ -77,9 +73,9 @@
             })
           ];
 
-          mkSystem = system: nixpkgs: path: hostname:
+          mkSystem = system: nixpkgs: path:
             let
-              allModules = modules system hostname;
+              allModules = modules system;
 
               # allow patching nixpkgs, remove this hack once this is solved: https://github.com/NixOS/nix/issues/3920
               patchedNixpkgsSrc = nixpkgs.legacyPackages.${system}.applyPatches {
@@ -103,7 +99,7 @@
         in
         nixpkgs.lib.mapAttrs
           (hostname: cfg:
-            mkSystem cfg.arch nixpkgs cfg.configurationPath hostname)
+            mkSystem cfg.arch nixpkgs cfg.configurationPath)
           machines;
 
       packages =

machines/ponyo/default.nix

@@ -5,6 +5,8 @@
     ./hardware-configuration.nix
   ];
 
+  networking.hostName = "ponyo";
+
   system.autoUpgrade.enable = true;
 
   # p2p mesh network

machines/ray/default.nix

@@ -5,6 +5,8 @@
     ./hardware-configuration.nix
   ];
 
+  networking.hostName = "ray";
+
   # for luks onlock over tor
   services.tor.enable = true;
   services.tor.client.enable = true;

machines/router/default.nix

@@ -11,6 +11,8 @@
   # https://github.com/skogsbrus/os/blob/master/sys/router.nix
   # http://trac.gateworks.com/wiki/wireless/wifi 
 
+  networking.hostName = "router";
+
   system.autoUpgrade.enable = true;
 
   services.tailscale.exitNode = true;

machines/storage/s0/hardware-configuration.nix

@@ -7,7 +7,7 @@
     ];
 
   # boot
-  boot.loader.systemd-boot.enable = true;
+  efi.enable = true;
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];

secrets/cris-hashed-email-pw.age

@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 6AT2/g q8AlvC9Dt+b8320A4BP92FghOoPyKttivfrsxqG6DGM
-GWz2QJY3QFc748DjHrybNxyAS/BmDgzIU8yoRFGbLjA
--> ssh-ed25519 dMQYog i/6mNjO8XZGAxnN1SxJGr5uD+hzCIrh28+N7cvvXZGA
-hC+J+F9hVs8HZjLhCQ6RnGAHRE45G+p1oBPnwB+nBtE
--> ]d^>n#.%-grease Qe6&35Kb ,",Wb`% 0SRX@d
-yXZqn1+E675gpQyFGk/c15Sc1/iwjI/6VrOE1RTcp0gJcsbtVv4kgYCkY+mK
---- ykoio7g3wxV3VDvo2d3p/Y39NCh+cWPh7uL+Go30BLY
-i“˜Q+€hnïI¼_MßGrrf¯EE~µ(fFyâÿé&ȃ>sÀX<C380>›ú¤9~<7E>ä*Ç~ŽBãÕ4R¯ü=;’Â{Ý´+^<5E>P…¨ûrFza·C䢞î4V’

secrets/secrets.nix

@@ -14,11 +14,13 @@ with roles;
 {
   # email
   "hashed-email-pw.age".publicKeys = email-server;
-  "cris-hashed-email-pw.age".publicKeys = email-server;
   "sasl_relay_passwd.age".publicKeys = email-server;
   "hashed-robots-email-pw.age".publicKeys = email-server;
   "robots-email-pw.age".publicKeys = gitea;
 
+  # gitea
+  "gitea-runner-registration-token.age".publicKeys = gitea-runner;
+
   # vpn
   "iodine.age".publicKeys = iodine;
   "pia-login.age".publicKeys = pia;