fix issues

modules/flake/lib.nix

@@ -10,26 +10,30 @@ in
     nixpkgs,
     disko,
     lolcat,
-    modules ? [ ],
+    nixosModules,
+    hostModules ? [ ],
   }:
     nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
         inputs = inputs // { "lolcat++" = lolcat; };
+        inherit nixosModules;
       };
-      modules = [ disko.nixosModules.disko ] ++ modules;
+      modules = [ disko.nixosModules.disko ] ++ hostModules;
     };
 
   mkDesktopHost = {
     nixpkgs,
     disko,
     lolcat,
-    modules ? [ ],
+    nixosModules,
+    hostModules ? [ ],
   }:
     nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
         inputs = inputs // { "lolcat++" = lolcat; };
+        inherit nixosModules;
       };
       modules = [
         disko.nixosModules.disko
@@ -40,6 +44,6 @@ in
           home-manager.backupFileExtension = "hm-backup";
           home-manager.users.love = import "${dotfiles}/home.nix";
         }
-      ] ++ modules;
+      ] ++ hostModules;
     };
 }

modules/flake/nixos-configurations.nix

@@ -1,6 +1,6 @@
 { inputs }:
 let
-  modules = import ../nixos;
+  nixosModules = import ../nixos;
   flakeLib = import ./lib.nix { inherit inputs; };
 in
-import ../hosts ({ inherit inputs modules; } // flakeLib)
+import ../hosts ({ inherit inputs nixosModules; } // flakeLib)

modules/hosts/hermes/configuration.nix

@@ -1,7 +1,7 @@
 {
   inputs,
   pkgs,
-  modules,
+  nixosModules,
   ...
 }:
 let
@@ -25,11 +25,11 @@ in
   imports = [
     inputs.mailserver.nixosModules.default
     ./disko.nix
-    modules.base
-    modules.zfsRoot
-    modules.luksInitrdSshUnlock
-    modules.mailServer
-    modules.binBashWrapper
+    nixosModules.base
+    nixosModules.zfsRoot
+    nixosModules.luksInitrdSshUnlock
+    nixosModules.mailServer
+    nixosModules.binBashWrapper
   ];
 
   my.binBashWrapper.enable = true;
@@ -42,7 +42,7 @@ in
   };
 
   networking.hostName = hostName;
-  networking.hostId = "8d49a097f2";
+  networking.hostId = "8d49a097";
 
   users.mutableUsers = true;
   users.users.${userName} = {

modules/hosts/hermes/default.nix

@@ -1,6 +1,7 @@
 {
   inputs,
   mkHost,
+  nixosModules,
   ...
 }:
 {
@@ -8,13 +9,15 @@
     nixpkgs = inputs.nixpkgs-stable;
     disko = inputs.disko-stable;
     lolcat = inputs."lolcat++-stable";
-    modules = [ ./configuration.nix ];
+    inherit nixosModules;
+    hostModules = [ ./configuration.nix ];
   };
 
   hermes = mkHost {
     nixpkgs = inputs.nixpkgs-stable;
     disko = inputs.disko-stable;
     lolcat = inputs."lolcat++-stable";
-    modules = [ ./configuration.nix ];
+    inherit nixosModules;
+    hostModules = [ ./configuration.nix ];
   };
 }

modules/hosts/kronos/configuration.nix

@@ -1,7 +1,7 @@
 {
   config,
   pkgs,
-  modules,
+  nixosModules,
   ...
 }:
 let
@@ -25,11 +25,11 @@ in
   imports = [
     ./hardware.nix
     ./disko.nix
-    modules.base
-    modules.zfsRoot
-    modules.luksTpm2
-    modules.desktopHyprland
-    modules.binBashWrapper
+    nixosModules.base
+    nixosModules.zfsRoot
+    nixosModules.luksTpm2
+    nixosModules.desktopHyprland
+    nixosModules.binBashWrapper
   ];
 
   my.binBashWrapper.enable = true;

modules/hosts/kronos/default.nix

@@ -1,6 +1,7 @@
 {
   inputs,
   mkDesktopHost,
+  nixosModules,
   ...
 }:
 {
@@ -8,13 +9,15 @@
     nixpkgs = inputs.nixpkgs-unstable;
     disko = inputs.disko-unstable;
     lolcat = inputs."lolcat++-unstable";
-    modules = [ ./configuration.nix ];
+    inherit nixosModules;
+    hostModules = [ ./configuration.nix ];
   };
 
   kronos = mkDesktopHost {
     nixpkgs = inputs.nixpkgs-unstable;
     disko = inputs.disko-unstable;
     lolcat = inputs."lolcat++-unstable";
-    modules = [ ./configuration.nix ];
+    inherit nixosModules;
+    hostModules = [ ./configuration.nix ];
   };
 }

modules/nixos/base.nix

@@ -81,7 +81,7 @@
       IPv6AcceptRA = true;
     };
     dhcpV4Config.RouteMetric = 100;
-    dhcpV6Config.RouteMetric = 100;
+    ipv6AcceptRAConfig.RouteMetric = 100;
   };
 
   programs.zsh.enable = true;

modules/nixos/luks-initrd-ssh-unlock.nix

@@ -40,10 +40,6 @@ in
         authorizedKeys = cfg.authorizedKeys;
       };
     };
-    boot.initrd.secrets = {
-      "${toString cfg.hostKeyPath}" = cfg.hostKeyPath;
-    };
-
     system.activationScripts.initrdSshHostKey = {
       deps = [ "users" "groups" ];
       text = ''

modules/nixos/mail-server/mail.nix

@@ -1,22 +1,23 @@
 { config, ... }:
 {
-  security.acme.acceptTerms = true;
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "love@billenius.com";
+  };
   networking.firewall.allowedTCPPorts = [ 80 ];
   services.nginx.virtualHosts.${config.mailserver.fqdn}.enableACME = true;
 
   mailserver = {
     enable = true;
-    stateVersion = 4;
     fqdn = "mail.billenius.com";
     domains = [ "billenius.com" ];
-
-    x509.useACMEHost = config.mailserver.fqdn;
+    certificateScheme = "acme";
 
     # A list of all login accounts. To create the password hashes, use
     # nix-shell -p mkpasswd --run 'mkpasswd -s'
-    accounts = {
+    loginAccounts = {
       "love@billenius.com" = {
-        hashedPasswordFile = ../../../resources/mail-server/love@billenius.com;
+        hashedPasswordFile = "${../../../resources/mail-server}/love@billenius.com";
         aliases = [ "postmaster@billenius.com" ];
       };
     };