Simplified flake

flake.nix

@@ -3,12 +3,12 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
+    nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     home-manager = {
       url = "github:nix-community/home-manager/release-22.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
     # home-manager-u = {
     #   url = "github:nix-community/home-manager";
     #   inputs.nixpkgs.follows = "nixpkgs-u";
@@ -19,24 +19,15 @@
 
     nix-rice = {
       url = "github:bertof/nix-rice";
-      inputs = {
+      inputs = { nixpkgs.follows = "nixpkgs-u"; flake-utils.follows = "flake-utils"; };
-        nixpkgs.follows = "nixpkgs-u";
-        flake-utils.follows = "flake-utils";
-      };
     };
     pre-commit-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";
-      inputs = {
+      inputs = { nixpkgs.follows = "nixpkgs-u"; flake-utils.follows = "flake-utils"; };
-        nixpkgs.follows = "nixpkgs-u";
-        flake-utils.follows = "flake-utils";
-      };
     };
     tex2nix = {
       url = "github:Mic92/tex2nix";
-      inputs = {
+      inputs = { nixpkgs.follows = "nixpkgs-u"; flake-utils.follows = "flake-utils"; };
-        nixpkgs.follows = "nixpkgs-u";
-        flake-utils.follows = "flake-utils";
-      };
     };
   };
 
@@ -53,15 +44,24 @@
     , pre-commit-hooks
     }:
     let
-      overlaysBuilder = system: [
+
-        (_: _: {
+      config = {
-          inherit (tex2nix.packages.${system}) tex2nix;
+        allowUnfree = true;
-          stable = pkgs { inherit system; };
+        extraOptions = "experimental-features = nix-command flakes";
-          unstable = pkgs-u { inherit system; };
+        permittedInsecurePackages = [ "electron-9.4.4" ]; # authy dependency
-        })
+      };
+
+      overlaysBuilder = { system }: [
+        # Packages
+        (_: _: { stable = pkgs { inherit system; }; unstable = pkgs-u { inherit system; }; })
+
+        # Nix rice
         (nix-rice.overlays.default)
         (import ./rice.nix)
+
+        # Flakes packages
         (final: _: {
+          inherit (tex2nix.packages.${system}) tex2nix;
           update-background = final.callPackage ./custom/update-background {
             backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+";
           };
@@ -69,53 +69,40 @@
             palette = final.rice.colorPalette;
             font = final.rice.font.normal;
           };
-          sddm-theme-clairvoyance =
+          sddm-theme-clairvoyance = final.callPackage ./custom/sddm-theme-clairvoyance {
-            final.callPackage ./custom/sddm-theme-clairvoyance {
             wallpaper = ./wallpapers/comfy_waves.jpg;
           };
         })
       ];
-      defaultConfig = {
-        extraOptions = "experimental-features = nix-command flakes";
-        allowUnfree = true;
-        permittedInsecurePackages = [ "electron-9.4.4" ]; # authy dependency
-      };
-      nixpkgsSettings =
-        { system, overlays ? overlaysBuilder system, config ? defaultConfig }: {
-          inherit system overlays config;
-        };
-      pkgs = s: import nixpkgs (nixpkgsSettings s);
-      pkgs-u = s: import nixpkgs-u (nixpkgsSettings s);
-      nixModule = system: { pkgs, ... }: {
-        nixpkgs = nixpkgsSettings { inherit system; };
-        nix = {
-          package = pkgs.unstable.nixVersions.stable;
-          extraOptions = "experimental-features = nix-command flakes";
-        };
-      };
-      homeManagerSettings = {
-        home-manager = {
-          useGlobalPkgs = true;
-          useUserPackages = true;
-        };
-      };
 
-      commonBaseModules = [
+      modulesBuilder = { system }:
+        let overlays = overlaysBuilder { inherit system; }; in
+        [
+          # Nix configuration
+          ({ pkgs, ... }: {
+            nixpkgs = { inherit system overlays config; };
+            nix = {
+              package = pkgs.nixVersions.stable;
+              extraOptions = "experimental-features = nix-command flakes";
+            };
+          })
+
+          # Home manager configuration
+          home-manager.nixosModules.home-manager
+          ({ home-manager = { useGlobalPkgs = true; useUserPackages = true; }; })
+
+          # Common modules
           ./nixos_modules/bertof_user.nix
           ./nixos_modules/automatic-garbage-collection.nix
           ./nixos_modules/zerotier.nix
         ];
 
-      homeManagerModules = users: [
+      pkgs = { system }:
-        home-manager.nixosModules.home-manager
+        let overlays = overlaysBuilder { inherit system; }; in
-        homeManagerSettings
+        import nixpkgs { inherit system config overlays; };
-        { home-manager.users = users; }
+      pkgs-u = { system }:
-      ];
+        let overlays = overlaysBuilder { inherit system; }; in
-      # homeManagerUModules = users: [
+        import nixpkgs-u { inherit system config overlays; };
-      #   home-manager-u.nixosModules.home-manager
-      #   homeManagerSettings
-      #   { home-manager.users = users; }
-      # ];
 
       odinBaseModules = [
         ./odin/hardware-configuration.nix
@@ -133,17 +120,17 @@
       odinIntelBuilder = { extraModules ? [ ] }:
         nixpkgs.lib.nixosSystem rec {
           system = "x86_64-linux";
-          modules = [ (nixModule system) ]
+          modules = (modulesBuilder { inherit system; })
-            ++ commonBaseModules ++ odinBaseModules ++ odinIntelModules
+            ++ odinBaseModules ++ odinIntelModules
-            ++ (homeManagerModules { bertof = import ./odin/hm.nix; })
+            ++ [{ home-manager.users.bertof = import ./odin/hm.nix; }]
             ++ extraModules;
         };
       odinNvidiaBuilder = { extraModules ? [ ] }:
         nixpkgs.lib.nixosSystem rec {
           system = "x86_64-linux";
-          modules = [ (nixModule system) ]
+          modules = (modulesBuilder { inherit system; })
-            ++ commonBaseModules ++ odinBaseModules ++ odinNvidiaModules
+            ++ odinBaseModules ++ odinNvidiaModules
-            ++ (homeManagerModules { bertof = import ./odin/hm.nix; })
+            ++ [{ home-manager.users.bertof = import ./odin/hm.nix; }]
             ++ extraModules;
         };
 
@@ -160,9 +147,9 @@
       thorBuilder = { extraModules ? [ ] }:
         nixpkgs.lib.nixosSystem rec {
           system = "x86_64-linux";
-          modules = [ (nixModule system) ]
+          modules = (modulesBuilder { inherit system; })
-            ++ commonBaseModules ++ thorBaseModules
+            ++ thorBaseModules
-            ++ (homeManagerModules { bertof = import ./thor/hm.nix; })
+            ++ [{ home-manager.users.bertof = import ./thor/hm.nix; }]
             ++ extraModules;
         };
 
@@ -175,9 +162,9 @@
       lokiBuilder = { extraModules ? [ ] }:
         nixpkgs.lib.nixosSystem rec {
           system = "x86_64-linux";
-          modules = [ (nixModule system) ]
+          modules = (modulesBuilder { inherit system; })
-            ++ commonBaseModules ++ lokiBaseModules
+            ++ lokiBaseModules
-            ++ (homeManagerModules { bertof = import ./loki/hm.nix; })
+            ++ [{ home-manager.users.bertof = import ./loki/hm.nix; }]
             ++ extraModules;
         };
 
@@ -189,9 +176,9 @@
       freyaBuilder = { extraModules ? [ ] }:
         nixpkgs.lib.nixosSystem rec {
           system = "x86_64-linux";
-          modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }]
+          modules = (modulesBuilder { inherit system; })
-            ++ commonBaseModules ++ freyaBaseModules
+            ++ freyaBaseModules
-            ++ (homeManagerModules { bertof = import ./freya/hm.nix; })
+            ++ [{ home-manager.users.bertof = import ./freya/hm.nix; }]
             ++ extraModules;
         };
 
@@ -199,9 +186,9 @@
       balurBuilder = { extraModules ? [ ] }:
         nixpkgs.lib.nixosSystem rec {
           system = "x86_64-linux";
-          modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }]
+          modules = (modulesBuilder { inherit system; })
-            ++ commonBaseModules ++ baldurBaseModules
+            ++ baldurBaseModules
-            ++ (homeManagerModules { bertof = import ./baldur/hm.nix; })
+            ++ [{ home-manager.users.bertof = import ./baldur/hm.nix; }]
             ++ extraModules;
         };
     in