From 134d43fcab5fab0ee642ef9aef9988dc1cc151ff Mon Sep 17 00:00:00 2001 From: Guangxiong Lin Date: Wed, 15 Nov 2023 20:14:53 +0800 Subject: Add fish into bash instead of zsh --- .bashrc | 155 +++++---------------------------------------------- .env | 11 +++- .path | 4 +- .zshrc | 9 --- scripts/bootstrap.sh | 2 +- 5 files changed, 25 insertions(+), 156 deletions(-) diff --git a/.bashrc b/.bashrc index e23838c..5b2bf54 100644 --- a/.bashrc +++ b/.bashrc @@ -1,148 +1,21 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples +# +# ~/.bashrc +# -# If not running interactively, don't do anything -case $- in - *i*) ;; - *) return;; -esac - -# don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options -HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize +source "$HOME/.env" +source "$HOME/.path" -# If set, the pattern "**" used in a pathname expansion context will -# match all files and zero or more directories and subdirectories. -#shopt -s globstar - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi +# If not running interactively, don't do anything +[[ $- != *i* ]] && return -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color|*-256color) color_prompt=yes;; -esac +PS1='[\u@\h \W]\$ ' -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes +source "$HOME/.aliases" -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= +if command -v fish > /dev/null; then + if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' + exec fish $LOGIN_OPTION fi fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi - -# colored GCC warnings and errors -#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' - -# some more ls aliases -alias ll='ls -alF' -alias la='ls -A' -alias l='ls -CF' - -# Add an "alert" alias for long running commands. Use like so: -# sleep 10; alert -alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi - -# default editor -export EDITOR=/usr/bin/vim - -# alias -if grep -q Microsoft /proc/version; then - alias psh='powershell.exe' - alias expl='explorer.exe' -fi -alias g='git' -alias gaa='git add --all' -alias gc='git commit -v' -alias gp='git push' - -alias cd..='cd ..' - -alias pyinit='source venv/bin/activate' - -# X Server -if grep -q Microsoft /proc/version; then - export DISPLAY=localhost:0 -fi - -# autojump -if [ ! -d /usr/share/autojump ]; then - sudo apt install autojump -fi -. /usr/share/autojump/autojump.sh - -# fzf -[ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/.env b/.env index 292efbe..b5bbc00 100644 --- a/.env +++ b/.env @@ -1,12 +1,17 @@ +export VISUAL=vim +export EDITOR=vim + +export LANG=en_US.UTF-8 + +export GPG_TTY=$(tty) export LESS='-i -R' TERMINAL=xterm [ -e /usr/bin/urxvt ] && TERMINAL=urxvt -[ -x /usr/local/bin/st ] && TERMINAL=st +command -v foot > /dev/null && TERMINAL='foot' export TERMINAL=$TERMINAL -BROWSER='firefox --new-tab' -export BROWSER=$BROWSER +export BROWSER='firefox' if type fcitx5 > /dev/null; then export GLFW_IM_MODULE=ibus diff --git a/.path b/.path index a367b10..b9b5769 100755 --- a/.path +++ b/.path @@ -3,7 +3,7 @@ [ -d $HOME/bin ] && export PATH=$HOME/bin:$PATH [ -d $HOME/.local/bin ] && export PATH=$HOME/.local/bin:$PATH -if command -v go &> /dev/null +if command -v go > /dev/null then export GOPATH=$(go env GOPATH) export PATH=$PATH:$(go env GOPATH)/bin @@ -14,6 +14,6 @@ if gem env user_gemhome &> /dev/null; then export PATH="$PATH:$GEM_HOME/bin" fi -if command -v cargo &> /dev/null; then +if command -v cargo > /dev/null; then export PATH="$PATH:$HOME/.cargo/bin" fi diff --git a/.zshrc b/.zshrc index 378d28f..382b24c 100644 --- a/.zshrc +++ b/.zshrc @@ -2,11 +2,6 @@ setopt histignorealldups sharehistory hist_ignore_space # Use emacs keybindings even if our EDITOR is set to vi bindkey -e -export VISUAL=vim -export EDITOR=vim - -export LANG=en_US.UTF-8 -export GPG_TTY=$(tty) # Edit command line autoload -U edit-command-line @@ -39,7 +34,3 @@ fi [[ $(uname) == Darwin ]] && [ -r $HOME/.macos ] && source $HOME/.macos [ -r $HOME/.zsh_local ] && source $HOME/.zsh_local - -if command -v fish > /dev/null; then - exec fish -fi diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 90d7e18..ada87ad 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -25,7 +25,7 @@ link_all () { .zprofile .newsboat .ledgerrc .nnnrc .alacritty.yml .fzfrc .zplugrc \ .env .config/kitty .wezterm.lua .config/mpv \ .config/sway .config/swaylock .config/zathura .tigrc .config/foot \ - .config/fish .arch.aliases + .config/fish .arch.aliases .bashrc } main () { -- cgit v1.2.3