diff --git a/common.nix b/common.nix index aa2a9ff3..474d442e 100644 --- a/common.nix +++ b/common.nix @@ -3,7 +3,6 @@ { imports = [ ./modules - ./user.nix ./desktop ./dev ./host @@ -86,4 +85,21 @@ # timezone time.timeZone = "America/New_York"; + + # user + users = { + mutableUsers = false; + + users.user = { + isNormalUser = true; + uid = 1000; + password = "user"; + extraGroups = [ "wheel" "networkmanager" ]; + }; + }; + + home-manager.users.user = { + home.username = "user"; + home.homeDirectory = "/home/user"; + }; } diff --git a/user.nix b/user.nix deleted file mode 100644 index 29044567..00000000 --- a/user.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - users = { - mutableUsers = false; - - users.user = { - isNormalUser = true; - uid = 1000; - password = "user"; - extraGroups = [ "wheel" "networkmanager" ]; - }; - }; - - home-manager.users.user = { - home.username = "user"; - home.homeDirectory = "/home/user"; - }; -}