update git config: reorder aliases, drop nvimdiff, add lg

Correct the terminal-feature typo to terminal-features, add kitty extkeys, and remove now-redundant comments.

config/foot/foot.ini

@@ -1,7 +1,7 @@
 [main]
 font=MonaspiceNeNerdFontMono:size=13
 term=xterm-256color
-pad=6x6
+pad=3x3
 initial-window-mode=windowed
 workers=0
 include=~/.local/state/omarchy/current/theme/foot.ini

config/git/config

@@ -12,9 +12,10 @@ ui = auto
 
 [branch]
 autosetupmerge = true
+sort = -committerdate
 
 [tag]
-sort = version:refname
+sort = -version:refname
 
 [diff]
 algorithm = histogram
@@ -33,11 +34,9 @@ pruneTags = true
 all = true
 
 [commit]
+verbose = true
 #       gpgsign = true
 
-[help]
-autocorrect = prompt
-
 [rerere]
 enabled = true
 autoupdate = true
@@ -56,7 +55,6 @@ layout = BASE,MERGED + BASE,LOCAL + BASE,REMOTE
 conflictStyle = zdiff3
 summary = true
 verbosity = 1
-tool = nvimdiff
 
 [apply]
 whitespace = nowarn
@@ -69,25 +67,8 @@ whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
 [advice]
 statusHints = false
 
-[url "git@github.com:"]
-insteadOf = "gh:"
-pushInsteadOf = "github:"
-pushInsteadOf = "git://github.com/"
-
-[url "git://github.com/"]
-insteadOf = "github:"
-
-[url "git@gist.github.com:"]
-insteadOf = "gst:"
-pushInsteadOf = "gist:"
-pushInsteadOf = "git://gist.github.com/"
-
 [alias]
 
-# annex
-xl = annex list
-xg = annex list
-
 # add
 a = add
 padd = add --patch
@@ -127,16 +108,16 @@ last = diff HEAD^
 # log
 l = log --graph --date=short
 la = log --graph --date=short --all
+lg = log --pretty=format:'%Cred%h%Creset - %C(blue bold)[%ad] %Creset%C(yellow)%d %Creset%s %C(green bold)<%an>%Creset' --abbrev-commit --date=short
+llg = log --pretty=format:'%Cred%h%Creset - %C(blue bold)[%ad] %Creset%C(yellow)%d %Creset%s %C(green bold)<%an>%Creset' --abbrev-commit --date=short --graph
+lls = git log --pretty=format:"[%h] %ae, %ar: %s" --stat
+lc = log ORIG_HEAD.. --stat --no-merges
 wu = log -p origin..@{0}
 changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
 short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
 changelog = log --pretty=format:\" * %s\"
 shortnocolor = log --pretty=format:\"%h %cr %cn %s\"
-lg = log --pretty=format:'%Cred%h%Creset - %C(blue bold)[%ad] %Creset%C(yellow)%d %Creset%s %C(green bold)<%an>%Creset' --abbrev-commit --date=short
-llg = log --pretty=format:'%Cred%h%Creset - %C(blue bold)[%ad] %Creset%C(yellow)%d %Creset%s %C(green bold)<%an>%Creset' --abbrev-commit --date=short --graph
-lls = git log --pretty=format:"[%h] %ae, %ar: %s" --stat
 showfiles = show --name-only
-lc = log ORIG_HEAD.. --stat --no-merges
 
 # rebase
 rc = rebase --continue
@@ -159,7 +140,6 @@ diffstat = diff --stat
 changes = diff --name-status -r
 
 # stash
-stashes = stash list
 ss = stash
 sl = stash list
 sa = stash apply
@@ -178,7 +158,6 @@ dt = difftools
 
 rv = review
 ls = ls-files
-gconf = config --global
 
 c = clone --recursive
 bc = clone --bare
@@ -189,9 +168,24 @@ wtl = worktree list
 wtr = worktree remove
 
 ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"
+
+[url "git@github.com:"]
+insteadOf = "gh:"
+pushInsteadOf = "github:"
+pushInsteadOf = "git://github.com/"
+
+[url "git://github.com/"]
+insteadOf = "github:"
+
+[url "git@gist.github.com:"]
+insteadOf = "gst:"
+pushInsteadOf = "gist:"
+pushInsteadOf = "git://gist.github.com/"
+
 [credential "https://git.nca.uwo.ca"]
 	helper = 
 	helper = !tea login helper
+
 [credential "http://gitea.sagacity.ca"]
 	helper = 
 	helper = !tea login helper

config/hypr/sjb/monitors.lua

@@ -25,8 +25,8 @@ hl.monitor({
     "1.333333"
 })
 hl.monitor({ output = "CAP Capture     0x00000001", mode = "1920x1080@60", position = "auto-down", scale = 1 })
-hl.monitor({ output = "HDMI-A-1", mode = "1920x1080@60", position = "auto-down", scale = 1 })
-hl.monitor({ output = "HDMI-A-2", mode = "1920x1080@60", position = "auto-down", scale = 1 })
+-- hl.monitor({ output = "HDMI-A-1", mode = "1920x1080@60", position = "auto-down", scale = 1 })
+-- hl.monitor({ output = "HDMI-A-2", mode = "1920x1080@60", position = "auto-down", scale = 1 })
 
 hl.monitor({
     output = "desc:Ancor Communications Inc ASUS PB238 DCLMTF074371",
@@ -36,7 +36,7 @@ hl.monitor({
     "1.0"
 })
 hl.monitor({ output = "desc:Lenovo Group Limited L15 U133R0A2", mode = "preferred", position = "auto-down", scale = 1 })
-hl.monitor({ output = "desc:Lenovo Group Limited M15 V30F2A15", mode = "preferred", position = "auto-left", scale = 1 })
+hl.monitor({ output = "desc:Lenovo Group Limited M15 V30F2A15", mode = "preferred", position = "auto-down", scale = 1 })
 hl.monitor({ output = "desc:Lenovo Group Limited L15 U133X4PG", mode = "preferred", position = "auto-down", scale = 1 })
 hl.monitor({ output = "desc:Proteon TYPE-C 8R33926O00QS", mode = "preferred", position = "auto-right", scale = "1.0" })
 hl.monitor({ output = "desc:Stargate Technology TYPE-C", mode = "preferred", position = "auto-down", scale = "1.0" })

config/pi/agent/models.json

@@ -1,16 +1,17 @@
 {
     "providers": {
-        "dupont": {
-            "baseUrl": "http://172.25.11.30/v1",
+        "sagacity": {
+            "baseUrl": "https://agent.sagacity.ca/v1",
             "api": "openai-completions",
             "models": [
                 {
-                    "id": "Qwopus3.6-27B",
-                    "name": "Qwopus3.6-27B",
-                    "reasoning": true,
+                    "id": "Qwen3.8-27B",
+                    "name": "Qwen3.8-27B",
                     "input": [
-                        "text"
+                        "text",
+                        "image"
                     ],
+                    "reasoning": true,
                     "contextWindow": 131072,
                     "maxTokens": 131072,
                     "cost": {
@@ -31,8 +32,8 @@
             "api": "openai-completions",
             "models": [
                 {
-                    "id": "ornith-1.0-35B",
-                    "name": "ornith-1.0-35B",
+                    "id": "ornith-1.5-35B",
+                    "name": "ornith-1.5-35B",
                     "reasoning": true,
                     "input": [
                         "text"

config/tmux/tmux.conf

@@ -1,8 +1,9 @@
 # set-option -g default-terminal 'screen-256color'
 # set-option -g terminal-overrides ',xterm-256color:RGB'
 set -g default-terminal "tmux-256color"
-set -as terminal-feature ",*:RGB"
-set -as terminal-feature ",*:clipboard"
+set -ag terminal-overrides ",*:RGB"
+set -as terminal-features ",*:clipboard"
+set -ag terminal-features "xterm-kitty:extkeys"
 
 # set -ag terminal-overrides ",*:Tc"
 # set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'
@@ -10,30 +11,23 @@ set -as terminal-feature ",*:clipboard"
 # allow terminal scrolling
 # set -g terminal-overrides 'xterm*:smcup@:rmcup@'
 
-# Force tmux to use the static symlink path globally
 setenv -g SSH_AUTH_SOCK "$HOME/.ssh/ssh_auth_sock"
 set -g update-environment "DISPLAY XAUTHORITY"
 
 set -g mouse on
 
-# auto rename windows
 # set -g automatic-rename on
 # set -g automatic-rename-format '#{pane_current_command} #{b:pane_current_path}'
 set -g allow-rename on
 
-# start with window 1 (instead of 0)
 set -g base-index 1
-
-# start with pane 1
 setw -g pane-base-index 1
 
-# history
 set -g history-limit 5000
 
 set -g display-time 4000
 set -g status-interval 5
 
-# loud or quiet?
 set -g visual-activity off
 set -g visual-bell off
 set -g visual-silence off
@@ -41,8 +35,6 @@ set -g monitor-activity on
 set -g bell-action none
 set -g allow-passthrough on
 
-#set -g bell-on-alert on
-
 set -s escape-time 0
 setw -g aggressive-resize on
 set -g status-keys vi
@@ -50,7 +42,7 @@ set-window-option -g mode-keys vi
 
 set -g extended-keys on
 set -g extended-keys-format csi-u
-set-option -g focus-events on # TODO: learn how this works
+set-option -g focus-events on
 set-option -g set-titles on
 set-option -g detach-on-destroy off
 set-option -g renumber-windows on

script/ci

@@ -1,2 +1,2 @@
 #!/usr/bin/env -S /bin/sh
-exec pi --model obelix/ornith-1.0-35B -p /skill:commit-staged
+exec pi --model obelix/ornith-1.5-35B -p "/skill:commit-staged commit"