chore(config): tweak yabai config

Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>

.nvmrc

@@ -1 +1 @@
-22.15.0
+22.16.0

.pre-commit-config.yaml

@@ -23,13 +23,13 @@ repos:
         args: [--autofix, --no-sort-keys]
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.44.0
+    rev: v0.45.0
     hooks:
       - id: markdownlint
         args: [-c, .markdownlint.json, --fix]
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.37.0
+    rev: v1.37.1
     hooks:
       - id: yamllint
 
@@ -49,7 +49,7 @@ repos:
       - id: actionlint
 
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 40.0.6
+    rev: 40.36.8
     hooks:
       - id: renovate-config-validator
 

config/fish/completions/git-profile.fish

@@ -0,0 +1,176 @@
+# fish completion for git-profile                          -*- shell-script -*-
+
+function __git_profile_debug
+    set -l file "$BASH_COMP_DEBUG_FILE"
+    if test -n "$file"
+        echo "$argv" >> $file
+    end
+end
+
+function __git_profile_perform_completion
+    __git_profile_debug "Starting __git_profile_perform_completion"
+
+    # Extract all args except the last one
+    set -l args (commandline -opc)
+    # Extract the last arg and escape it in case it is a space
+    set -l lastArg (string escape -- (commandline -ct))
+
+    __git_profile_debug "args: $args"
+    __git_profile_debug "last arg: $lastArg"
+
+    set -l requestComp "$args[1] __complete $args[2..-1] $lastArg"
+
+    __git_profile_debug "Calling $requestComp"
+    set -l results (eval $requestComp 2> /dev/null)
+
+    # Some programs may output extra empty lines after the directive.
+    # Let's ignore them or else it will break completion.
+    # Ref: https://github.com/spf13/cobra/issues/1279
+    for line in $results[-1..1]
+        if test (string trim -- $line) = ""
+            # Found an empty line, remove it
+            set results $results[1..-2]
+        else
+            # Found non-empty line, we have our proper output
+            break
+        end
+    end
+
+    set -l comps $results[1..-2]
+    set -l directiveLine $results[-1]
+
+    # For Fish, when completing a flag with an = (e.g., <program> -n=<TAB>)
+    # completions must be prefixed with the flag
+    set -l flagPrefix (string match -r -- '-.*=' "$lastArg")
+
+    __git_profile_debug "Comps: $comps"
+    __git_profile_debug "DirectiveLine: $directiveLine"
+    __git_profile_debug "flagPrefix: $flagPrefix"
+
+    for comp in $comps
+        printf "%s%s\n" "$flagPrefix" "$comp"
+    end
+
+    printf "%s\n" "$directiveLine"
+end
+
+# This function does two things:
+# - Obtain the completions and store them in the global __git_profile_comp_results
+# - Return false if file completion should be performed
+function __git_profile_prepare_completions
+    __git_profile_debug ""
+    __git_profile_debug "========= starting completion logic =========="
+
+    # Start fresh
+    set --erase __git_profile_comp_results
+
+    set -l results (__git_profile_perform_completion)
+    __git_profile_debug "Completion results: $results"
+
+    if test -z "$results"
+        __git_profile_debug "No completion, probably due to a failure"
+        # Might as well do file completion, in case it helps
+        return 1
+    end
+
+    set -l directive (string sub --start 2 $results[-1])
+    set --global __git_profile_comp_results $results[1..-2]
+
+    __git_profile_debug "Completions are: $__git_profile_comp_results"
+    __git_profile_debug "Directive is: $directive"
+
+    set -l shellCompDirectiveError 1
+    set -l shellCompDirectiveNoSpace 2
+    set -l shellCompDirectiveNoFileComp 4
+    set -l shellCompDirectiveFilterFileExt 8
+    set -l shellCompDirectiveFilterDirs 16
+
+    if test -z "$directive"
+        set directive 0
+    end
+
+    set -l compErr (math (math --scale 0 $directive / $shellCompDirectiveError) % 2)
+    if test $compErr -eq 1
+        __git_profile_debug "Received error directive: aborting."
+        # Might as well do file completion, in case it helps
+        return 1
+    end
+
+    set -l filefilter (math (math --scale 0 $directive / $shellCompDirectiveFilterFileExt) % 2)
+    set -l dirfilter (math (math --scale 0 $directive / $shellCompDirectiveFilterDirs) % 2)
+    if test $filefilter -eq 1; or test $dirfilter -eq 1
+        __git_profile_debug "File extension filtering or directory filtering not supported"
+        # Do full file completion instead
+        return 1
+    end
+
+    set -l nospace (math (math --scale 0 $directive / $shellCompDirectiveNoSpace) % 2)
+    set -l nofiles (math (math --scale 0 $directive / $shellCompDirectiveNoFileComp) % 2)
+
+    __git_profile_debug "nospace: $nospace, nofiles: $nofiles"
+
+    # If we want to prevent a space, or if file completion is NOT disabled,
+    # we need to count the number of valid completions.
+    # To do so, we will filter on prefix as the completions we have received
+    # may not already be filtered so as to allow fish to match on different
+    # criteria than the prefix.
+    if test $nospace -ne 0; or test $nofiles -eq 0
+        set -l prefix (commandline -t | string escape --style=regex)
+        __git_profile_debug "prefix: $prefix"
+
+        set -l completions (string match -r -- "^$prefix.*" $__git_profile_comp_results)
+        set --global __git_profile_comp_results $completions
+        __git_profile_debug "Filtered completions are: $__git_profile_comp_results"
+
+        # Important not to quote the variable for count to work
+        set -l numComps (count $__git_profile_comp_results)
+        __git_profile_debug "numComps: $numComps"
+
+        if test $numComps -eq 1; and test $nospace -ne 0
+            # We must first split on \t to get rid of the descriptions to be
+            # able to check what the actual completion will be.
+            # We don't need descriptions anyway since there is only a single
+            # real completion which the shell will expand immediately.
+            set -l split (string split --max 1 \t $__git_profile_comp_results[1])
+
+            # Fish won't add a space if the completion ends with any
+            # of the following characters: @=/:.,
+            set -l lastChar (string sub -s -1 -- $split)
+            if not string match -r -q "[@=/:.,]" -- "$lastChar"
+                # In other cases, to support the "nospace" directive we trick the shell
+                # by outputting an extra, longer completion.
+                __git_profile_debug "Adding second completion to perform nospace directive"
+                set --global __git_profile_comp_results $split[1] $split[1].
+                __git_profile_debug "Completions are now: $__git_profile_comp_results"
+            end
+        end
+
+        if test $numComps -eq 0; and test $nofiles -eq 0
+            # To be consistent with bash and zsh, we only trigger file
+            # completion when there are no other completions
+            __git_profile_debug "Requesting file completion"
+            return 1
+        end
+    end
+
+    return 0
+end
+
+# Since Fish completions are only loaded once the user triggers them, we trigger them ourselves
+# so we can properly delete any completions provided by another script.
+# Only do this if the program can be found, or else fish may print some errors; besides,
+# the existing completions will only be loaded if the program can be found.
+if type -q "git-profile"
+    # The space after the program name is essential to trigger completion for the program
+    # and not completion of the program name itself.
+    # Also, we use '> /dev/null 2>&1' since '&>' is not supported in older versions of fish.
+    complete --do-complete "git-profile " > /dev/null 2>&1
+end
+
+# Remove any pre-existing completions for the program since we will be handling all of them.
+complete -c git-profile -e
+
+# The call to __git_profile_prepare_completions will setup __git_profile_comp_results
+# which provides the program's completion choices.
+complete -c git-profile -n '__git_profile_prepare_completions' -f -a '$__git_profile_comp_results'
+

config/git/config

@@ -46,7 +46,7 @@
 	autoStash = true
 	updateRefs = true
 [merge]
-	conflictstyle = zdiff3
+	conflictStyle = diff3
 [pull]
 	rebase = true
 [color "diff-highlight"]

config/homebrew/Brewfile

@@ -115,10 +115,10 @@ brew "harfbuzz"
 brew "dependency-check"
 # Lightweight DNS forwarder and DHCP server
 brew "dnsmasq"
-# .NET Core
-brew "dotnet@8", link: true
 # Spellchecker wrapping library
 brew "enchant"
+# Command-line tool to interact with exercism.io
+brew "exercism"
 # Perl lib for reading and writing EXIF metadata
 brew "exiftool"
 # Banner-like program prints strings as ASCII art

config/nvim/init.lua

@@ -5,7 +5,7 @@
 -- ── Install lazylazy ────────────────────────────────────────────────
 -- https://github.com/folke/lazy.nvim
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
-if not vim.uv.fs_stat(lazypath) then
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
   local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
   local out = vim.fn.system {
     'git',

config/nvim/lua/options.lua

@@ -13,7 +13,7 @@ local a = vim.api -- A table to store API functions
 g.mapleader = ' ' -- Space as the leader key
 g.maplocalleader = ' ' -- Space as the local leader key
 
-g.colors_theme = 'pencil' -- Set the colorscheme
+g.colors_theme = 'onedark' -- Set the colorscheme
 -- g.colors_variant_light = 'tokyonight-day' -- Set the light variant
 -- g.colors_variant_dark = 'tokyonight-storm' -- Set the dark variant
 

config/yabai/yabairc

@@ -22,16 +22,19 @@ yabai -m config \
 # apps to not manage (ignore)
 # TODO: add apps from aerospace config to here
 # list active apps:
-# > yabai -m query --windows | jq .[].app
+# > yabai -m query --windows | jq .[].app | sort | uniq
 yabai -m rule --add app="1Password" manage=off
 yabai -m rule --add app="Fork" manage=off
+yabai -m rule --add app="JetBrains Rider" manage=off
+yabai -m rule --add app="Logi Options" manage=off
+yabai -m rule --add app="MSTeams" manage=off
+yabai -m rule --add app="Microsoft Teams" manage=off
+yabai -m rule --add app="PhpStorm" manage=off
+yabai -m rule --add app="Slack" manage=off
 yabai -m rule --add app="System Settings" manage=off
-yabai -m rule --add app="^Logi Options$" manage=off
-yabai -m rule --add app="^Microsoft Teams$" manage=off
-yabai -m rule --add app="^PhpStorm$" manage=off
-yabai -m rule --add app="^Slack$" manage=off
-yabai -m rule --add app="^TIDAL$" manage=off
-yabai -m rule --add app="^Windows App$" manage=off
+yabai -m rule --add app="TIDAL" manage=off
+yabai -m rule --add app="Windows App" manage=off
+yabai -m rule --add app="Zoom" manage=off
 
 # apply rules
 yabai -m rule --apply

config/zed/settings.json

@@ -3,9 +3,10 @@
     "metrics": false
   },
   "assistant": {
+    "always_allow_tool_actions": false,
     "default_model": {
       "provider": "copilot_chat",
-      "model": "claude-3.7-sonnet-thought"
+      "model": "gpt-4.1"
     },
     "version": "2"
   },
@@ -65,13 +66,9 @@
   },
   "ui_font_size": 16,
   "buffer_font_size": 16,
-  "buffer_font_fallbacks": [
-    "JetBrainsMono Nerd Font"
-  ],
+  "buffer_font_fallbacks": ["JetBrainsMono Nerd Font"],
   "edit_predictions": {
-    "disabled_globs": [
-      ".env"
-    ]
+    "disabled_globs": [".env", ".env.*"]
   },
   "hour_format": "hour24"
 }

install.conf.yaml

@@ -45,9 +45,9 @@
     ~/.config/op/plugins.sh:
       relink: true
       path: config/op/plugins.sh
-    ~/.config/op/plugins/*:
+    ~/.config/op/plugins:
       relink: true
-      path: config/op/plugins/*
+      path: config/op/plugins
     # Scripts
     ~/.local/bin:
       glob: true