chore: fix git configs

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

.github/workflows/linters.yml

@@ -35,4 +35,4 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run PR Lint
-        uses: ivuorinen/actions/pr-lint@fa0232d3c4ba16d087b606296435354a69c01756 # 25.8.11
+        uses: ivuorinen/actions/pr-lint@8e88bf4cdb14c38c929ad2a89687d6eb635a3967 # 25.8.25

.github/workflows/semantic-pr.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: self-hosted
 
     steps:
-      - uses: amannn/action-semantic-pull-request@fdd4d3ddf614fbcd8c29e4b106d3bbe0cb2c605d # v6.0.1
+      - uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/sync-labels.yml

@@ -29,4 +29,4 @@ jobs:
       issues: write
 
     steps:
-      - uses: ivuorinen/actions/sync-labels@fa0232d3c4ba16d087b606296435354a69c01756 # 25.8.11
+      - uses: ivuorinen/actions/sync-labels@8e88bf4cdb14c38c929ad2a89687d6eb635a3967 # 25.8.25

.pre-commit-config.yaml

@@ -50,7 +50,7 @@ repos:
       - id: actionlint
 
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 41.70.2
+    rev: 41.87.4
     hooks:
       - id: renovate-config-validator
 

config/fish/alias.fish

@@ -106,3 +106,6 @@ abbr --add .n npm
 abbr --add .nt npm test --if-present
 abbr --add .nb npm run build --if-present
 abbr --add .ns npm run start --if-present
+
+# Random abbreviations
+abbr --add stats onefetch --nerd-fonts --true-color never

config/fish/completions/grype.fish

@@ -0,0 +1,235 @@
+# fish completion for grype                                -*- shell-script -*-
+
+function __grype_debug
+    set -l file "$BASH_COMP_DEBUG_FILE"
+    if test -n "$file"
+        echo "$argv" >> $file
+    end
+end
+
+function __grype_perform_completion
+    __grype_debug "Starting __grype_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))
+
+    __grype_debug "args: $args"
+    __grype_debug "last arg: $lastArg"
+
+    # Disable ActiveHelp which is not supported for fish shell
+    set -l requestComp "GRYPE_ACTIVE_HELP=0 $args[1] __complete $args[2..-1] $lastArg"
+
+    __grype_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")
+
+    __grype_debug "Comps: $comps"
+    __grype_debug "DirectiveLine: $directiveLine"
+    __grype_debug "flagPrefix: $flagPrefix"
+
+    for comp in $comps
+        printf "%s%s\n" "$flagPrefix" "$comp"
+    end
+
+    printf "%s\n" "$directiveLine"
+end
+
+# this function limits calls to __grype_perform_completion, by caching the result behind $__grype_perform_completion_once_result
+function __grype_perform_completion_once
+    __grype_debug "Starting __grype_perform_completion_once"
+
+    if test -n "$__grype_perform_completion_once_result"
+        __grype_debug "Seems like a valid result already exists, skipping __grype_perform_completion"
+        return 0
+    end
+
+    set --global __grype_perform_completion_once_result (__grype_perform_completion)
+    if test -z "$__grype_perform_completion_once_result"
+        __grype_debug "No completions, probably due to a failure"
+        return 1
+    end
+
+    __grype_debug "Performed completions and set __grype_perform_completion_once_result"
+    return 0
+end
+
+# this function is used to clear the $__grype_perform_completion_once_result variable after completions are run
+function __grype_clear_perform_completion_once_result
+    __grype_debug ""
+    __grype_debug "========= clearing previously set __grype_perform_completion_once_result variable =========="
+    set --erase __grype_perform_completion_once_result
+    __grype_debug "Successfully erased the variable __grype_perform_completion_once_result"
+end
+
+function __grype_requires_order_preservation
+    __grype_debug ""
+    __grype_debug "========= checking if order preservation is required =========="
+
+    __grype_perform_completion_once
+    if test -z "$__grype_perform_completion_once_result"
+        __grype_debug "Error determining if order preservation is required"
+        return 1
+    end
+
+    set -l directive (string sub --start 2 $__grype_perform_completion_once_result[-1])
+    __grype_debug "Directive is: $directive"
+
+    set -l shellCompDirectiveKeepOrder 32
+    set -l keeporder (math (math --scale 0 $directive / $shellCompDirectiveKeepOrder) % 2)
+    __grype_debug "Keeporder is: $keeporder"
+
+    if test $keeporder -ne 0
+        __grype_debug "This does require order preservation"
+        return 0
+    end
+
+    __grype_debug "This doesn't require order preservation"
+    return 1
+end
+
+
+# This function does two things:
+# - Obtain the completions and store them in the global __grype_comp_results
+# - Return false if file completion should be performed
+function __grype_prepare_completions
+    __grype_debug ""
+    __grype_debug "========= starting completion logic =========="
+
+    # Start fresh
+    set --erase __grype_comp_results
+
+    __grype_perform_completion_once
+    __grype_debug "Completion results: $__grype_perform_completion_once_result"
+
+    if test -z "$__grype_perform_completion_once_result"
+        __grype_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 $__grype_perform_completion_once_result[-1])
+    set --global __grype_comp_results $__grype_perform_completion_once_result[1..-2]
+
+    __grype_debug "Completions are: $__grype_comp_results"
+    __grype_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
+        __grype_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
+        __grype_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)
+
+    __grype_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)
+        __grype_debug "prefix: $prefix"
+
+        set -l completions (string match -r -- "^$prefix.*" $__grype_comp_results)
+        set --global __grype_comp_results $completions
+        __grype_debug "Filtered completions are: $__grype_comp_results"
+
+        # Important not to quote the variable for count to work
+        set -l numComps (count $__grype_comp_results)
+        __grype_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 $__grype_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.
+                __grype_debug "Adding second completion to perform nospace directive"
+                set --global __grype_comp_results $split[1] $split[1].
+                __grype_debug "Completions are now: $__grype_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
+            __grype_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 "grype"
+    # 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 "grype " > /dev/null 2>&1
+end
+
+# Remove any pre-existing completions for the program since we will be handling all of them.
+complete -c grype -e
+
+# this will get called after the two calls below and clear the $__grype_perform_completion_once_result global
+complete -c grype -n '__grype_clear_perform_completion_once_result'
+# The call to __grype_prepare_completions will setup __grype_comp_results
+# which provides the program's completion choices.
+# If this doesn't require order preservation, we don't use the -k flag
+complete -c grype -n 'not __grype_requires_order_preservation && __grype_prepare_completions' -f -a '$__grype_comp_results'
+# otherwise we use the -k flag
+complete -k -c grype -n '__grype_requires_order_preservation && __grype_prepare_completions' -f -a '$__grype_comp_results'

config/fish/config.fish

@@ -32,5 +32,6 @@ end
 
 # Added by LM Studio CLI (lms)
 set -gx PATH $PATH $HOME/.lmstudio/bin
+# End of LM Studio CLI section
 
 # vim: ft=fish ts=4 sw=4 et:

config/git/config

@@ -1,18 +1,19 @@
+# vim: ft=gitconfig ai noexpandtab
 [include]
-  path = ~/.dotfiles/config/git/shared
+	path = ~/.dotfiles/config/git/shared
 
 [user]
-  name = Ismo Vuorinen
-  email = ismo@ivuorinen.net
+	name = Ismo Vuorinen
+	email = ismo@ivuorinen.net
 
 [github]
-  user = ivuorinen
+	user = ivuorinen
 
 [include]
-  path = ~/.config/git/overrides/config
+	path = ~/.config/git/overrides/config
 
 [advice]
-  detachedHead = false
+	detachedHead = false
 [column]
 	ui = auto
 [branch]

config/git/shared

@@ -1,53 +1,54 @@
+# vim: ft=gitconfig ai noexpandtab
 [credential]
-  helper = store --file ~/.cache/git/git-credentials
-  helper = cache --timeout 30000
+	helper = store --file ~/.cache/git/git-credentials
+	helper = cache --timeout 30000
 
 [core]
-  excludesfile = ~/.config/git/ignore
+	excludesfile = ~/.config/git/ignore
 
 [init]
-  defaultBranch = main
+	defaultBranch = main
 
 [pull]
-  rebase = true
+	rebase = true
 
 [alias]
-  branchbydate = for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)'
-  branchcolor = "!for ref in $(git for-each-ref --sort=-committerdate --format=\"%(refname)\" refs/heads/ refs/remotes ); do git log -n1 $ref --pretty=format:\"%Cgreen%cr%Creset %C(yellow)%d%Creset %C(bold blue)<%an>%Creset%n\" | cat ; done | awk '! a[$0]++'"
-  llog = log --pretty=fuller
-  logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
-  nah = !git reset --hard && git clean -df
-  recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
-  reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
-  reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
-  rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
-  tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
-  undo = reset --soft HEAD^
-  undo-commit = reset HEAD~ --soft
+	branchbydate = for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)'
+	branchcolor = "!for ref in $(git for-each-ref --sort=-committerdate --format=\"%(refname)\" refs/heads/ refs/remotes ); do git log -n1 $ref --pretty=format:\"%Cgreen%cr%Creset %C(yellow)%d%Creset %C(bold blue)<%an>%Creset%n\" | cat ; done | awk '! a[$0]++'"
+	llog = log --pretty=fuller
+	logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
+	nah = !git reset --hard && git clean -df
+	recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
+	reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
+	reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
+	rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
+	tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
+	undo = reset --soft HEAD^
+	undo-commit = reset HEAD~ --soft
 
 [filter "lfs"]
-  clean = git-lfs clean -- %f
-  smudge = git-lfs smudge -- %f
-  process = git-lfs filter-process
-  required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
 
 [color]
-  ui = true
-  diff = auto
-  branch = auto
-  status = auto
+	ui = true
+	diff = auto
+	branch = auto
+	status = auto
 
 [color "status"]
-  added = green bold
-  changed = yellow
-  deleted = red bold strike
-  untracked = cyan
-  branch = yellow black bold ul
+	added = green bold
+	changed = yellow
+	deleted = red bold strike
+	untracked = cyan
+	branch = yellow black bold ul
 
 [submodule]
-  recurse = true
+	recurse = true
 
 # dotfiles special config
 [includeIf "hasconfig:remote.*.url:https://github.com/ivuorinen/dotfiles.git"]
-  path = ~/.dotfiles/config/git/special/dotfiles ;
+	path = ~/.dotfiles/config/git/special/dotfiles ;
 

config/git/special/dotfiles

@@ -1,2 +1,3 @@
+# vim: ft=gitconfig ai noexpandtab
 [submodule]
-  recurse = false
+	recurse = false

config/zed/settings.json

@@ -1,8 +1,16 @@
 {
+  "features": {
+    "edit_prediction_provider": "copilot"
+  },
   "context_servers": {
     "github-activity-summarizer": {
       "source": "extension",
       "settings": {}
+    },
+    "mcp-server-time": {
+      "source": "custom",
+      "command": "uvx",
+      "args": ["mcp-server-time"]
     }
   },
   "telemetry": {

hosts/s/config/git/local.d/work-git

@@ -1,2 +1,4 @@
+# vim: ft=gitconfig ai noexpandtab
+
 Host tfs.ia.corp.svea.com
-  IdentityFile ~/.ssh/id_rsa
+	IdentityFile ~/.ssh/id_rsa

hosts/s/config/git/overrides/config

@@ -1,26 +1,26 @@
-# vim: ft=gitconfig sw=2 ts=2 et
+# vim: ft=gitconfig ai noexpandtab
 [include]
-  path = ~/.dotfiles/config/git/shared
+	path = ~/.dotfiles/config/git/shared
 
 [gpg]
-  format = ssh
+	format = ssh
 
 [user]
-  name = Ismo Vuorinen
-  email = ismo.vuorinen@svea.com
-  signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMmEaS/pitd8TzLNaXf0ojTydEyFp2TWoDctuqTEF8Aw
+	name = Ismo Vuorinen
+	email = ismo.vuorinen@svea.com
+	signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMmEaS/pitd8TzLNaXf0ojTydEyFp2TWoDctuqTEF8Aw
 
 [gpg "ssh"]
-  program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
-  allowedSignersFile = ~/.ssh/allowed_signers
+	program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
+	allowedSignersFile = ~/.ssh/allowed_signers
 
 [commit]
-  gpgsign = true
+	gpgsign = true
 
 [credential "https://github.com"]
-  helper =
-  helper = !/opt/homebrew/bin/gh auth git-credential
+	helper =
+	helper = !/opt/homebrew/bin/gh auth git-credential
 
 [credential "https://gist.github.com"]
-  helper =
-  helper = !/opt/homebrew/bin/gh auth git-credential
+	helper =
+	helper = !/opt/homebrew/bin/gh auth git-credential