diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 307cfb9..b5975c9 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -4,15 +4,21 @@ lib, ... }: let - mkUser = userName: { + mkUser = {userName, uid}: { isNormalUser = true; home = "/home/${userName}"; initialPassword = "password"; extraGroups = ["wheel" "networkmanager" "docker" "video" "syncthing"]; + uid = uid; + group = "users"; shell = pkgs.zsh; }; - defaultUser = "daniel"; + defaultUser = { + userName = "daniel"; + uid = 1000; + }; + in { # Use the systemd-boot EFI boot loader. boot.kernelPackages = pkgs.linuxPackages_latest; @@ -54,7 +60,12 @@ in { hardware.cpu.intel.updateMicrocode = true; - users.users."${defaultUser}" = mkUser defaultUser; + users.users."${defaultUser.userName}" = mkUser defaultUser; + + users.groups."users" = { + gid = 100; + }; + xdg.portal.wlr.enable = true; # List packages installed in system profile. To search, run: @@ -89,8 +100,8 @@ in { syncthing = { enable = true; - user = defaultUser; - dataDir = "/home/${defaultUser}"; + user = defaultUser.userName; + dataDir = "/home/${defaultUser.userName}"; }; tailscale = {