diff --git a/.config/fish/completions/git-forgit.fish b/.config/fish/completions/git-forgit.fish
index 2b9d5037..14dc7a7d 100644
--- a/.config/fish/completions/git-forgit.fish
+++ b/.config/fish/completions/git-forgit.fish
@@ -52,11 +52,13 @@ complete -c git-forgit -n '__fish_seen_subcommand_from checkout_file' -a "(__fis
 complete -c git-forgit -n '__fish_seen_subcommand_from checkout_tag' -a "(__fish_git_tags)" -d Tag
 complete -c git-forgit -n '__fish_seen_subcommand_from cherry_pick' -a "(complete -C 'git cherry-pick ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from clean' -a "(__fish_git_files untracked ignored)"
+complete -c git-forgit -n '__fish_seen_subcommand_from diff' -a "(complete -C 'git diff ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from fixup' -a "(__fish_git_local_branches)"
 complete -c git-forgit -n '__fish_seen_subcommand_from log' -a "(complete -C 'git log ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from reflog' -a "(complete -C 'git reflog ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from rebase' -a "(complete -C 'git rebase ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from reset_head' -a "(__fish_git_files all-staged)"
 complete -c git-forgit -n '__fish_seen_subcommand_from revert_commit' -a "(__fish_git_commits)"
+complete -c git-forgit -n '__fish_seen_subcommand_from show' -a "(complete -C 'git show ')"
 complete -c git-forgit -n '__fish_seen_subcommand_from stash_show' -a "(__fish_git_complete_stashes)"
 complete -c git-forgit -n '__fish_seen_subcommand_from stash_push' -a "(__fish_git_files modified deleted modified-staged-deleted)"
diff --git a/.config/helix/scripts/hx-typ-zathura.fish b/.config/helix/scripts/hx-typ-zathura.fish
index c2f5ace4..a129138a 100755
--- a/.config/helix/scripts/hx-typ-zathura.fish
+++ b/.config/helix/scripts/hx-typ-zathura.fish
@@ -9,136 +9,140 @@
 # Author: Daniel Fichtinger <daniel@ficd.ca
 # License: MIT
 
-argparse q/quiet k/kill-on-exit h/help -- $argv
+function hx-typ-zathura
+    argparse q/quiet k/kill-on-exit h/help -- $argv
 
-if test (count $argv) -eq 0; or set -q _flag_h
-    echo "Helper script for opening Typst files from Helix in Zathura."\n
-    echo "Usage: (bind the following to a key)"
-    echo ':sh hx-typ-zathura.fish [opts] %{buffer_name}'\n
-    echo 'Example for config.toml:'
-    echo '[keys.normal.space.t]'
-    echo "p = ':sh /path/to/hx-typ-zathura.fish -k %{buffer_name}'"\n
-    echo "Options:"
-    echo "-q/--quiet: Don't \`echo\` on caught errors, return 1 instead."
-    echo "-k/--kill-on-exit: Kill Zathura when parent Helix process exits."
-    echo "-h/--help: print this screen"\n
-    echo 'Author: Daniel Fichtinger <daniel@ficd.ca>'
-    echo 'License: MIT'
-    return 0
-end
-
-# only return status 1 if -q not set
-# (if return status != 0, helix will not
-# display anything that was echoed to stdout!)
-if set -q _flag_q
-    set ret 1
-else
-    set ret 0
-end
-
-# only echo if -q not set
-function qecho
-    if test "$ret" -ne 1
-        echo $argv[1]
+    if test (count $argv) -eq 0; or set -q _flag_h
+        echo "Helper script for opening Typst files from Helix in Zathura."\n
+        echo "Usage: (bind the following to a key)"
+        echo ':sh hx-typ-zathura.fish [opts] %{buffer_name}'\n
+        echo 'Example for config.toml:'
+        echo '[keys.normal.space.t]'
+        echo "p = ':sh /path/to/hx-typ-zathura.fish -k %{buffer_name}'"\n
+        echo "Options:"
+        echo "-q/--quiet: Don't \`echo\` on caught errors, return 1 instead."
+        echo "-k/--kill-on-exit: Kill Zathura when parent Helix process exits."
+        echo "-h/--help: print this screen"\n
+        echo 'Author: Daniel Fichtinger <daniel@ficd.ca>'
+        echo 'License: MIT'
+        return 0
     end
-end
 
-# check if the user asked to kill zathura on helix exit
-if set -q _flag_k
-    set kill_parent
-    # traverse up process tree to find caller Helix PID
-    # We use this PID to kill zathura if Helix exits first!
-    # we only need to define this function
-    # inside this scope
-    function find_parent_process -a target
-        # initialize current_pid as this shell's pid
-        set -f current_pid $fish_pid
+    # only return status 1 if -q not set
+    # (if return status != 0, helix will not
+    # display anything that was echoed to stdout!)
+    if set -q _flag_q
+        set ret 1
+    else
+        set ret 0
+    end
 
-        # Stop when we reach init (PID 1)
-        while test $current_pid -ne 1
-            # parent of current_pid
-            set parent (ps -o ppid= -p $current_pid | string trim)
-            # get parent's command name
-            set cmd (ps -o comm= -p $parent | string trim)
-
-            # if the cmd matches our target command we return its pid
-            if string match -q -- $target $cmd
-                echo "$parent"
-                return 0
-            end
-
-            set -f current_pid $parent
+    # only echo if -q not set
+    function qecho
+        if test "$ret" -ne 1
+            echo $argv[1]
         end
-        return 1
     end
 
-    set parent_pid (find_parent_process hx)
-    if test -z "$parent_pid"
-        qecho "Couldn't find parent hx process!"
+    # check if the user asked to kill zathura on helix exit
+    if set -q _flag_k
+        set kill_parent
+        # traverse up process tree to find caller Helix PID
+        # We use this PID to kill zathura if Helix exits first!
+        # we only need to define this function
+        # inside this scope
+        function find_parent_process -a target
+            # initialize current_pid as this shell's pid
+            set -f current_pid $fish_pid
+
+            # Stop when we reach init (PID 1)
+            while test $current_pid -ne 1
+                # parent of current_pid
+                set parent (ps -o ppid= -p $current_pid | string trim)
+                # get parent's command name
+                set cmd (ps -o comm= -p $parent | string trim)
+
+                # if the cmd matches our target command we return its pid
+                if string match -q -- $target $cmd
+                    echo "$parent"
+                    return 0
+                end
+
+                set -f current_pid $parent
+            end
+            return 1
+        end
+
+        set parent_pid (find_parent_process hx)
+        if test -z "$parent_pid"
+            qecho "Couldn't find parent hx process!"
+            return $ret
+        end
+    end
+
+    # opens zathura, optionally watching for helix closing
+    function zopen --wraps zathura
+        # this should be set if the user asked to watch
+        if set -q kill_parent
+            # create background sub-process
+            # otherwise helix will hang
+            begin
+                zathura "$argv[1]" &>/dev/null &
+                set zathura_pid $last_pid
+                waitpid -c 1 "$parent_pid" "$zathura_pid"
+                kill $zathura_pid &>/dev/null
+            end &
+        else
+            # user didn't ask for watch, so open normally
+            zathura "$argv[1]" &>/dev/null &
+        end
+        true
+    end
+
+    # try to find the target pdf file searching from root
+    function find_pdf
+        set -l root $argv[1]
+        set -l base $argv[2]
+        set -l candidate (fd --no-ignore-vcs -F -1 "$base" "$root")
+        if test -n "$candidate"
+            zopen "$candidate"
+        else
+            return 1
+        end
+    end
+
+    # absolute path of %{buffer_name} file
+    set -l src (path resolve $argv[1])
+    # exit if not a typst file
+    if not string match -q '*.typ' $src
+        qecho "$(path basename $src) is not a Typst file!"
         return $ret
     end
-end
+    # change abs path to pdf extension
+    set -l targ (string replace '.typ' '.pdf' $src)
+    # get pdf target's base name
+    set -l base (path basename --no-extension $src).pdf
 
-# opens zathura, optionally watching for helix closing
-function zopen --wraps zathura
-    # this should be set if the user asked to watch
-    if set -q kill_parent
-        # create background sub-process
-        # otherwise helix will hang
-        begin
-            zathura "$argv[1]" &>/dev/null &
-            set zathura_pid $last_pid
-            waitpid -c 1 "$parent_pid" "$zathura_pid"
-            kill $zathura_pid &>/dev/null
-        end &
+    # if a suitable pdf exists in the same dir, open it
+    if test -f "$targ"
+        zopen "$targ"
     else
-        # user didn't ask for watch, so open normally
-        zathura "$argv[1]" &>/dev/null &
-    end
-    true
-end
-
-# try to find the target pdf file searching from root
-function find_pdf
-    set -l root $argv[1]
-    set -l base $argv[2]
-    set -l candidate (fd --no-ignore-vcs -F -1 "$base" "$root")
-    if test -n "$candidate"
-        zopen "$candidate"
-    else
-        return 1
-    end
-end
-
-# absolute path of %{buffer_name} file
-set -l src (path resolve $argv[1])
-# exit if not a typst file
-if not string match -q '*.typ' $src
-    qecho "$(path basename $src) is not a Typst file!"
-    return $ret
-end
-# change abs path to pdf extension
-set -l targ (string replace '.typ' '.pdf' $src)
-# get pdf target's base name
-set -l base (path basename --no-extension $src).pdf
-
-# if a suitable pdf exists in the same dir, open it
-if test -f "$targ"
-    zopen "$targ"
-else
-    # no such file in current dir, time to search!
-    # if we're in a git repo, search from its root
-    # if we're not, search from cwd
-    if git rev-parse --is-inside-work-tree &>/dev/null
-        set root (git rev-parse --show-toplevel)
-    else
-        set root (pwd)
-    end
-    if not find_pdf "$root" "$base"
-        if set -q _flag_q
-            return 1
+        # no such file in current dir, time to search!
+        # if we're in a git repo, search from its root
+        # if we're not, search from cwd
+        if git rev-parse --is-inside-work-tree &>/dev/null
+            set root (git rev-parse --show-toplevel)
         else
-            echo "$base couldn't be found at root $root!"
+            set root (pwd)
+        end
+        if not find_pdf "$root" "$base"
+            if set -q _flag_q
+                return 1
+            else
+                echo "$base couldn't be found at root $root!"
+            end
         end
     end
 end
+
+hx-typ-zathura $argv