diff --git a/modules/nix-tools/user.nix b/modules/nix-tools/user.nix index a72c621..6744e99 100644 --- a/modules/nix-tools/user.nix +++ b/modules/nix-tools/user.nix @@ -9,14 +9,18 @@ # homeImports ? [ ], # homePackages ? [ ], }: { - nixos."${username}" = { config, lib, pkgs, ... }: { + nixos."${username}" = { config, lib, pkgs, ... }: + let + jslZsh = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh; + jslZshExe = lib.getExe' jslZsh "jsl-zsh"; + in { imports = [ inputs.home-manager.nixosModules.home-manager ]; environment.shells = [ "${lib.getExe pkgs.zsh}" - "${lib.getExe inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh}" + jslZshExe ]; users.groups."${username}" = {}; @@ -25,7 +29,7 @@ isNormalUser = true; group = username; home = "/home/${username}"; - shell = pkgs.zsh; + shell = jslZshExe; extraGroups = [ "input" "networkmanager" "video" "render" ] ++ lib.optional isAdmin "wheel" ++ lib.optional config.virtualisation.docker.enable "docker"