move stuff into nixosModules

flake.lock

@@ -266,11 +266,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751117291,
-        "narHash": "sha256-iOeiPypZkl6uPL5mQ4aFG4wYVs9w9BJZ2/5XHlLgyIk=",
+        "lastModified": 1757763404,
+        "narHash": "sha256-a1h+58wDOtbQXrHoZwLwB7PhXwFhBXRHhNRhAQGq/oY=",
         "ref": "refs/heads/main",
-        "rev": "2a4818dc2158cbdad34a701ab12d0b1cf7f52c46",
-        "revCount": 45,
+        "rev": "07a5fbca27ec941c841ad93f2ac65bc529225a51",
+        "revCount": 46,
         "type": "git",
         "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"
       },
@@ -290,11 +290,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752323001,
-        "narHash": "sha256-YEcYegmlv12yN9VWrz2qt0nyL+9EeGIlrDvac8Pf7Cw=",
+        "lastModified": 1757763091,
+        "narHash": "sha256-V3E6JKGzCrq5u+hp38sAdKv/EoxU+X0qfSoBIPxALi4=",
         "ref": "refs/heads/main",
-        "rev": "75a0ae7a59e687bea5f92791a2d64c048f35846d",
-        "revCount": 119,
+        "rev": "493b7b0343334019b372176f811a966839ba9aa5",
+        "revCount": 121,
         "type": "git",
         "url": "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git"
       },

flake.nix

@@ -1,7 +1,6 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
-
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
     home-manager = {
@@ -104,10 +103,7 @@
           modules = [
             { networking.hostName = device; }
 
-            ./modules/globalinstalls.nix
-            ./modules/networking.nix
-            ./modules/nixpkgs.nix
-            ./modules/lix.nix
+            self.nixosModules.default
 
             ./hosts/${device}/hardware.nix
             ./hosts/${device}/imports.nix
@@ -120,20 +116,8 @@
             }
           ]
           ++ (nixpkgs.lib.optionals (builtins.elem device homeDevices) [
-            home-manager.nixosModules.home-manager
+            self.nixosModules.desktopDefault
             { home-manager.extraSpecialArgs = specialArgs; }
-            ./modules/home-manager.nix
-
-            ./modules/i18n.nix
-
-            niri.nixosModules.niri
-            {
-              nixpkgs.overlays = [
-                niri.overlays.niri
-                overlays.servicepoint-packages
-                nix-vscode-extensions.overlays.default
-              ];
-            }
           ]);
         }
       );
@@ -145,10 +129,35 @@
             config = prev.config;
           };
         };
-        servicepoint-packages = final: prev: {
-          servicepoint-cli = servicepoint-cli.legacyPackages."${prev.system}".servicepoint-cli;
-          servicepoint-simulator =
-            servicepoint-simulator.legacyPackages."${prev.system}".servicepoint-simulator;
+      };
+
+      nixosModules = {
+        lix = (import ./nixosModules/lix.nix);
+        niri = {
+          imports = [ niri.nixosModules.niri ];
+          nixpkgs.overlays = [ niri.overlays.niri ];
+        };
+        pkgs-unstable = {
+          nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ];
+        };
+        desktopDefault = {
+          imports = [
+            self.nixosModules.pkgs-unstable
+            self.nixosModules.niri
+            home-manager.nixosModules.home-manager
+            servicepoint-simulator.nixosModules.default
+            servicepoint-cli.nixosModules.default
+            ./modules/home-manager.nix
+            ./modules/i18n.nix
+          ];
+        };
+        default = {
+          imports = [
+            self.nixosModules.lix
+            ./modules/globalinstalls.nix
+            ./modules/networking.nix
+            ./modules/nixpkgs.nix
+          ];
         };
       };
 

modules/lix.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  nixpkgs.overlays = [ (final: prev: {
-    inherit (prev.lixPackageSets.stable)
-      nixpkgs-review
-      nix-eval-jobs
-      nix-fast-build
-      colmena;
-  }) ];
-
-  nix.package = pkgs.lixPackageSets.stable.lix;
-}

nixosModules/lix.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+{
+  nixpkgs.overlays = [
+    (final: prev: {
+      inherit (prev.lixPackageSets.stable)
+        nixpkgs-review
+        nix-eval-jobs
+        nix-fast-build
+        colmena
+        ;
+    })
+  ];
+
+  nix.package = pkgs.lixPackageSets.latest.lix;
+}