diff --git a/nvim/.config/nvim/lua/modules/treesitter.lua b/nvim/.config/nvim/lua/modules/treesitter.lua
index de2cb9e..02c9921 100644
--- a/nvim/.config/nvim/lua/modules/treesitter.lua
+++ b/nvim/.config/nvim/lua/modules/treesitter.lua
@@ -20,7 +20,6 @@ return {
 					require("rainbow-delimiters.setup").setup({})
 				end,
 			},
-			{ "nushell/tree-sitter-nu", version = false },
 		},
 		config = function()
 			local enabled_parsers = {}
diff --git a/office/.config/aerc/binds.conf b/office/.config/aerc/binds.conf
index 9db98df..34aac71 100644
--- a/office/.config/aerc/binds.conf
+++ b/office/.config/aerc/binds.conf
@@ -107,7 +107,7 @@ rq = :reply -aq<Enter>
 rR = :reply<Enter>
 rQ = :reply -q<Enter>
 
-c = :cf<space>
+c = :menu -d :cf<Enter>
 ! = :term<space>
 | = :pipe<space>
 
diff --git a/office/.config/sh/alias.d/taskwarrior.sh b/office/.config/sh/alias.d/taskwarrior.sh
index 9546974..3be2877 100644
--- a/office/.config/sh/alias.d/taskwarrior.sh
+++ b/office/.config/sh/alias.d/taskwarrior.sh
@@ -23,7 +23,8 @@ alias tal="task log"
 alias tan="task annotate"
 
 alias tn="task next +READY"
-alias td="task +TODAY or +OVERDUE"
+alias td="task +TODAY or +OVERDUE or sched.before:tom" # scheduled and due for today or before
+alias TD="task +TODAY or +OVERDUE"                     # DUE today or before
 alias tun="task next urgency \> 4"
 
 if exist timew; then
diff --git a/services/sv/goimapnotify/run b/services/sv/goimapnotify/run
index e4f4c4a..1ace545 100755
--- a/services/sv/goimapnotify/run
+++ b/services/sv/goimapnotify/run
@@ -3,8 +3,8 @@
 # CONFIG_FILE = full path to goimapnotify config file to be used
 # PROFILE = name of yaml file in goimapnotify config dir (without extension)
 # THROTTLE_RATE = amount of time to wait before retrying if connection fails
-DEFAULT_PROFILE="goimapnotify"
-DEFAULT_THROTTLE_RATE=10
+PROFILE="goimapnotify"
+THROTTLE_RATE=10
 
 set -e
 
@@ -15,17 +15,16 @@ if [ "$CONFIG_FILE" != "" ]; then
     config_path="$CONFIG_FILE"
 else
     config_dir="${XDG_CONFIG_HOME:-$HOME/.config}"
-    config_path="${config_dir}/goimapnotify/${PROFILE:-$DEFAULT_PROFILE}.yaml"
+    config_path="${config_dir}/goimapnotify/${PROFILE}.yaml"
 fi
 
 # Throttle before running watcher
-snooze -H /1 -M /1 -S /1 -t timefile -T "${THROTTLE_RATE:-$DEFAULT_THROTTLE_RATE}" || exit 1
+snooze -H /1 -M /1 -S /1 -t timefile -T "${THROTTLE_RATE}" || exit 1
 touch timefile
 
 if [ ! -f "$config_path" ]; then
-    echo "Config path not found: $config_path"
+    echo "goimapnotify config path not found: $config_path"
     exit 1
 fi
 
-echo "starting program"
 exec chpst -e "$TURNSTILE_ENV_DIR" goimapnotify -conf "$config_path" 2>&1
diff --git a/sh/.config/sh/alias.d/batcat.sh b/sh/.config/sh/alias.d/batcat.sh
index 36403e7..040e48f 100644
--- a/sh/.config/sh/alias.d/batcat.sh
+++ b/sh/.config/sh/alias.d/batcat.sh
@@ -13,8 +13,8 @@ alias rcat="$(which cat)"
 if command -v batcat >/dev/null 2>&1; then
     # For Ubuntu and Debian-based `bat` packages
     # the `bat` program is named `batcat` on these systems
-    alias cat="$(which batcat)"
+    alias cat="batcat"
 elif command -v bat >/dev/null 2>&1; then
     # For all other systems
-    alias cat="$(which bat)"
+    alias cat="bat"
 fi
diff --git a/terminal/.config/nushell/config.nu b/terminal/.config/nushell/config.nu
index ebfefae..def3a4a 100644
--- a/terminal/.config/nushell/config.nu
+++ b/terminal/.config/nushell/config.nu
@@ -9,7 +9,7 @@
 #
 # This file is loaded after env.nu and before login.nu
 #
-$env.config.show_banner = true # TODO: FOR TESTING PURPOSES
+$env.config.show_banner = false # TODO: FOR TESTING PURPOSES
 
 $env.config.edit_mode = "vi"
 $env.config.buffer_editor = "nvim"
@@ -51,6 +51,16 @@ $env.config.keybindings = [
             {send: Enter}
         ]
     }
+    {
+        name: insert_last_token
+        modifier: alt
+        keycode: char_.
+        mode: ["emacs", "vi_normal", "vi_insert"]
+        event: [
+          { edit: InsertString, value: "!$" }
+          { send: Enter }
+        ]
+    }
     {
         name: open_editor
         modifier: control
@@ -60,6 +70,16 @@ $env.config.keybindings = [
             send: OpenEditor
         }
     }
+    {
+        name: toggle_sudo
+        modifier: alt
+        keycode: char_s
+        mode: [emacs vi_insert vi_normal]
+        event: {
+            send: executehostcommand
+            cmd: "let cmd = (commandline); commandline edit (if $cmd starts-with sudo { $cmd | str replace -r '^sudo ' '' } else { 'sudo ' ++ $cmd });"
+        }
+    }
     {
         name: run_zoxide
         modifier: alt
diff --git a/terminal/.config/starship.toml b/terminal/.config/starship.toml
index e8031d0..de7e41d 100644
--- a/terminal/.config/starship.toml
+++ b/terminal/.config/starship.toml
@@ -21,6 +21,8 @@ $go\
 $lua\
 $nodejs\
 $python\
+$terraform\
+$typst\
 $package
 """
 
@@ -81,9 +83,20 @@ symbol = " 󱍔 "
 style = 'bold yellow'
 format = "[$symbol]($style)"
 
+[terraform]
+disabled = false
+
+[typst]
+disabled = false
+symbol = '󰛓 '
+
 [custom.shell_bash_indicator]
-command = 'echo 󱆃'
-when = ''' test "$0" = "/usr/bin/bash" '''
+command = 'echo '
+when = ' test "$STARSHIP_SHELL" = "bash" '
+
+[custom.shell_nushell_indicator]
+command = 'echo '
+when = ' test $env.STARSHIP_SHELL "==" "nu" '
 
 # TODO: Would be lovely to have jujutsu support here
 # An example implementation: https://github.com/jj-vcs/jj/wiki/Starship
diff --git a/vcs/jj/config/sh/alias.d/jj.sh b/vcs/jj/config/sh/alias.d/jj.sh
index a8033fe..d36e44b 100644
--- a/vcs/jj/config/sh/alias.d/jj.sh
+++ b/vcs/jj/config/sh/alias.d/jj.sh
@@ -55,6 +55,7 @@ alias jlo="jj log --summary -T builtin_log_compact_full_description -r 'recent()
 alias JLO="jj log --summary -T builtin_log_compact_full_description -r 'all()'"
 alias jloo="jj log --patch -r 'recent()'"
 alias JLOO="jj log --patch -r 'all()'"
+alias jlr="jj log" # 'raw' log mode for custom opts
 alias jol="jj op log"
 jlf() {
     jj log -r "description(substring-i:\"$*\")"