flake.nix

@@ -12,44 +12,38 @@
   outputs =
     inputs@{ self, nixpkgs, nixos-unstable, home-manager, vim-extra-plugins }:
     let
-      x64System = "x86_64-linux";
+      system = "x86_64-linux";
 
-      wrapPkgsSystem = { system }:
+      pkgs = import nixpkgs {
-        import nixpkgs rec {
+        inherit system;
-          inherit system;
+        config.allowUnfree = true;
-          unstable = wrapUnstablePkgsSystem { inherit system; };
+        overlays = [
-          config.allowUnfree = true;
+          (final: prev: { inherit unstable; })
-          overlays = [
+          vim-extra-plugins.overlays.default
-            (final: prev: { inherit unstable; })
+        ];
-            vim-extra-plugins.overlays.default
-          ];
-        };
-
-      wrapUnstablePkgsSystem = { system }:
-        import nixos-unstable {
-          inherit system;
-          config.allowUnfree = true;
-        };
-
-      pkgsX64 = wrapPkgsSystem { system = x64System; };
-      unstableX64 = wrapPkgsSystem { system = x64System; };
-
-      utilsX64 = import ./lib {
-        inherit nixpkgs nixos-unstable home-manager;
-        pkgs = pkgsX64;
-        unstable = unstableX64;
-        system = x64System;
       };
+
+      unstable = import nixos-unstable {
+        inherit system;
+        config.allowUnfree = true;
+      };
+
+      utils = import ./lib {
+        inherit pkgs unstable nixpkgs nixos-unstable home-manager;
+      };
+
+      inherit (utils) host;
+      inherit (utils) user;
     in {
       nixosConfigurations = {
-        architect = utilsX64.host.mkHost {
+        architect = host.mkHost {
           name = "architect";
           users = [{
             user = "giulio";
             roles = [ ];
           }];
         };
-        gAluminum = utilsX64.host.mkHost {
+        gAluminum = host.mkHost {
           name = "gAluminum";
           users = [{
             user = "giulio";
@@ -57,7 +51,7 @@
           }];
           roles = [ "gnome" ];
         };
-        proxy = utilsX64.host.mkHost {
+        proxy = host.mkHost {
           name = "proxy";
           users = [ ];
         };

lib/default.nix

@@ -1,6 +1,6 @@
-{ pkgs, unstable, nixpkgs, nixos-unstable, home-manager, system, ... }: rec {
+{ pkgs, unstable, nixpkgs, nixos-unstable, home-manager, ... }: rec {
-  user = import ./user.nix { inherit pkgs unstable system home-manager; };
+  user = import ./user.nix { inherit pkgs unstable; };
   host = import ./host.nix {
-    inherit pkgs nixpkgs unstable nixos-unstable home-manager user system;
+    inherit pkgs nixpkgs unstable nixos-unstable home-manager user;
   };
 }

lib/host.nix

@@ -1,8 +1,10 @@
-{ pkgs, nixpkgs, nixos-unstable, unstable, home-manager, user, system, ... }:
+{ pkgs, nixpkgs, nixos-unstable, unstable, home-manager, user, ... }:
 
 {
   mkHost = { name, users, roles ? [ ], imports ? [ ] }:
     let
+      system = "x86_64-linux";
+
       mkRole = role: import (../roles + "/${role}.nix");
 
       users_mod = (map (u:

lib/user.nix

@@ -1,4 +1,4 @@
-{ pkgs, unstable, home-manager, ... }:
+{ pkgs, unstable, ... }:
 
 {
   mkUser = { name, roles ? [ ] }:
@@ -20,25 +20,7 @@
         extraGroups = [ "wheel" "plugdev" ];
       };
       
-      home-manager.users.${name}.imports = [ (mkRole "common") ] ++ roles_mod;
+      home-manager.users.${name}.imports = [ (mkRole "common") ]
-    };
+        ++ roles_mod;
-
-  mkHMUser = { name, roles }:
-    let
-      mkRole = role: import (../roles/home + "/${role}.nix");
-      roles_mod = (map (r: mkRole r) roles);
-    in home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      modules = [
-        {
-          home = {
-            username = name;
-            homeDirectory =
-              if pkgs.stdenv.isLinux then "/home/${name}" else "/Users/${name}";
-            stateVersion = "22.05";
-          };
-        }
-        (mkRole "common")
-      ] ++ roles_mod;
     };
 }

roles/home/common.nix

@@ -3,7 +3,9 @@
 {
   imports = [ ./zsh.nix ./git.nix ];
 
+  
   home = {
+    stateVersion = "21.05";
     sessionVariables = {
       EDITOR = "nvim";
       VISUAL = "nvim";