From 7f4fdcf4b90cf20756d5f7b246d00e22a43f8db8 Mon Sep 17 00:00:00 2001 From: John Lancaster <32917998+jsl12@users.noreply.github.com> Date: Sun, 26 Apr 2026 19:03:44 -0500 Subject: [PATCH] setting zsh shell --- modules/nix-tools/user.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/modules/nix-tools/user.nix b/modules/nix-tools/user.nix index f48a45e..552c269 100644 --- a/modules/nix-tools/user.nix +++ b/modules/nix-tools/user.nix @@ -14,20 +14,27 @@ inputs.home-manager.nixosModules.home-manager ]; + environment.shells = [ + "${lib.getExe pkgs.zsh}" + "${lib.getExe inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh}" + ]; + users.groups."${username}" = {}; users.users."${username}" = { isNormalUser = true; group = username; home = "/home/${username}"; - shell = lib.mkIf config.programs.zsh.enable pkgs.zsh; + shell = pkgs.zsh; extraGroups = [ "input" "networkmanager" ] - ++ lib.optional isAdmin "wheel" - ++ lib.optional config.virtualisation.docker.enable "docker" - ++ lib.optional (isAdmin && config.services.forgejo.enable) config.services.forgejo.group - ++ lib.optional (isAdmin && config.services.postgresql.enable) "postgres"; + ++ lib.optional isAdmin "wheel" + ++ lib.optional config.virtualisation.docker.enable "docker" + ++ lib.optional (isAdmin && config.services.forgejo.enable) config.services.forgejo.group + ++ lib.optional (isAdmin && config.services.postgresql.enable) "postgres"; }; + programs.zsh.enable = true; + security.sudo-rs.enable = lib.mkIf isAdmin true; home-manager.useGlobalPkgs = true; @@ -36,7 +43,9 @@ imports = [ self.modules.homeManager."${username}" ]; home.username = "${username}"; home.homeDirectory = "/home/${username}"; - # home.packages = homePackages; + home.packages = with pkgs; [ + # fzf zoxide starship + ]; }; }; };