chore: update pre-commit hooks (#92)

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

.github/workflows/changelog.yml

@@ -18,11 +18,11 @@ jobs:
     permissions: write-all
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Create changelog text
         id: changelog
-        uses: loopwerk/tag-changelog@941366edb8920e2071eae0449031830984b9f26e # v1
+        uses: loopwerk/tag-changelog@941366edb8920e2071eae0449031830984b9f26e # v1.3.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config_file: .github/tag-changelog-config.js

.github/workflows/linters.yml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
   
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: GitHub Actions
-        uses: reviewdog/action-actionlint@db58217885f9a6570da9c71be4e40ec33fe44a1f # v1
+        uses: reviewdog/action-actionlint@a5524e1c19e62881d79c1f1b9b6f09f16356e281 # v1.65.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-review
@@ -35,13 +35,13 @@ jobs:
           reporter: github-pr-review
 
       - name: markdownlint
-        uses: reviewdog/action-markdownlint@f901468edf9a3634dd39b35ba26cad0aad1a0bfd # v0
+        uses: reviewdog/action-markdownlint@3667398db9118d7e78f7a63d10e26ce454ba5f58 # v0.26.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-review
 
       - name: shfmt
-        uses: reviewdog/action-shfmt@f59386f08bd9a24ac1a746e69f026ddc2ed06710 # v1
+        uses: reviewdog/action-shfmt@d8f080930b9be5847b4f97e9f4122b81a82aaeac # v1.0.4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           shfmt_flags: |

.github/workflows/new-release.yml

@@ -24,23 +24,23 @@ jobs:
       version: ${{ steps.daily-version.outputs.version }}
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Create tag if necessary
-        uses: fregante/daily-version-action@fb1a60b7c4daf1410cd755e360ebec3901e58588 # v2
+        uses: fregante/daily-version-action@fb1a60b7c4daf1410cd755e360ebec3901e58588 # v2.1.3
         id: daily-version
 
       - name: Create changelog text
         if: steps.daily-version.outputs.created
         id: changelog
-        uses: loopwerk/tag-changelog@941366edb8920e2071eae0449031830984b9f26e # v1
+        uses: loopwerk/tag-changelog@941366edb8920e2071eae0449031830984b9f26e # v1.3.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config_file: .github/tag-changelog-config.js
 
       - name: Create release
         if: steps.daily-version.outputs.created
-        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ steps.daily-version.outputs.version }}

.github/workflows/pre-commit-autoupdate.yml

@@ -23,13 +23,13 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
 
       - run: pip install pre-commit && pre-commit autoupdate
 
-      - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7
+      - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-hooks

.github/workflows/update-submodules.yml

@@ -22,18 +22,8 @@ jobs:
 
     steps:
 
-      - name: Clean up previous checkouts
-        shell: bash
-        run: |
-          rm -rf ${{ github.workspace }}
-
-      - name: Reset file permissions
-        shell: bash
-        run: |
-          sudo chown -R $(whoami) ${{ github.workspace }}
-
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: true
           fetch-depth: 2

.gitignore

@@ -44,3 +44,4 @@ config/fish/fish_variables
 config/fish/completions/asdf.fish
 config/vim/.netrwhist
 config/vim/extra/*
+config/gh/hosts.yml

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
         args: [-c, .markdownlint.json, --fix]
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.35.1
+    rev: v1.36.2
     hooks:
       - id: yamllint
 
@@ -49,7 +49,7 @@ repos:
       - id: actionlint
 
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 39.185.9
+    rev: 39.205.1
     hooks:
       - id: renovate-config-validator
 

config/aqua/aqua.yaml

@@ -0,0 +1,21 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/aqua-yaml.json
+# aqua - Declarative CLI Version Manager
+# https://aquaproj.github.io/
+# checksum:
+#   enabled: true
+#   require_checksum: true
+#   supported_envs:
+#   - all
+registries:
+- type: standard
+  ref: v4.331.0 # renovate: depName=aquaproj/aqua-registry
+packages:
+- name: cli/cli
+  version: 'v2.69.0'
+- name: junegunn/fzf
+  version: 'v0.60.3'
+- name: jqlang/jq
+  version: 'jq-1.7.1'
+- name: 1password/cli
+  version: '2.30.3'

config/asdf/golang-packages

@@ -1,6 +1,8 @@
 // These are golang packages I use,
 // so they should be available with all versions
 
+// Aqua is a package manager like asdf, or Brew
+github.com/aquaproj/aqua/v2/cmd/aqua@latest
 // Git Profile allows you to switch between user profiles in git repos
 github.com/dotzero/git-profile@v1.4.0
 // An extensible command line tool or library to format yaml files.

config/fish/alias.fish

@@ -52,3 +52,21 @@ function .s --wraps='cd ~/Code/s' --description 'cd ~/Code/s'
   cd ~/Code/s $argv
 
 end
+
+# shortcut to commit with a message
+function commit --wraps='git commit -a -m "chore: automated commit"' --description 'commit shortcut'
+  set -l commitMessage $argv
+  git add .
+
+  if test -z "$commitMessage"
+    if type -q aicommits
+      aicommits --type conventional
+    else
+      git commit -a -m "chore: automated commit"
+    end
+    return
+  end
+
+  git commit -a -m "$commitMessage"
+ end
+

config/fish/completions/aqua.fish

@@ -0,0 +1,125 @@
+# aqua fish shell completion
+
+function __fish_aqua_no_subcommand --description 'Test if there has been any subcommand yet'
+    for i in (commandline -opc)
+        if contains -- $i init install i generate g update-aqua upa update-checksum upc update up completion bash zsh fish help h help h which info remove rm vacuum cp policy allow deny init init-policy exec list generate-registry gr version root-dir help h
+            return 1
+        end
+    end
+    return 0
+end
+
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l log-level -r -d 'log level'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l config -s c -r -d 'configuration file path'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l disable-cosign -d 'Disable Cosign verification'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l disable-slsa -d 'Disable SLSA verification'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l disable-github-artifact-attestation -d 'Disable GitHub Artifact Attestations verification'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l trace -r -d 'trace output file path'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l cpu-profile -r -d 'cpu profile output file path'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l help -s h -d 'show help'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l version -s v -d 'print the version'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l help -s h -d 'show help'
+complete -c aqua -n '__fish_aqua_no_subcommand' -f -l version -s v -d 'print the version'
+complete -c aqua -n '__fish_seen_subcommand_from init' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'init' -d 'Create a configuration file if it doesn\'t exist'
+complete -c aqua -n '__fish_seen_subcommand_from init' -f -l use-import-dir -s u -d 'Use import_dir'
+complete -c aqua -n '__fish_seen_subcommand_from init' -f -l import-dir -s i -r -d 'import_dir'
+complete -c aqua -n '__fish_seen_subcommand_from init' -f -l create-dir -s d -d 'Create a directory named aqua and create aqua.yaml in it'
+complete -c aqua -n '__fish_seen_subcommand_from install i' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'install i' -d 'Install tools'
+complete -c aqua -n '__fish_seen_subcommand_from install i' -f -l only-link -s l -d 'create links but skip downloading packages'
+complete -c aqua -n '__fish_seen_subcommand_from install i' -f -l test -d 'This flag was deprecated and had no meaning from aqua v2.0.0. This flag will be removed in aqua v3.0.0. https://github.com/aquaproj/aqua/issues/1691'
+complete -c aqua -n '__fish_seen_subcommand_from install i' -f -l all -s a -d 'install all aqua configuration packages'
+complete -c aqua -n '__fish_seen_subcommand_from install i' -f -l tags -s t -r -d 'filter installed packages with tags'
+complete -c aqua -n '__fish_seen_subcommand_from install i' -f -l exclude-tags -r -d 'exclude installed packages with tags'
+complete -c aqua -n '__fish_seen_subcommand_from generate g' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'generate g' -d 'Search packages in registries and output the configuration interactively'
+complete -c aqua -n '__fish_seen_subcommand_from generate g' -f -l f -r -d 'the file path of packages list. When the value is "-", the list is passed from the standard input'
+complete -c aqua -n '__fish_seen_subcommand_from generate g' -f -l i -d 'Insert packages to configuration file'
+complete -c aqua -n '__fish_seen_subcommand_from generate g' -f -l pin -d 'Pin version'
+complete -c aqua -n '__fish_seen_subcommand_from generate g' -f -l g -d 'Insert packages in a global configuration file'
+complete -c aqua -n '__fish_seen_subcommand_from generate g' -f -l detail -s d -d 'Output additional fields such as description and link'
+complete -c aqua -n '__fish_seen_subcommand_from generate g' -f -l o -r -d 'inserted file'
+complete -c aqua -n '__fish_seen_subcommand_from generate g' -f -l select-version -s s -d 'Select the installed version interactively. Default to display 30 versions, use --limit/-l to change it.'
+complete -c aqua -n '__fish_seen_subcommand_from generate g' -f -l limit -s l -r -d 'The maximum number of versions. Non-positive number refers to no limit.'
+complete -c aqua -n '__fish_seen_subcommand_from update-aqua upa' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'update-aqua upa' -d 'Update aqua'
+complete -c aqua -n '__fish_seen_subcommand_from update-checksum upc' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'update-checksum upc' -d 'Create or Update aqua-checksums.json'
+complete -c aqua -n '__fish_seen_subcommand_from update-checksum upc' -f -l all -s a -d 'Create or Update all aqua-checksums.json including global configuration'
+complete -c aqua -n '__fish_seen_subcommand_from update-checksum upc' -f -l deep -d 'This flag was deprecated and had no meaning from aqua v2.0.0. This flag will be removed in aqua v3.0.0. https://github.com/aquaproj/aqua/issues/1769'
+complete -c aqua -n '__fish_seen_subcommand_from update-checksum upc' -f -l prune -d 'Remove unused checksums'
+complete -c aqua -n '__fish_seen_subcommand_from update up' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'update up' -d 'Update registries and packages'
+complete -c aqua -n '__fish_seen_subcommand_from update up' -f -l i -d 'Select packages with fuzzy finder'
+complete -c aqua -n '__fish_seen_subcommand_from update up' -f -l select-version -s s -d 'Select the version with fuzzy finder. Default to display 30 versions, use --limit/-l to change it.'
+complete -c aqua -n '__fish_seen_subcommand_from update up' -f -l only-registry -s r -d 'Update only registries'
+complete -c aqua -n '__fish_seen_subcommand_from update up' -f -l only-package -s p -d 'Update only packages'
+complete -c aqua -n '__fish_seen_subcommand_from update up' -f -l limit -s l -r -d 'The maximum number of versions. Non-positive number refers to no limit.'
+complete -c aqua -n '__fish_seen_subcommand_from update up' -f -l tags -s t -r -d 'filter installed packages with tags'
+complete -c aqua -n '__fish_seen_subcommand_from update up' -f -l exclude-tags -r -d 'exclude installed packages with tags'
+complete -c aqua -n '__fish_seen_subcommand_from completion' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'completion' -d 'Output shell completion script for bash, zsh, or fish'
+complete -c aqua -n '__fish_seen_subcommand_from completion' -f -l help -s h -d 'show help'
+complete -c aqua -n '__fish_seen_subcommand_from bash' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_seen_subcommand_from completion' -a 'bash' -d 'Output shell completion script for bash'
+complete -c aqua -n '__fish_seen_subcommand_from zsh' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_seen_subcommand_from completion' -a 'zsh' -d 'Output shell completion script for zsh'
+complete -c aqua -n '__fish_seen_subcommand_from fish' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_seen_subcommand_from completion' -a 'fish' -d 'Output shell completion script for fish'
+complete -c aqua -n '__fish_seen_subcommand_from fish' -f -l help -s h -d 'show help'
+complete -c aqua -n '__fish_seen_subcommand_from help h' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_seen_subcommand_from fish' -a 'help h' -d 'Shows a list of commands or help for one command'
+complete -c aqua -n '__fish_seen_subcommand_from help h' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_seen_subcommand_from completion' -a 'help h' -d 'Shows a list of commands or help for one command'
+complete -c aqua -n '__fish_seen_subcommand_from which' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'which' -d 'Output the absolute file path of the given command'
+complete -c aqua -n '__fish_seen_subcommand_from which' -f -l version -s v -d 'Output the given package version'
+complete -c aqua -n '__fish_seen_subcommand_from info' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'info' -d 'Show information'
+complete -c aqua -n '__fish_seen_subcommand_from remove rm' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'remove rm' -d 'Uninstall packages'
+complete -c aqua -n '__fish_seen_subcommand_from remove rm' -f -l all -s a -d 'uninstall all packages'
+complete -c aqua -n '__fish_seen_subcommand_from remove rm' -f -l mode -s m -r -d 'Removed target modes. l: link, p: package'
+complete -c aqua -n '__fish_seen_subcommand_from remove rm' -f -l i -d 'Select packages with a Fuzzy Finder'
+complete -c aqua -n '__fish_seen_subcommand_from vacuum' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'vacuum' -d 'Remove unused installed packages'
+complete -c aqua -n '__fish_seen_subcommand_from vacuum' -f -l init -d 'Create timestamp files.'
+complete -c aqua -n '__fish_seen_subcommand_from vacuum' -f -l days -s d -r -d 'Expiration days'
+complete -c aqua -n '__fish_seen_subcommand_from cp' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'cp' -d 'Copy executable files in a directory'
+complete -c aqua -n '__fish_seen_subcommand_from cp' -f -l o -r -d 'destination directory'
+complete -c aqua -n '__fish_seen_subcommand_from cp' -f -l all -s a -d 'install all aqua configuration packages'
+complete -c aqua -n '__fish_seen_subcommand_from cp' -f -l tags -s t -r -d 'filter installed packages with tags'
+complete -c aqua -n '__fish_seen_subcommand_from cp' -f -l exclude-tags -r -d 'exclude installed packages with tags'
+complete -c aqua -n '__fish_seen_subcommand_from policy' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'policy' -d 'Manage Policy'
+complete -c aqua -n '__fish_seen_subcommand_from allow' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_seen_subcommand_from policy' -a 'allow' -d 'Allow a policy file'
+complete -c aqua -n '__fish_seen_subcommand_from deny' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_seen_subcommand_from policy' -a 'deny' -d 'Deny a policy file'
+complete -c aqua -n '__fish_seen_subcommand_from init' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_seen_subcommand_from policy' -a 'init' -d 'Create a policy file if it doesn\'t exist'
+complete -c aqua -n '__fish_seen_subcommand_from init-policy' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'init-policy' -d '[Deprecated] Create a policy file if it doesn\'t exist'
+complete -c aqua -n '__fish_seen_subcommand_from exec' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'exec' -d 'Execute tool'
+complete -c aqua -n '__fish_seen_subcommand_from list' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'list' -d 'List packages in Registries'
+complete -c aqua -n '__fish_seen_subcommand_from list' -f -l installed -s i -d 'List installed packages'
+complete -c aqua -n '__fish_seen_subcommand_from list' -f -l all -s a -d 'List global configuration packages too'
+complete -c aqua -n '__fish_seen_subcommand_from generate-registry gr' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'generate-registry gr' -d 'Generate a registry\'s package configuration'
+complete -c aqua -n '__fish_seen_subcommand_from generate-registry gr' -f -l out-testdata -r -d 'A file path where the testdata is outputted'
+complete -c aqua -n '__fish_seen_subcommand_from generate-registry gr' -f -l cmd -r -d 'A list of commands joined with commas \',\''
+complete -c aqua -n '__fish_seen_subcommand_from generate-registry gr' -f -l generate-config -s c -r -d 'A configuration file path'
+complete -c aqua -n '__fish_seen_subcommand_from generate-registry gr' -f -l limit -s l -r -d 'the maximum number of versions'
+complete -c aqua -n '__fish_seen_subcommand_from generate-registry gr' -f -l deep -d 'This flag was deprecated and had no meaning from aqua v2.15.0. This flag will be removed in aqua v3.0.0. https://github.com/aquaproj/aqua/issues/2351'
+complete -c aqua -n '__fish_seen_subcommand_from generate-registry gr' -f -l init -d 'Generate a configuration file'
+complete -c aqua -n '__fish_seen_subcommand_from version' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'version' -d 'Show version'
+complete -c aqua -n '__fish_seen_subcommand_from root-dir' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'root-dir' -d 'Output the aqua root directory (AQUA_ROOT_DIR)'
+complete -c aqua -n '__fish_seen_subcommand_from help h' -f -l help -s h -d 'show help'
+complete -r -c aqua -n '__fish_aqua_no_subcommand' -a 'help h' -d 'Shows a list of commands or help for one command'
+

config/fish/exports.fish

@@ -22,6 +22,12 @@ fish_add_path "$XDG_BIN_HOME"
 # Add cargo bin to path
 fish_add_path "$XDG_SHARE_HOME/cargo/bin"
 
+# Set Aqua configuration
+set -q AQUA_BIN; or set -x AQUA_BIN "$XDG_DATA_HOME/aquaproj-aqua/bin"
+set -q AQUA_CONFIG; or set -x AQUA_CONFIG "$XDG_CONFIG_HOME/aqua/aqua.yaml"
+set -gx PATH $AQUA_BIN $PATH
+
+
 # NPM configuration
 set -q NPM_CONFIG_PREFIX; or set -x NPM_CONFIG_PREFIX "$XDG_DATA_HOME/npm"
 fish_add_path "$NPM_CONFIG_PREFIX/bin"

config/ideavim/ideavimrc

@@ -1,18 +1,10 @@
 "" Source your .vimrc
-"source ~/.vimrc
+source ~/.dotfiles/config/vim/vimrc
 
 " https://github.com/ville6000/dotfiles/blob/main/vimrc
 " To get a list of Actions run `:actionlist `
 let mapleader = "\<SPACE>"
 
-set so=10
-set showmode
-set showcmd
-set smartcase
-set incsearch
-set hlsearch
-set relativenumber number
-
 set clipboard+=unnamed
 
 set ideajoin
@@ -22,11 +14,6 @@ set idearefactormode=normal
 " Map esc to :noh
 map <esc> :noh<cr>
 
-nnoremap <leader>n :noh<return>
-
-nmap j gj
-nmap k gk
-
 nmap <leader>j :tabnext<CR>
 nmap <leader>k :tabprevious<CR>
 
@@ -85,9 +72,6 @@ nmap <leader>gn :action VcsShowNextChangeMarker<CR>
 
 " Trigger tests
 map <Leader>tt <Action>(RiderUnitTestRunContextAction)
-let g:WhichKeyDesc_tests = "<leader>t Tests"
-let g:WhichKeyDesc_tests_run = "<leader>tt Run Tests"
-
 nmap <Leader>cc :action CommentByLineComment<CR>
 
 nmap <leader>lf <Action>(ReformatCode)
@@ -108,7 +92,7 @@ nmap <Leader>wt :action ActivateTerminalToolWindow<CR>
 nmap <Leader>wd :action ActivateDatabaseToolWindow<CR>
 
 " Open project tree window
-nmap <Leader>e :action ActivateProjectToolWindow<CR>
+nmap <Leader>t :action ActivateProjectToolWindow<CR>
 
 nnoremap <leader>cf :action ReformatCode<CR>
 
@@ -127,9 +111,6 @@ nnoremap gE :action GotoPreviousError<CR>
 " Turn off Copilot
 nmap <leader>cp :action Copilot.Toggle<CR>
 
-" Disable timeout for which-key
-set notimeout
-
 " Navigate back
 nmap <leader> <C-o>
 
@@ -201,12 +182,9 @@ map Q gq
 syntax enable
 filetype plugin indent on
 
-call plug#begin('~/.vim/plugged')
-
-Plug 'ayu-theme/ayu-vim'
-Plug 'ctrlpvim/ctrlp.vim'
-
-call plug#end()
+" call plug#begin('~/.config/vim/plugged')
+" Plug 'ayu-theme/ayu-vim'
+" call plug#end()
 
 set termguicolors
 

config/vim/vimrc

@@ -31,6 +31,7 @@ if !filereadable(vimplug_exists)
   autocmd VimEnter * PlugInstall
 endif
 
+" {{{
 call plug#begin(expand('$HOME/.config/vim/plugged'))
 
   " coc.nvim - Intellisense engine
@@ -60,6 +61,8 @@ call plug#begin(expand('$HOME/.config/vim/plugged'))
   Plug 'editor-bootstrap/vim-bootstrap-updater'
   " vim-rhubarb - Fugitive extension
   Plug 'tpope/vim-rhubarb' " required by fugitive to :GBrowse
+  " ctrlp.vim - Fuzzy file finder
+  Plug 'ctrlpvim/ctrlp.vim'
 
   " vim-airline
   Plug 'vim-airline/vim-airline'
@@ -80,6 +83,9 @@ call plug#begin(expand('$HOME/.config/vim/plugged'))
     let g:make = 'make'
   endif
 
+  " vim-wordy - Uncover usage problems in your writing
+  Plug 'preservim/vim-wordy'
+
   " vimproc.vim - Asynchronous execution
   Plug 'Shougo/vimproc.vim', {'do': g:make}
 
@@ -123,22 +129,36 @@ call plug#begin(expand('$HOME/.config/vim/plugged'))
   Plug 'leafOfTree/vim-vue-plugin'
 
 call plug#end()
+" }}}
 
 let mapleader=' '                 " Map leader to <space>
 filetype off                      " disable filetype detection (but re-enable later, see below)
 
-set backspace=indent,eol,start    " Backspace behaviour
+" find matching tags in html/xml documents using matchit
+filetype plugin on
+packadd! matchit
+" disable super buggy netrw
+let g:loaded_netrw=1
+let g:netrw_loaded_netrwPlugin=1
+" show JSDoc highlight colors
+let g:javascript_plugin_jsdoc=1
+
+set backspace=indent,eol,start    " Backspace behavior
 set cindent                       " Use 'C' style program indenting
 set cursorline                    " Highlight current line
 set encoding=utf-8                " UTF-8
 set expandtab                     " Use spaces instead of tabs
 set fileformats=unix,dos,mac      " File formats
+set foldmethod=indent             " Fold based on indent
+set foldlevel=99                  " Open all folds
 set guioptions=egmrti             " GUI options
 set hidden                        " Enable hidden buffers
 set ignorecase                    " Always case-insensitive
 set incsearch                     " Searches for strings incrementally
 set laststatus=2                  " Always show statusline (even with only single window)
 set linespace=3                   " Set line spacing
+set list                          " Show invisible characters
+set listchars=tab:⌴\ ,trail:◼,nbsp:•,extends:…,precedes:… " Invisible characters
 set modeline                      " Enable modelines
 set modelines=3                   " Number of lines to check for modelines
 set mouse=a                       " Enable mouse support
@@ -149,7 +169,7 @@ set nowritebackup                 " Disable backup files
 set number                        " Show line numbers
 set relativenumber                " Show relative line numbers
 set ruler                         " Show row and column ruler information
-set scrolloff=5                   " Minimum number of lines to keep above and below the cursor
+set scrolloff=8                   " Minimum number of lines to keep above and below the cursor
 set shiftwidth=4                  " Number of auto-indent spaces
 set shortmess+=A                  " Don't show autocommand messages
 set shortmess+=F                  " Avoid showing the "file-info" message
@@ -163,11 +183,15 @@ set shortmess+=c                  " Avoid showing the "ins-completion-menu" mess
 set shortmess+=c                  " Don't pass messages to |ins-completion-menu|
 set shortmess+=o                  " Avoid showing the "overlength" message
 set shortmess+=t                  " Avoid showing the "trailing whitespace" message
+set showcmd                       " Show command in status line
 set showmatch                     " Highlight matching brace
+set signcolumn=yes                " Show sign column
 set smartcase                     " Enable smart-case search
 set smartindent                   " Enable smart-indent
 set smarttab                      " Enable smart-tabs
 set softtabstop=4                 " Number of spaces per Tab
+set spelllang=fi,en               " Set the spell language
+set spellsuggest=double           " Suggest the first word when spell checking
 set t_Co=256                      " 256 colors
 set termguicolors                 " Enable 24-bit RGB color in the terminal
 set timeoutlen=500                " By default timeoutlen=1000 (ms)
@@ -179,7 +203,8 @@ set wildmode=longest,list:longest " Command-line completion mode
 set wrap                          " Wrap lines
 set wrapscan                      " Searches wrap around the end of the file
 
-set wildignore+=*.o,*.obj,.git,*.rbc,*.pyc,__pycache__,vendor " Ignore these files in wildmenu
+" Ignore these files in wildmenu
+set wildignore+=*.o,*.obj,.git,*.rbc,*.pyc,__pycache__,vendor
 
 colorscheme iceberg               " Set the color scheme
 filetype plugin indent on         " enable filetype detection, plugins and indenting
@@ -311,6 +336,85 @@ let Grep_Skip_Dirs = '.git node_modules vendor plugged'
 
 nnoremap <silent> <leader>sh :terminal<CR>         " open a new terminal
 
+" CoC (code suggestions, diagnostics and refactoring)
+" find or update definitions
+nmap <silent> gd <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
+nmap <silent> gn <Plug>(coc-rename)
+" autoformat code based on linter
+function! s:auto_format()
+    " eslint is no longer exposed as a proper linter to coc
+    if index(['js', 'jsx', 'javascript', 'javascriptreact', 'ts', 'typescript', 'typescriptcommon', 'typescriptreact'], &filetype) >= 0
+        silent! CocCommand eslint.executeAutofix
+    else
+        call CocActionAsync('format')
+    endif
+endfunction
+noremap <silent> <leader>f :call <SID>auto_format()<cr>
+" jump to diagnostics or the documentation
+nmap <silent> <C-k> <Plug>(coc-diagnostic-prev)
+nmap <silent> <C-j> <Plug>(coc-diagnostic-next)
+function! s:show_documentation()
+    if index(['vim','help'], &filetype) >= 0
+        execute 'h '.expand('<cword>')
+    else
+        call CocActionAsync('doHover')
+    endif
+endfunction
+noremap <silent> K :call <SID>show_documentation()<cr>
+" scroll popup windows
+function s:find_cursor_popup(...)
+  let radius = 50
+  let srow = screenrow()
+  let scol = screencol()
+  for r in range(srow - radius, srow + radius)
+    for c in range(scol - radius, scol + radius)
+      let winid = popup_locate(r, c)
+      if winid != 0
+        return winid
+      endif
+    endfor
+  endfor
+  return 0
+endfunction
+function s:scroll_cursor_popup(down)
+  let winid = <SID>find_cursor_popup()
+  if winid == 0
+    return 0
+  endif
+  let pp = popup_getpos(winid)
+  call popup_setoptions(winid, {'firstline': pp.firstline + a:down})
+  return 1
+endfunction
+imap <expr> <C-f> <SID>scroll_cursor_popup(1) ? '' : ''
+imap <expr> <C-b> <SID>scroll_cursor_popup(-1) ? '' : ''
+" expand snippets, completion or copilot with tab key based on selection
+imap <silent> <S-Tab> <Nop>
+let g:copilot_no_tab_map = v:true
+inoremap <silent><expr> <Tab>
+      \ coc#pum#has_item_selected() ? coc#_select_confirm() :
+      \ exists('b:_copilot.suggestions') ? copilot#Accept("\<CR>") : ""
+" automatically fix diagnostics and/or refactor
+noremap <silent> <leader>d :CocList diagnostics<cr>
+nmap <leader>c <Plug>(coc-codeaction)
+xmap <leader>c <Plug>(coc-codeaction-selected)
+
+let g:wordy#ring = [
+    \ 'weak',
+    \ ['being', 'passive-voice', ],
+    \ 'business-jargon',
+    \ 'weasel',
+    \ 'puffery',
+    \ ['problematic', 'redundant', ],
+    \ ['colloquial', 'idiomatic', 'similies', ],
+    \ 'art-jargon',
+    \ ['contractions', 'opinion', 'vague-time', 'said-synonyms', ],
+    \ 'adjectives',
+    \ 'adverbs',
+    \ ]
+
 "*****************************************************************************
 "" Commands
 "*****************************************************************************
@@ -341,9 +445,9 @@ function! ChangeColorScheme(channel, msg)
 endfunction
 
 function! CheckStatus(timer)
-  if executable("default")
+  if executable("defaults")
     let job = job_start(
-          \ ["default", "read", "-g", "AppleInterfaceStyle"],
+          \ ["defaults", "read", "-g", "AppleInterfaceStyle"],
           \ {"out_cb": "ChangeColorScheme"}
           \ )
   else

config/yabai/yabairc

@@ -6,28 +6,33 @@
 # sudo yabai --load-sa
 # yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
 
-# automatically balance windows when they are created or destroyed
-yabai -m config auto_balance on
-
-# layout to use, default is bsp (binary space partitioning)
-# bsp or float (default: float)
-yabai -m config layout bsp
-
-# padding between windows and screen edge
-yabai -m config top_padding 0
-yabai -m config bottom_padding 0
-yabai -m config left_padding 0
-yabai -m config right_padding 0
-yabai -m config window_gap 4
+yabai -m config \
+  active_window_border_color 0xff775759 \
+  auto_balance on \
+  layout bsp \
+  top_padding 0 \
+  bottom_padding 0 \
+  left_padding 0 \
+  right_padding 0 \
+  window_gap 2 \
+  normal_window_opacity 0.60 \
+  window_placement second_child \
+  window_opacity on \
+  window_shadow float
 
 # apps to not manage (ignore)
 # TODO: add apps from aerospace config to here
-yabai -m rule --add app="System Settings" manage=off
-yabai -m rule --add app="^Logi Options$" manage=off
-yabai -m rule --add app="^Slack$" manage=off
+# list active apps:
+# > yabai -m query --windows | jq .[].app
 yabai -m rule --add app="1Password" manage=off
 yabai -m rule --add app="Fork" 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
 
 # apply rules
 yabai -m rule --apply

local/bin/dfm

@@ -64,8 +64,9 @@ section_install()
       $0 install macos
       $0 install fonts
       $0 brew install
+      $0 install cargo
+      $0 install go
       $0 install composer
-      $0 install fzf
       $0 install cheat-databases
       $0 install nvm
       $0 install npm-packages

scripts/install-fonts.sh

@@ -43,6 +43,7 @@ add_fonts_to_sparse_checkout()
 install_fonts()
 {
   msgr run "Starting to install NerdFonts..."
+  # shellcheck disable=SC2048,SC2086
   ./install.sh -q -s ${fonts[*]}
   msgr run_done "Done"
 }

scripts/install-macos-defaults.sh

@@ -41,9 +41,6 @@ msgr nested "Setting General UI/UX settings"
 # Disable the sound effects on boot
 sudo nvram SystemAudioVolume=" "
 
-# Menu bar: disable transparency
-#defaults write NSGlobalDomain AppleEnableMenuBarTransparency -bool false
-
 # Set sidebar icon size to small
 defaults write NSGlobalDomain NSTableViewDefaultSizeMode -int 1
 
@@ -339,8 +336,7 @@ msgr nested "Restarting applications to apply changes"
 ###############################################################################
 
 for app in "Activity Monitor" "Address Book" "Calendar" "Contacts" "cfprefsd" \
-  "Dock" "Finder" "Mail" "Messages" "Safari" "SizeUp" "SystemUIServer" \
-  "Terminal" "Transmission" "iCal"; do
+  "Dock" "Finder" "Mail" "Messages" "Safari" "SizeUp" "SystemUIServer"; do
   killall "${app}" > /dev/null 2>&1
 done