diff --git a/modules/core/user.nix b/modules/core/user.nix index c988eda..4d3f355 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -1,26 +1,37 @@ -{ pkgs, inputs, config, username, host, ...}: { - imports = [ inputs.home-manager.nixosModules.home-manager ] ++ [ ./../../roles ] ++ [./../../variables.nix]; + pkgs, + inputs, + config, + username, + host, + ... +}: +{ + imports = + [ inputs.home-manager.nixosModules.home-manager ] + ++ [ ./../../roles/default.nix ] + ++ [ ./../../variables.nix ]; home-manager = { useUserPackages = true; useGlobalPkgs = true; extraSpecialArgs = { inherit inputs username host; }; users.${username} = { - imports = - if (host == "desktop") then - [ ./../home/default.desktop.nix ] + imports = + if (host == "desktop") then + [ ./../home/default.desktop.nix ] else if (host == "violet") then [ ./../home/default.server.nix ] else if (host == "dandelion") then [ ./../home/default.server.nix ] # else if (host == "yoshino") then - # [ ./../home/default.nix ] - else [ ./../home ]; - home = { - username = "${username}"; - homeDirectory = "/home/${username}"; - stateVersion = "22.11"; - }; + # [ ./../home/default.nix ] + else + [ ./../home ]; + home = { + username = "${username}"; + homeDirectory = "/home/${username}"; + stateVersion = "22.11"; + }; programs.home-manager.enable = true; }; }; @@ -28,7 +39,12 @@ users.users.${username} = { isNormalUser = true; description = "${username}"; - extraGroups = [ "networkmanager" "wheel" "docker" "input" ]; + extraGroups = [ + "networkmanager" + "wheel" + "docker" + "input" + ]; shell = pkgs.zsh; }; nix.settings.allowed-users = [ "${username}" ];