From ced818dedb0a4f9e7afd397c1e31746a23fe0590 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Fri, 28 Mar 2025 19:35:28 +0100 Subject: [PATCH] Make bash the default shell but use zsh on workstations --- hosts/shared.nix | 10 +--------- users/seb/@fern/default.nix | 4 ++++ users/seb/@north/default.nix | 4 ++++ users/seb/user.nix | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/hosts/shared.nix b/hosts/shared.nix index 2d57229..4f57191 100644 --- a/hosts/shared.nix +++ b/hosts/shared.nix @@ -50,20 +50,12 @@ users.mutableUsers = false; - programs = { - zsh = { - enable = true; - autosuggestions.enable = true; - syntaxHighlighting.enable = true; - }; - - neovim = { + programs.neovim = { enable = true; defaultEditor = true; viAlias = true; vimAlias = true; }; - }; environment.systemPackages = [ pkgs.git diff --git a/users/seb/@fern/default.nix b/users/seb/@fern/default.nix index 6cf0a20..a9a9bcd 100644 --- a/users/seb/@fern/default.nix +++ b/users/seb/@fern/default.nix @@ -1,8 +1,12 @@ +{ pkgs, ... }: { imports = [ ../../home-manager.nix ../user.nix ]; + users.users.seb.shell = pkgs.zsh; + programs.zsh.enable = true; + home-manager.users.seb = ./home.nix; } diff --git a/users/seb/@north/default.nix b/users/seb/@north/default.nix index 6cf0a20..a9a9bcd 100644 --- a/users/seb/@north/default.nix +++ b/users/seb/@north/default.nix @@ -1,8 +1,12 @@ +{ pkgs, ... }: { imports = [ ../../home-manager.nix ../user.nix ]; + users.users.seb.shell = pkgs.zsh; + programs.zsh.enable = true; + home-manager.users.seb = ./home.nix; } diff --git a/users/seb/user.nix b/users/seb/user.nix index ae9b8d6..5e01c35 100644 --- a/users/seb/user.nix +++ b/users/seb/user.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, ... }: { sops.secrets."seb-password".neededForUsers = true; @@ -6,7 +6,6 @@ isNormalUser = true; description = "Sebastian Stork"; hashedPasswordFile = config.sops.secrets."seb-password".path; - shell = pkgs.zsh; extraGroups = [ "wheel" "libvirtd"