123

home/home.nix

@@ -4,19 +4,12 @@ let
     {
       config,
       lib,
+      pkgs,
       xlib,
       ...
     }:
     let
-      mkHomeModule =
+      mkHomeModule = username: {
-        { username }:
-        {
-          config,
-          lib,
-          pkgs,
-          ...
-        }:
-        {
         imports = [
           (./. + "/${xlib.device.type}.nix")
         ];
@@ -27,57 +20,14 @@ let
           enableNixpkgsReleaseCheck = false;
         };
       };
-
-      mkModule = username: mkHomeModule { username = username; };
-
-      homeModule = mkModule xlib.device.username;
-      rootModule = mkModule "root";
-      # homeModule =
-      #   {
-      #     config,
-      #     lib,
-      #     pkgs,
-      #     ...
-      #   }:
-      #   {
-      #     imports = [
-      #       (./. + "/${xlib.device.type}.nix")
-      #     ];
-      #     home = {
-      #       username = xlib.device.username;
-      #       stateVersion = lib.mkDefault "25.05";
-      #       homeDirectory = "/home/${config.home.username}";
-      #       enableNixpkgsReleaseCheck = false;
-      #     };
-      #   };
-
-      # rootModule =
-      #   {
-      #     config,
-      #     lib,
-      #     pkgs,
-      #     ...
-      #   }:
-      #   {
-      #     imports = [
-      #       (./. + "/${xlib.device.type}.nix")
-      #     ];
-      #     home = {
-      #       username = "root";
-      #       stateVersion = lib.mkDefault "25.05";
-      #       homeDirectory = lib.mkDefault "/${config.home.username}";
-      #       enableNixpkgsReleaseCheck = false;
-      #     };
-      #   };
-
     in
     {
       home-manager = {
         useGlobalPkgs = true;
         useUserPackages = true;
         users = {
-          "${xlib.device.username}" = homeModule;
+          "${xlib.device.username}" = mkHomeModule xlib.device.username;
-          root = rootModule;
+          root = mkHomeModule "root";
         };
         sharedModules = [
           inputs.plasma-manager.homeModules.plasma-manager