clean up some things

boxes/copernicus/default.nix

@@ -6,8 +6,8 @@
     ./nvidia.nix
     ./services
     ../../config/copernicus.nix
-    ../../modules/hosts.nix
+    ../../lib/hosts.nix
-    ../../modules/bootstrap.nix
+    ../../lib/bootstrap.nix
   ];
 
   environment.systemPackages = with pkgs; [

boxes/netbox/default.nix

@@ -1,23 +1,21 @@
 { lib, config, pkgs, machines, ... }:
 
 {
-  imports =
+  imports = [
-    [
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+    ../../lib/bootstrap.nix
-      ../../modules/bootstrap.nix
 
-      ./radicale.nix
+    ./franklincce.nix
-      ./ssh.nix
+    ./gitea.nix
-      ./gitea.nix
+    ./mail.nix
-      ./radicale.nix
+    ./nextcloud.nix
-      ./vaultwarden.nix
+    ./nginx.nix
-      ./sslh.nix
+    ./radicale.nix
-      ./nginx.nix
+    ./ssh.nix
-      ./franklincce.nix
+    ./sslh.nix
-      ./wireguard.nix
+    ./vaultwarden.nix
-      ./nextcloud.nix
+    ./wireguard.nix
-      ./mail.nix
+  ];
-    ];
 
   nix = {
     optimise = {

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "rndusr's nixos flake";
+  description = "stupidcomputer's nixos flake";
 
   inputs = {
     # regular nixos stuff
@@ -14,29 +14,26 @@
       nixpkgs,
       simple-nixos-mailserver,
       ...
-    }@inputs: {
+    }@inputs: let
-    nixosConfigurations = {
+      mkSystem = modules:
-      netbox = nixpkgs.lib.nixosSystem {
+        nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+          system = "x86_64-linux";
-        specialArgs = { inherit inputs; } // { machines = import ./machines.nix; };
+          specialArgs = {
-        modules = [
+            inherit inputs;
-          ./boxes/netbox
+            machines = import ./lib/machines.nix;
-        ];
+          };
-      };
+          inherit modules;
-      copernicus = nixpkgs.lib.nixosSystem {
+        };
-        system = "x86_64-linux";
+      generateNixosConfigurations = configurations:
-        specialArgs = { inherit inputs; } // { machines = import ./machines.nix; };
+        builtins.listToAttrs (
-        modules = [
+          map (name: {
-          ./boxes/copernicus
+            inherit name;
-        ];
+            value = mkSystem [ (./boxes/. + "/${name}") ];
-      };
+          }) configurations
-      aristotle = nixpkgs.lib.nixosSystem {
+        );
-        system = "x86_64-linux";
+    in {
-        specialArgs = { inherit inputs; } // { machines = import ./machines.nix; };
+      nixosConfigurations = generateNixosConfigurations [ "netbox" "copernicus" ] // {
-        modules = [
+        aristotle = mkSystem [ ./lappy/configuration.nix ];
-          ./lappy/configuration.nix
-        ];
       };
     };
-  };
 }