backup.jras.nl

1 files changed, 20 insertions, 22 deletions

diff --git a/flake.nix b/flake.nix
index 025e75d..119e0d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,8 +12,6 @@
 
     home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager-unstable.url = "github:nix-community/home-manager";
-    home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs";
 
     hyprland.url = "github:hyprwm/Hyprland?submodules=1&ref=v0.45.2-b";
     hy3 = {
@@ -26,7 +24,6 @@
 
     nil.url = "github:oxalica/nil";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
 
     update-systemd-resolved.url = "github:jonathanio/update-systemd-resolved";
@@ -38,43 +35,50 @@
     agenix,
     disko,
     home-manager,
-    home-manager-unstable,
     microvm,
     nixpkgs,
-    nixpkgs-unstable,
     nixos-facter-modules,
     update-systemd-resolved,
     ...
   }:
+  let
+    coreModules = [
+      home-manager.nixosModules.home-manager
+      agenix.nixosModules.default
+      ./modules/core
+    ];
+
+    # These should at some point be included in coreModules
+    deviceMgmtModules = [
+      disko.nixosModules.disko
+      nixos-facter-modules.nixosModules.facter
+    ];
+  in
   {
     nixosConfigurations.work = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
-      modules = [
+      modules = coreModules ++ [
         update-systemd-resolved.nixosModules.update-systemd-resolved
         {
           environment.systemPackages = [
             agenix.packages."x86_64-linux".default
           ];
         }
-        home-manager.nixosModules.home-manager
-        agenix.nixosModules.default
 
         ./modules/work
       ];
     };
 
-    nixosConfigurations.tarrel = nixpkgs-unstable.lib.nixosSystem {
+    nixosConfigurations.tarrel = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
-      modules = [
+      modules = coreModules ++ [
         {
           environment.systemPackages = [
             agenix.packages."x86_64-linux".default
           ];
         }
-        home-manager-unstable.nixosModules.home-manager
-        agenix.nixosModules.default
 
         ./modules/tarrel
       ];
@@ -84,12 +88,8 @@
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
 
-      modules = [
-        home-manager.nixosModules.home-manager
-        disko.nixosModules.disko
-        nixos-facter-modules.nixosModules.facter
+      modules = coreModules ++ deviceMgmtModules ++ [
         microvm.nixosModules.host
-        agenix.nixosModules.default
 
         { config.facter.reportPath = ./modules/snorlax/facter.json; }
         ./modules/snorlax
@@ -99,11 +99,9 @@
     nixosConfigurations.backup = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
-
-      modules = [
-        home-manager.nixosModules.home-manager
-        disko.nixosModules.disko
-        ./modules/backup
+      modules = coreModules ++ deviceMgmtModules ++ [
+        { config.facter.reportPath = ./node/backup.jras.nl/facter.json; }
+        ./node/backup.jras.nl
       ];
     };
   };