summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Noll <nbnoll@eml.cc>2021-12-10 19:57:52 -0800
committerNicholas Noll <nbnoll@eml.cc>2021-12-10 19:57:52 -0800
commit529e2b498a98751fd60f099f314ba913cdae1c01 (patch)
tree1fbbc1023c1c8807060570fb8e11f4480b386e87
parentc747163a18d4e6e110ffd2afea69dd5e0f243687 (diff)
update lost files
-rw-r--r--.bash_profile5
-rw-r--r--.bashrc22
2 files changed, 23 insertions, 4 deletions
diff --git a/.bash_profile b/.bash_profile
index c4b4855..8df2062 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -33,7 +33,10 @@ export QT_QPA_PLATFORMTHEME=qt5ct
sed -i 's/echo Agent pid [0-9]*;$//g' $HOME/.ssh/ssh-agent.env
source $HOME/.ssh/ssh-agent.env
-set -o vi
+# recolor if we are linux
+if [[ $TERM = "linux" ]]; then
+ recolor-vty
+fi
# Get the aliases and functions
[ -f $HOME/.bashrc ] && . $HOME/.bashrc
diff --git a/.bashrc b/.bashrc
index b0b9d5c..9ac8c8b 100644
--- a/.bashrc
+++ b/.bashrc
@@ -18,7 +18,6 @@ alias .....='cd ../../../..'
alias dots='git --git-dir=$HOME/.dots --work-tree=$HOME'
alias lofi="mpv 'https://www.youtube.com/watch?v=5qap5aO4i9A' --no-video"
-alias tmux='tmux -f $HOME/.config/tmux/config'
alias mail='neomutt'
dbg()
@@ -65,13 +64,13 @@ pkg()
install | i)
shift 1
(
- cd $HOME/opt/void-packages;
+ cd "$HOME/opt/void-packages" || exit;
xi "$@"
)
;;
*)
(
- cd $HOME/opt/void-packages;
+ cd "$HOME/opt/void-packages" || exit;
./xbps-src "$@"
)
;;
@@ -108,6 +107,9 @@ g()
checkout | co)
git checkout "$@"
;;
+ diff | d)
+ git diff "$@"
+ ;;
tag | t)
git tag "$@"
;;
@@ -152,6 +154,18 @@ g()
}
export -f g
+tmux()
+{
+ shift 1
+ if [[ "$TERM" == linux ]]
+ then
+ command tmux -f "$HOME/.config/tmux/linux" "$@"
+ else
+ command tmux -f "$HOME/.config/tmux/config" "$@"
+ fi
+}
+export -f tmux
+
# su
su()
{
@@ -315,3 +329,5 @@ prompt_init()
if [ -z "${prompt_skip_init:-}" ]; then
prompt_init
fi
+
+set -o vi