Commit 84aff2e11393ee261481bb3bfdf5b765748d40d2
Parent: f37d93757c828f1f43042b92a64348a95c2910ae
Author: mcol <mcol@posteo.net>
Date: 2022-10-07 00:31:42 +0100
Committer: mcol <mcol@posteo.net>
Committed: 2022-10-07 00:31:42 +0100

updates

zshrc Modified

@@ -56,30 +56,25 @@
 
 bindkey '^A' autosuggest-execute
 
-export SUDO_EDITOR=vim
-export EDITOR=vim
-export AUR_PAGER=ranger
+export \
+    SUDO_EDITOR=vim \
+    EDITOR=vim \
+    AUR_PAGER=ranger \
+    TERM=xterm \
+    LANG=en_US.UTF-8 \
+    LC_CTYPE=en_US.UTF-8 \
+    PAGER="less --mouse" \
+    RANGER_LOAD_DEFAULT_RC=FALSE
 
 # ensure that the prompt is redrawn when the terminal size changes.
 TRAPWINCH () { zle &&  zle -R }
 
-# these are needed for some unicode to work (e.g. in tmux)
-export LANG=en_US.UTF-8
-export LC_CTYPE=en_US.UTF-8
-
-# don't load default ranger config
-export RANGER_LOAD_DEFAULT_RC=FALSE
-
-export PYTHONPATH=$HOME/git/reach:$PYTHONPATH
-
-# mypy
-export MYPYPATH=$PYTHONPATH
-
-export PAGER="less --mouse"
-
 # If being executed via the '2' script
 if [[ -n "$DO2" ]]
 then
     z $DO2
     unset DO2
 fi
+
+# Init PYENV for interactive shell
+eval "$(pyenv init -)"

rc.conf Modified

@@ -650,7 +650,7 @@
 map gW cd ~/work/research/research.wiki
 map gr cd ~/work/analysis/rochefort-tools
 map gv cd ~/.vim
-map gD cd ~/Downloads
+map gD cd ~/downloads
 map gz cd ~/.zsh
 map gB cd ~/.local/share/Trash/files
 map gq cd ~/git/qtile
@@ -672,4 +672,4 @@
 map bg shell gita add $(git rev-parse --show-toplevel) | less --mouse
 # a plugin that adds file glyphs / icon support to Ranger:
 # https://github.com/alexanderjeurissen/ranger_devicons
-default_linemode devicons
+#default_linemode devicons

aliases Modified

@@ -13,6 +13,7 @@
 alias p='ps aux  | grep -v grep | grep -i'
 alias import='echo you forgot to enter python'
 alias rg='grep -r'
+alias pth='echo "${PATH//:/\n}"'
 vgr() { vim `grep -lr "$@"`; }
 
 if [[ -z "$WAYLAND_DISPLAY" ]]
@@ -68,7 +69,14 @@
 alias pshs='git push &> /dev/null &'
 alias fe='git fetch && git status'
 alias pl='git pull'
-alias rb='git pull --rebase upstream master || git pull --rebase upstream main'
+rb() {
+    if git branch | /usr/bin/grep -qw main
+    then
+	git pull --rebase upstream main
+    else
+	git pull --rebase upstream master
+    fi
+}
 alias rbi='git rebase -i'
 alias rbc='git rebase --continue'
 alias rba='git rebase --abort'
@@ -76,7 +84,7 @@
 alias br='git branch -v'
 alias ch='git checkout'
 alias dif='git diff'
-alias diff='git diff --'
+#alias diff='git diff --'
 alias dic='git diff --cached'
 alias cl='git clone'
 alias chp='git cherry-pick'
@@ -96,7 +104,6 @@
 alias psiu='python setup.py -q install --user'
 alias m=make
 alias mc='make clean'
-alias time='hyperfine'
 
 # quick edits
 alias modalia='vim $HOME/.config/aliases && source $HOME/.config/aliases'
@@ -108,7 +115,7 @@
 # shortcuts
 alias gc='cd $HOME/.config'
 alias gd='cd $HOME/documents'
-alias gD='cd $HOME/Downloads'
+alias gD='cd $HOME/downloads'
 alias gde='cd $HOME/desktop'
 alias gg='cd $HOME/git; l'
 alias gb='cd $HOME/.config/bin'