diff options
| -rw-r--r-- | users/seth/default.nix | 2 | ||||
| -rw-r--r-- | users/seth/programs/default.nix | 1 | ||||
| -rw-r--r-- | users/seth/shell/bash.nix | 7 | ||||
| -rw-r--r-- | users/seth/shell/default.nix | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/users/seth/default.nix b/users/seth/default.nix index 15ddbfa..e53b125 100644 --- a/users/seth/default.nix +++ b/users/seth/default.nix @@ -12,7 +12,7 @@ extraGroups = ["wheel"]; isNormalUser = true; hashedPassword = "***REMOVED***"; - shell = pkgs.bash; + shell = pkgs.zsh; }; home-manager.users.seth = { diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix index d9ccaf1..6e6734e 100644 --- a/users/seth/programs/default.nix +++ b/users/seth/programs/default.nix @@ -14,6 +14,7 @@ bat clang deadnix + eclint exa fd lld diff --git a/users/seth/shell/bash.nix b/users/seth/shell/bash.nix index 18167a4..c66e6a0 100644 --- a/users/seth/shell/bash.nix +++ b/users/seth/shell/bash.nix @@ -5,6 +5,13 @@ }: { programs.bash = { enable = true; + bashrcExtra = '' + # drop into fish + if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z $BASH_EXECUTION_STRING ]] + then + exec fish + fi + ''; historyFile = "${config.xdg.stateHome}/bash/history"; historyFileSize = 1000; historySize = 100; diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix index a9e1afd..088feec 100644 --- a/users/seth/shell/default.nix +++ b/users/seth/shell/default.nix @@ -10,8 +10,8 @@ ]; home.sessionVariables = { - EDITOR = pkgs.neovim; - VISUAL = pkgs.neovim; + EDITOR = "nvim"; + VISUAL = "nvim"; CARGO_HOME = "${config.xdg.dataHome}/cargo"; RUSTUP_HOME = "${config.xdg.dataHome}/rustup"; LESSHISTFILE = "${config.xdg.stateHome}/less/history"; |