From 162d649279c4a0f9aff627629bdc3ac1eafbd996 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 10 Aug 2024 09:48:38 -0700 Subject: [PATCH] Update bash config. --- bashrc | 4 ++-- commonshrc | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bashrc b/bashrc index 62d2586..26baad9 100644 --- a/bashrc +++ b/bashrc @@ -14,7 +14,7 @@ HISTFILE=~/.bash_history shopt -s histappend PROMPT_COMMAND="history -a; history -c; history -r" -. ~/etc/liquidprompt/liquidprompt +type -t starship >/dev/null && eval "$(starship init bash)" shopt -s autocd shopt -s globstar @@ -31,4 +31,4 @@ if type -t __git_complete >/dev/null; then __git_complete gp _git_push fi -test -f ~/.fzf/shell/key-bindings.bash && . ~/.fzf/shell/key-bindings.bash +test -f /usr/share/fzf/shell/key-bindings.bash && . /usr/share/fzf/shell/key-bindings.bash diff --git a/commonshrc b/commonshrc index a6d3de7..1a19a40 100644 --- a/commonshrc +++ b/commonshrc @@ -10,17 +10,15 @@ alias ls='ls --color=auto' export EMAIL='gebner@gebner.org' test -x /usr/bin/lesspipe && eval `lesspipe` -export MPD_HOST=127.0.0.1 MPD_PORT=6600 - -export EDITOR="`which nvim || which vim || which vi`" -alias vi="$EDITOR" +if type -t nvim >/dev/null; then + export EDITOR="$(command -v nvim)" + alias vi="$EDITOR" +fi export BROWSER=xdg-open alias udetokei='tokei $(rg --files)' -alias time=$(which time) - # passc passc() { pass show "$1" | (read i; cat; echo -n "$i" | xclip -l 1 -se c)