From cbe791ead3d03dd0f0562b371e13e4ad2642cbba Mon Sep 17 00:00:00 2001 From: aleidk Date: Fri, 13 Jun 2025 16:32:37 -0400 Subject: [PATCH] set bash as default shell --- Configs/bash/.bashrc | 8 +++++ Configs/bash/.profile | 36 +++++++++++++++++++ .../fish/.config/fish/functions/aliases.fish | 0 Configs/fish/.config/fish/functions/la.fish | 4 --- Configs/fish/.config/fish/functions/ld.fish | 4 --- Configs/fish/.config/fish/functions/ls.fish | 4 --- Configs/zsh/.zshrc | 8 +---- 7 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 Configs/bash/.bashrc create mode 100644 Configs/bash/.profile create mode 100644 Configs/fish/.config/fish/functions/aliases.fish delete mode 100644 Configs/fish/.config/fish/functions/la.fish delete mode 100644 Configs/fish/.config/fish/functions/ld.fish delete mode 100644 Configs/fish/.config/fish/functions/ls.fish diff --git a/Configs/bash/.bashrc b/Configs/bash/.bashrc new file mode 100644 index 0000000..7e989a3 --- /dev/null +++ b/Configs/bash/.bashrc @@ -0,0 +1,8 @@ +# ╭──────────────────────────────────────────────────────────╮ +# │ Auto drop into fish only on login │ +# ╰──────────────────────────────────────────────────────────╯ + +if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' + exec fish $LOGIN_OPTION +fi diff --git a/Configs/bash/.profile b/Configs/bash/.profile new file mode 100644 index 0000000..f020fdf --- /dev/null +++ b/Configs/bash/.profile @@ -0,0 +1,36 @@ +update_path() { + export PATH="$PATH:$1" +} + +# Set manually +export REPOS="$HOME/.local/share/chezmoi" +export DOTS="$REPOS/Private/dots" +export EDITOR=nvim +export VISUAL="$EDITOR" +export QT_STYLE_OVERRIDE=kvantum +export MOZ_ENABLE_WAYLAND=1 + +# Use rbw as SSH Agent +# use https://github.com/pmkap/rbw/ until https://github.com/doy/rbw/issues/197 is closed +export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/rbw/ssh-agent-socket" + +update_path "$DOTS/scripts" +update_path "$HOME/.local/bin" +update_path "$HOME/bin" +update_path "/usr/local/bin" + +# Dev Stuff +export NPM_PACKAGES="$HOME/.npm-packages" +export NODE_PATH="$NPM_PACKAGES/lib/node_modules${NODE_PATH:+:$NODE_PATH}" +update_path "$NPM_PACKAGES/bin" + +export PNPM_HOME="$HOME/.local/share/pnpm" +update_path "$PNPM_HOME" + +export BUN_INSTALL="$HOME/.bun" +update_path "$BUN_INSTALL/bin" + +source "$HOME/.rye/env" + +# . "$HOME/.cargo/env" +update_path "$HOME/.cargo/bin/" diff --git a/Configs/fish/.config/fish/functions/aliases.fish b/Configs/fish/.config/fish/functions/aliases.fish new file mode 100644 index 0000000..e69de29 diff --git a/Configs/fish/.config/fish/functions/la.fish b/Configs/fish/.config/fish/functions/la.fish deleted file mode 100644 index dfabd9a..0000000 --- a/Configs/fish/.config/fish/functions/la.fish +++ /dev/null @@ -1,4 +0,0 @@ -function la --wraps='eza -lah --color=always --icons --git' --description 'alias la=eza -lah --color=always --icons --git' - eza -lah --color=always --icons --git $argv - -end diff --git a/Configs/fish/.config/fish/functions/ld.fish b/Configs/fish/.config/fish/functions/ld.fish deleted file mode 100644 index 8c3cf0e..0000000 --- a/Configs/fish/.config/fish/functions/ld.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ld --wraps='eza -la --no-permissions --no-filesize --no-time --no-time --no-user' --description 'alias ld=eza -la --no-permissions --no-filesize --no-time --no-time --no-user' - eza -la --no-permissions --no-filesize --no-time --no-time --no-user $argv - -end diff --git a/Configs/fish/.config/fish/functions/ls.fish b/Configs/fish/.config/fish/functions/ls.fish deleted file mode 100644 index 75680bf..0000000 --- a/Configs/fish/.config/fish/functions/ls.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ls --wraps='eza -lh --color=always --icons --git' --description 'alias ls=eza -lh --color=always --icons --git' - eza -lh --color=always --icons --git $argv - -end diff --git a/Configs/zsh/.zshrc b/Configs/zsh/.zshrc index 99c0248..ed402e2 100644 --- a/Configs/zsh/.zshrc +++ b/Configs/zsh/.zshrc @@ -79,10 +79,4 @@ zinit cdreplay -q # │ Init external programs │ # ╰──────────────────────────────────────────────────────────╯ -# eval "$(zoxide init --cmd cd zsh)" - -# Drop into fish -if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then - # shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' - exec fish $LOGIN_OPTION -fi +eval "$(zoxide init --cmd cd zsh)"