diff --git a/hosts/common/default.nix b/hosts/common/default.nix index abc5c8e..a8057b1 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -3,7 +3,17 @@ pkgs, lib, ... -}: { +}: let + mkUser = userName: { + isNormalUser = true; + home = "/home/${userName}"; + initialPassword = "password"; + extraGroups = ["wheel" "networkmanager" "docker" "video" "syncthing"]; + shell = pkgs.zsh; + }; + + defaultUser = "daniel"; +in { # Use the systemd-boot EFI boot loader. boot.kernelPackages = pkgs.linuxPackages_latest; boot.loader.systemd-boot.enable = lib.mkDefault true; @@ -33,14 +43,7 @@ hardware.cpu.intel.updateMicrocode = true; - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.daniel = { - isNormalUser = true; - home = "/home/daniel"; - initialPassword = "password"; - extraGroups = ["wheel" "networkmanager" "docker" "video" "syncthing"]; - shell = pkgs.zsh; - }; + users.users."${defaultUser}" = mkUser defaultUser; # List packages installed in system profile. To search, run: # $ nix search wget @@ -71,8 +74,8 @@ syncthing = { enable = true; - user = "daniel"; - dataDir = "/home/daniel"; + user = defaultUser; + dataDir = "/home/${defaultUser}"; }; tailscale = { diff --git a/users/daniel/default.nix b/users/daniel/default.nix index d19f5e9..2505e77 100644 --- a/users/daniel/default.nix +++ b/users/daniel/default.nix @@ -59,6 +59,8 @@ spotify-qt xclip ]; + + defaultUser = "daniel"; in { imports = [ @@ -72,8 +74,8 @@ in { ]; home = { - username = "daniel"; - homeDirectory = "/home/daniel"; + username = defaultUser; + homeDirectory = "/home/${defaultUser}"; sessionPath = [ "$HOME/go/bin" ];