flake.nix

@@ -32,11 +32,7 @@
         };
 
       wrapUtils = { pkgs, unstable, system }:
-        let
+        pkgs.lib.makeScope pkgs.newScope (self: {
-          inherit (pkgs.lib) makeScope;
-          inherit (pkgs) newScope;
-        in
-        makeScope newScope (self: {
           inherit nixpkgs home-manager nixos-unstable;
           user = self.callPackage ./lib/user.nix { };
           host = self.callPackage ./lib/host.nix { };

lib/host.nix

@@ -3,7 +3,7 @@
 {
   mkHost = { name, users, roles ? [ ], imports ? [ ] }:
     let
-      mkRole = role: pkgs.callPackage (../roles + "/${role}.nix") { };
+      mkRole = role: import (../roles + "/${role}.nix");
 
       users_mod = (map
         (u:

roles/home/git.nix

@@ -2,7 +2,7 @@
   programs.git = {
     enable = true;
     userName = "Giulio De Pasquale";
-    userEmail = "git@depasquale.giugl.io";
+    userEmail = "depasquale+git@giugl.io";
     extraConfig = {
       filter."lfs" = {
         process = "git-lfs filter-process";