flake: cleanup main file

flake.nix

@@ -103,33 +103,9 @@
       common_modules = [
         { nixpkgs.pkgs = pkgs; }
         ./system/configuration.nix
-        ./system/sops.nix
-        ./system/greetd.nix
         { login-manager.greetd.enable = desktop == "sway"; }
 
-        inputs.sops-nix.nixosModules.default
+        { home-manager.extraSpecialArgs = specialArgs; }
-        inputs.home-manager.nixosModules.home-manager
-        inputs.disko.nixosModules.disko
-        (
-          { config, ... }:
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.lelgenio = {
-              my = config.my;
-              imports = [
-                ./user/home.nix
-                inputs.sops-nix.homeManagerModules.sops
-              ];
-            };
-            home-manager.backupFileExtension = "bkp";
-            # Optionally, use home-manager.extraSpecialArgs to pass
-            # arguments to home.nix
-            home-manager.extraSpecialArgs = {
-              inherit inputs;
-            };
-          }
-        )
       ]
       ++ lib.optional (desktop == "gnome") ./system/gnome.nix
       ++ lib.optional (desktop == "kde") ./system/kde.nix;
@@ -141,36 +117,27 @@
       nixosConfigurations = {
         i15 = lib.nixosSystem {
           inherit specialArgs;
-          modules = [ ./hosts/i15 ] ++ common_modules;
+          modules = common_modules ++ [ ./hosts/i15 ];
         };
         monolith = lib.nixosSystem {
           inherit specialArgs;
-          modules = [
+          modules = common_modules ++ [
             ./hosts/monolith
             ./system/monolith-gitlab-runner.nix
             ./system/monolith-forgejo-runner.nix
             ./system/nix-serve.nix
-          ]
+          ];
-          ++ common_modules;
         };
         double-rainbow = lib.nixosSystem {
           inherit specialArgs;
-          modules = [
+          modules = common_modules ++ [
             ./hosts/double-rainbow
-          ]
+          ];
-          ++ common_modules;
         };
         pixie = lib.nixosSystem {
           inherit specialArgs;
-          modules = [
+          modules = common_modules ++ [
             ./hosts/pixie.nix
-          ]
-          ++ common_modules
-          ++ [
-            {
-              packages.media-packages.enable = lib.mkOverride 0 false;
-              services.flatpak.enable = lib.mkOverride 0 false;
-            }
           ];
         };
         phantom = lib.nixosSystem {

hosts/pixie/default.nix

@@ -12,6 +12,9 @@
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
+  packages.media-packages.enable = lib.mkOverride 0 false;
+  services.flatpak.enable = lib.mkOverride 0 false;
+
   boot.initrd.availableKernelModules = [
     "nvme"
     "xhci_pci"

system/configuration.nix

@@ -1,9 +1,18 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{ pkgs, config, ... }:
+{
+  pkgs,
+  config,
+  inputs,
+  ...
+}:
 {
   imports = [
+    inputs.sops-nix.nixosModules.default
+    inputs.home-manager.nixosModules.home-manager
+    inputs.disko.nixosModules.disko
+
     ./android.nix
     ./gaming.nix
     ./media-packages.nix
@@ -19,6 +28,9 @@
     ./containers.nix
     ./nix-ld.nix
     ./network.nix
+    ./sops.nix
+    ./greetd.nix
+    ./home-manager.nix
     ../settings
   ];
 

system/home-manager.nix

@@ -0,0 +1,15 @@
+{ config, inputs, ... }:
+{
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.lelgenio = {
+      my = config.my;
+      imports = [
+        ../user/home.nix
+        inputs.sops-nix.homeManagerModules.sops
+      ];
+    };
+    backupFileExtension = "bkp";
+  };
+}