Switch to fish shell

This commit is contained in:
Dave Gallant
2025-11-10 14:38:59 -05:00
committed by Dave Gallant
parent 75ca714850
commit 52071c17be
3 changed files with 36 additions and 34 deletions

View File

@@ -97,7 +97,7 @@ in
scrolling.history = 100000; scrolling.history = 100000;
general.live_config_reload = true; general.live_config_reload = true;
terminal.shell = { terminal.shell = {
program = "bash"; program = "fish";
}; };
font = { font = {
size = lib.mkForce 14.0; size = lib.mkForce 14.0;
@@ -110,6 +110,7 @@ in
starship = { starship = {
enable = true; enable = true;
enableFishIntegration = true;
settings = { settings = {
add_newline = false; add_newline = false;
gcloud = { gcloud = {
@@ -121,45 +122,39 @@ in
}; };
}; };
bash = { fish = {
enable = true; enable = true;
# autosuggestion.enable = true;
historySize = 1000000;
initExtra = '' interactiveShellInit = ''
export PAGER=less set fish_greeting # Disable greeting
export EDITOR=vim
export DOCKER_CLI_HINTS=false
export TERM=xterm-256color
export DOCKER_DEFAULT_PLATFORM=linux/amd64 # environment variables
export NNN_FIFO="$XDG_RUNTIME_DIR/nnn.fifo"; set -x PAGER less
set -x EDITOR vim
set -x DOCKER_CLI_HINTS false
set -x TERM xterm-256color
set -x DOCKER_DEFAULT_PLATFORM linux/amd64
set -x NNN_FIFO "$XDG_RUNTIME_DIR/nnn.fifo"
export PATH=$PATH:~/.cargo/bin # PATH
export PATH=$PATH:~/.local/bin set -x PATH $PATH ~/.cargo/bin
export PATH=$PATH:~/.npm-packages/bin set -x PATH $PATH ~/.local/bin
export PATH=$PATH:/opt/homebrew/bin set -x PATH $PATH ~/.npm-packages/bin
export PATH=$PATH:~/.krew/bin set -x PATH $PATH /opt/homebrew/bin
export PATH=$PATH:~/bin set -x PATH $PATH ~/.krew/bin
export GOPATH=~/go set -x PATH $PATH ~/bin
export GOBIN=$GOPATH/bin
export PATH=$PATH:$GOBIN
source $HOME/.bash-work # Go-related environment
set -x GOPATH ~/go
set -x GOBIN $GOPATH/bin
set -x PATH $PATH $GOBIN
if [[ "$OSTYPE" == "darwin"* ]]; source $HOME/work.fish
then
export PATH="$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH"
fi
source <(helm completion bash) atuin init fish | source
source <(kubectl completion bash) helm completion fish | source
eval "$(atuin init bash)" kubectl completion fish | source
# '';
# kubecolor
source <(kubectl completion bash)
alias kubectl=kubecolor
'';
shellAliases = { shellAliases = {
".." = "cd .."; ".." = "cd ..";
@@ -172,6 +167,7 @@ in
grep = "rg --smart-case"; grep = "rg --smart-case";
j = "just"; j = "just";
k = "kubecolor"; k = "kubecolor";
kubectl = "kubecolor";
kp = "viddy 'kubectl get pods'"; kp = "viddy 'kubectl get pods'";
kcx = "kubectx"; kcx = "kubectx";
kns = "kubens"; kns = "kubens";

View File

@@ -271,7 +271,7 @@
"libvirtd" "libvirtd"
"corectrl" "corectrl"
]; ];
shell = pkgs.bash; shell = pkgs.fish;
}; };
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
@@ -293,7 +293,10 @@
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
documentation.man.generateCaches = false;
programs = { programs = {
fish.enable = true;
gnupg.agent = { gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;

View File

@@ -15,6 +15,9 @@
system.stateVersion = 4; system.stateVersion = 4;
users.users."dave.gallant".home = "/Users/dave.gallant"; users.users."dave.gallant".home = "/Users/dave.gallant";
users.users."dave.gallant".shell = pkgs.fish;
programs.fish.enable = true;
system.primaryUser = "dave.gallant"; system.primaryUser = "dave.gallant";