Commit 6549fa60d8ab48040791336a4bbeffb7ad5072a4
Parent: 286714d0421da05ec931784cf439dd50bf3ed884
Author: Matt Colligan <matt@edra.ai>
Date: 2025-08-21 15:59:22 +0100
Committer: Matt Colligan <matt@edra.ai>
Committed: 2025-08-21 15:59:22 +0100

changes

zshrc Modified

@@ -62,7 +62,7 @@
     SUDO_EDITOR=nvim \
     EDITOR=nvim \
     AUR_PAGER=ranger \
-    TERM=xterm \
+    TERM=xterm-256color \
     LANG=en_GB.UTF-8 \
     LC_CTYPE=en_GB.UTF-8 \
     PAGER="less --mouse" \

fzf.zsh Modified

@@ -12,7 +12,7 @@
 	#--bind 'ctrl-/:change-preview-window(down|hidden|)'
     export FZF_DEFAULT_OPTS="
 	--tmux
-	--walker-skip .git,node_modules,target,.mypy_cache,.venv,__pycache__,.DS_Store
+	--walker-skip .git,node_modules,target,.mypy_cache,.venv,__pycache__,.DS_Store,ws
 	"
     export FZF_CTRL_T_COMMAND=""
     source <(fzf --zsh)

functions.zsh Modified

@@ -3,28 +3,30 @@
 #
 
 # use last browsed directory automatically with ranger
-_ranger=`which ranger`
-ranger-cd() { 
-    tempfile="$(mktemp -t ranger.XXXXXX)"
-    if [[ -f $HOME/.local/bin/ranger ]]
-    then
-	$HOME/.local/bin/ranger --choosedir="$tempfile" "${@:-$(pwd)}"
-    else
-	$_ranger --choosedir="$tempfile" "${@:-$(pwd)}"
-    fi
-    test -f "$tempfile" &&
-	if [ "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then
-	    cd -- "$(cat "$tempfile")"
+if which ranger &> /dev/null; then
+    _ranger=`which ranger`
+    ranger-cd() {
+	tempfile="$(mktemp -t ranger.XXXXXX)"
+	if [[ -f $HOME/.local/bin/ranger ]]
+	then
+	    $HOME/.local/bin/ranger --choosedir="$tempfile" "${@:-$(pwd)}"
+	else
+	    $_ranger --choosedir="$tempfile" "${@:-$(pwd)}"
 	fi
-	rm -f -- "$tempfile"
-}
-ranger() { # prevent nested ranger instances when shelling from ranger
-    if [ -z "$RANGER_LEVEL" ]; then
-	ranger-cd "$@"
-    else
-	exit
-    fi
-}
+	test -f "$tempfile" &&
+	    if [ "$(cat -- "$tempfile")" != "$(echo -n `pwd`)" ]; then
+		cd -- "$(cat "$tempfile")"
+	    fi
+	    rm -f -- "$tempfile"
+    }
+    ranger() { # prevent nested ranger instances when shelling from ranger
+	if [ -z "$RANGER_LEVEL" ]; then
+	    ranger-cd "$@"
+	else
+	    exit
+	fi
+    }
+fi
 
 shebang() { # create new file, add shebang, and vim
     touch $1

aliases Modified

@@ -85,9 +85,9 @@
 rb() {
     if git branch | /usr/bin/grep -qw main
     then
-	git pull --rebase upstream main
+	git pull --rebase origin main
     else
-	git pull --rebase upstream master
+	git pull --rebase origin master
     fi
 }
 alias rbi='git rebase -i'