chore(config): update Brewfile, zed settings

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

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

@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5.3.0
+      - uses: actions/setup-python@v5.4.0
       - run: pip install pre-commit && pre-commit autoupdate
       - uses: peter-evans/create-pull-request@v7
         with:

.github/workflows/sync-labels.yml

@@ -0,0 +1,23 @@
+---
+name: Sync labels
+
+# yamllint disable-line rule:truthy
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - .github/workflows/sync-labels.yml
+      - .github/labels.yml
+  schedule:
+    - cron: "34 5 * * *"
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  SyncLabels:
+    permissions:
+      issues: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ivuorinen/actions/sync-labels@main

.gitmodules

@@ -1,4 +1,4 @@
-# vim: set expandtab:
+# vim: noexpandtab filetype=gitconfig
 [submodule "dotbot"]
 	path = tools/dotbot
 	url = https://github.com/anishathalye/dotbot.git
@@ -23,47 +23,69 @@
 	path = config/tmux/plugins/tmux-continuum
 	url = https://github.com/tmux-plugins/tmux-continuum
 	ignore = dirty
+
 [submodule "tmux/tmux-sensible"]
 	path = config/tmux/plugins/tmux-sensible
 	url = https://github.com/tmux-plugins/tmux-sensible.git
 	ignore = dirty
+
 [submodule "tmux/tmux-sessionist"]
 	path = config/tmux/plugins/tmux-sessionist
 	url = https://github.com/tmux-plugins/tmux-sessionist.git
 	ignore = dirty
+
 [submodule "tmux/tmux-yank"]
 	path = config/tmux/plugins/tmux-yank
 	url = https://github.com/tmux-plugins/tmux-yank.git
 	ignore = dirty
+
 [submodule "tmux/tmux-window-name"]
 	path = config/tmux/plugins/tmux-window-name
 	url = https://github.com/ivuorinen/tmux-window-name.git
 	ignore = dirty
+
 [submodule "dotbot-pip"]
 	path = tools/dotbot-pip
 	url = https://github.com/sobolevn/dotbot-pip.git
+	ignore = dirty
+
 [submodule "tmux/tmux-suspend"]
 	path = config/tmux/plugins/tmux-suspend
 	url = https://github.com/MunifTanjim/tmux-suspend.git
+	ignore = dirty
+
 [submodule "tmux/tmux-mode-indicator"]
 	path = config/tmux/plugins/tmux-mode-indicator
 	url = https://github.com/MunifTanjim/tmux-mode-indicator.git
+	ignore = dirty
+
 [submodule "tmux/tmux-current-pane-hostname"]
 	path = config/tmux/plugins/tmux-current-pane-hostname
 	url = https://github.com/soyuka/tmux-current-pane-hostname.git
+	ignore = dirty
+
 [submodule "cheat-tldr"]
 	path = config/cheat/cheatsheets/tldr
 	url = https://github.com/ivuorinen/cheatsheet-tldr.git
+	ignore = dirty
+
 [submodule "tmux/tmux-dark-notify"]
 	path = config/tmux/plugins/tmux-dark-notify
 	url = https://github.com/erikw/tmux-dark-notify.git
+	ignore = dirty
+
 [submodule "asdf"]
 	path = local/bin/asdf
 	url = https://github.com/asdf-vm/asdf.git
+	ignore = dirty
+
 [submodule "antidote"]
 	path = tools/antidote
 	url = https://github.com/mattmc3/antidote.git
 	shallow = true
+	ignore = dirty
+
 [submodule "dotbot-asdf"]
 	path = tools/dotbot-asdf
 	url = https://github.com/sobolevn/dotbot-asdf
+	ignore = dirty

.nvmrc

@@ -1 +1 @@
-22.13.0
+22.13.1

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
         args: [--autofix, --no-sort-keys]
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.43.0
+    rev: v0.44.0
     hooks:
       - id: markdownlint
         args: [-c, .markdownlint.json, --fix]
@@ -44,12 +44,12 @@ repos:
       - id: shfmt
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.6
+    rev: v1.7.7
     hooks:
       - id: actionlint
 
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 39.107.2
+    rev: 39.161.4
     hooks:
       - id: renovate-config-validator
 

.python-version

@@ -1 +1 @@
-3.13.1
+3.13.2

add-submodules.sh

@@ -46,7 +46,7 @@ git submodule add --name tmux/tmux-dark-notify \
 # Takes submodules and sets them to ignore all changes
 for MODULE in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }'); do
   echo "Ignoring submodule changes for submodule.${MODULE}..."
-  git config "submodule.${MODULE}.ignore" all
+  git config "submodule.${MODULE}.ignore" "dirty"
 done
 
 # Mark certain repositories shallow

config/aerospace/aerospace.toml

@@ -43,16 +43,28 @@ automatically-unhide-macos-hidden-apps = true
 if.app-name-regex-substring = 'settings' # All settings
 run = ['layout floating']
 
+[[on-window-detected]]
+if.app-id = 'com.apple.systempreferences' # macOS System Preferences
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.1password.1password' # 1Password
+run = ['layout floating']
+
 [[on-window-detected]]
 if.app-id = 'org.ferdium.ferdium-app' # Ferdium, has WhatsApp etc.
 run = ['layout floating']
 
+[[on-window-detected]]
+if.app-id = 'com.jetbrains.PhpStorm' # PhpStorm
+run = ['layout floating']
+
 [[on-window-detected]]
 if.app-id = 'com.apple.finder' # Finder
 run = ['layout floating']
 
 [[on-window-detected]]
-if.app-id = 'com.apple.Preview'
+if.app-id = 'com.apple.Preview' # Preview
 run = ['layout floating']
 
 [[on-window-detected]]
@@ -91,6 +103,19 @@ run = ['layout floating']
 if.app-id = 'com.tinyspeck.slackmacgap' # Slack
 run = ['layout floating']
 
+[[on-window-detected]]
+if.app-id = 'md.obsidia' # Obsidian
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.todoist.mac.Todoist' # Todoist
+run = ['layout floating']
+
+[[on-window-detected]]
+if.app-id = 'com.apple.backup.launcher' # TimeMachine
+run = ['layout floating']
+
+
 # Possible values: (qwerty|dvorak)
 # See https://nikitabobko.github.io/AeroSpace/guide#key-mapping
 [key-mapping]
@@ -117,6 +142,9 @@ outer.left =       0
 # Fallback value (if you omit the key): mode.main.binding = {}
 [mode.main.binding]
 
+cmd-h = [] # Disable "hide application"
+cmd-alt-h = [] # Disable "hide others"
+
 # All possible keys:
 # - Letters.        a, b, c, ..., z
 # - Numbers.        0, 1, 2, ..., 9
@@ -154,10 +182,10 @@ alt-l = 'focus right'
 # See: https://nikitabobko.github.io/AeroSpace/commands#workspace
 alt-shift-1 = 'workspace 1' # Main
 alt-shift-2 = 'workspace 2' # Media
-ctrl-shift-1 = 'move-node-to-workspace 1'
+ctrl-shift-1 = 'move-node-to-workspace 1' # Move node to Main
-ctrl-shift-2 = 'move-node-to-workspace 2'
+ctrl-shift-2 = 'move-node-to-workspace 2' # Move node to Media
 
-alt-shift-tab = 'workspace-back-and-forth'
+alt-shift-tab = 'workspace-back-and-forth' # Switch between workspaces
 ctrl-shift-tab = 'move-workspace-to-monitor --wrap-around prev'
 
 # See: https://nikitabobko.github.io/AeroSpace/commands#mode

config/homebrew/Brewfile

@@ -61,30 +61,28 @@ brew "apr"
 brew "apr-util"
 # Password hashing library and CLI utility
 brew "argon2"
-# Automatic configure script builder
-brew "autoconf"
-# Tool for generating GNU Standards-compliant Makefiles
-brew "automake"
-# GNU multiple precision arithmetic library
-brew "gmp"
-# GNU File, Shell, and Text utilities
-brew "coreutils"
-# Extendable version manager with support for Ruby, Node.js, Erlang & more
-brew "asdf"
 # Spell checker with better logic than ispell
 brew "aspell"
+# Automatic configure script builder
+brew "autoconf"
 # Collection of over 500 reusable autoconf macros
 brew "autoconf-archive"
+# GNU multiple precision arithmetic library
+brew "gmp"
 # Package compiler and linker metadata toolkit
 brew "pkgconf"
 # Automated text file generator
 brew "autogen"
+# Tool for generating GNU Standards-compliant Makefiles
+brew "automake"
 # Official Amazon AWS command-line interface
 brew "awscli"
 # Bourne-Again SHell, a UNIX command interpreter
 brew "bash"
 # Clone of cat(1) with syntax highlighting and Git integration
 brew "bat"
+# GNU File, Shell, and Text utilities
+brew "coreutils"
 # Bash Automated Testing System
 brew "bats-core"
 # Parser generator
@@ -97,6 +95,8 @@ brew "fontconfig"
 brew "gettext"
 # Core application library for C
 brew "glib"
+# Prevent cloud misconfigurations during build-time for IaC tools
+brew "checkov"
 # Human-friendly and fast alternative to cut and (sometimes) awk
 brew "choose-rust"
 # Cross-platform make
@@ -149,8 +149,6 @@ brew "unbound"
 brew "gnutls"
 # GNU Pretty Good Privacy (PGP) package
 brew "gnupg"
-# Open source programming language to build simple/reliable/efficient software
-brew "go"
 # Library access to GnuPG
 brew "gpgme"
 # Manage your GnuPG keys with ease!
@@ -303,8 +301,6 @@ brew "shivammathur/php/php@7.4"
 brew "shivammathur/php/php@8.0", link: true
 # Find & fix known vulnerabilities in open-source dependencies
 brew "snyk/tap/snyk"
-# Command-line interface for 1Password
-cask "1password-cli"
 # AeroSpace is an i3-like tiling window manager for macOS
 cask "aerospace"
 # Text editor

config/nvim/lua/autogroups.lua

@@ -93,11 +93,12 @@ autocmd({ 'FileType' }, {
 
 -- Set filetype for SSH config directory
 -- Pattern handles directories with files like:
--- .dotfiles/ssh/config.d/*, .ssh/config.local, .ssh/config.work
+-- .dotfiles/ssh/config.d/*, .ssh/config.local, .ssh/config.work,
+-- .ssh/shared.d/*, .ssh/local.d/*
 autocmd({ 'BufRead', 'BufNewFile' }, {
   desc = 'Set filetype for SSH config directory',
   pattern = {
-    '*/?.ssh/{config|shared}.d/*',
+    '*/?.ssh/{config|shared|local}.d/*',
     '*/?.ssh/config.local',
     '*/?.ssh/config.work',
   },

config/nvim/lua/plugins/blink.lua

@@ -18,11 +18,14 @@ return {
         },
       },
 
-      { 'L3MON4D3/LuaSnip', version = 'v2.*' },
+      { 'L3MON4D3/LuaSnip', version = 'v2.*', build = 'make install_jsregexp' },
 
       -- Set of preconfigured snippets for different languages.
       -- https://github.com/rafamadriz/friendly-snippets
-      { 'rafamadriz/friendly-snippets' },
+      {
+        'rafamadriz/friendly-snippets',
+        config = function() require('luasnip.loaders.from_vscode').lazy_load() end,
+      },
 
       -- Lua plugin to turn github copilot into a cmp source
       -- https://github.com/giuxtaposition/blink-cmp-copilot

config/nvim/lua/plugins/lsp.lua

@@ -148,70 +148,61 @@ return {
   -- https://github.com/Bilal2453/luvit-meta
   { 'Bilal2453/luvit-meta', lazy = true },
 
+  -- Quickstart configs for Nvim LSP
+  -- https://github.com/neovim/nvim-lspconfig
+  { 'neovim/nvim-lspconfig' },
+
+  -- Portable package manager for Neovim that runs everywhere Neovim runs.
+  -- Easily install and manage LSP servers, DAP servers, linters, and formatters.
+  -- https://github.com/williamboman/mason.nvim
+  {
+    'williamboman/mason.nvim',
+    version = '*',
+    cmd = 'Mason',
+    run = ':MasonUpdate',
+    opts = {},
+  },
+
+  -- Extensible UI for Neovim notifications and LSP progress messages.
+  -- https://github.com/j-hui/fidget.nvim
+  {
+    'j-hui/fidget.nvim',
+    version = '*',
+    opts = {},
+  },
+
+  -- Extension to mason.nvim that makes it easier to use lspconfig with mason.nvim.
+  -- https://github.com/williamboman/mason-lspconfig.nvim
+  { 'williamboman/mason-lspconfig.nvim' },
+
+  -- Install and upgrade third party tools automatically
+  -- https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim
+  {
+    'WhoIsSethDaniel/mason-tool-installer.nvim',
+    version = '*',
+    opts = {
+      auto_install = true,
+      auto_update = true,
+      ensure_installed = mason_tools,
+    },
+  },
+
+  -- JSON schemas for Neovim
+  -- https://github.com/b0o/SchemaStore.nvim
+  { 'b0o/schemastore.nvim' },
+
+  -- Performant, batteries-included completion plugin for Neovim
+  -- https://github.com/saghen/blink.cmp
+  -- See lua/plugins/blink.lua for configs
+  { 'saghen/blink.cmp' },
+
   -- A simple wrapper for nvim-lspconfig and mason-lspconfig
   -- to easily setup LSP servers.
   -- https://github.com/junnplus/lsp-setup.nvim
   {
     'junnplus/lsp-setup.nvim',
-    dependencies = {
-      -- Quickstart configs for Nvim LSP
-      -- https://github.com/neovim/nvim-lspconfig
-      { 'neovim/nvim-lspconfig' },
-
-      -- Portable package manager for Neovim that runs everywhere Neovim runs.
-      -- Easily install and manage LSP servers, DAP servers, linters, and formatters.
-      -- https://github.com/williamboman/mason.nvim
-      {
-        'williamboman/mason.nvim',
-        version = '*',
-        cmd = 'Mason',
-        run = ':MasonUpdate',
-        opts = {},
-      },
-
-      -- Extensible UI for Neovim notifications and LSP progress messages.
-      -- https://github.com/j-hui/fidget.nvim
-      {
-        'j-hui/fidget.nvim',
-        version = '*',
-        opts = {},
-      },
-
-      -- Extension to mason.nvim that makes it easier to use lspconfig with mason.nvim.
-      -- https://github.com/williamboman/mason-lspconfig.nvim
-      { 'williamboman/mason-lspconfig.nvim' },
-
-      -- Install and upgrade third party tools automatically
-      -- https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim
-      {
-        'WhoIsSethDaniel/mason-tool-installer.nvim',
-        version = '*',
-        opts = {
-          auto_install = true,
-          auto_update = true,
-          ensure_installed = mason_tools,
-        },
-      },
-
-      -- JSON schemas for Neovim
-      -- https://github.com/b0o/SchemaStore.nvim
-      { 'b0o/schemastore.nvim' },
-
-      -- Performant, batteries-included completion plugin for Neovim
-      -- https://github.com/saghen/blink.cmp
-      -- See lua/plugins/blink.lua for configs
-      { 'saghen/blink.cmp' },
-    },
     opts = {
       default_mappings = false,
-      mappings = {
-        gd = 'lua require"telescope.builtin".lsp_definitions()',
-        gi = 'lua require"telescope.builtin".lsp_implementations()',
-        gr = 'lua require"telescope.builtin".lsp_references()',
-      },
-      inlay_hints = {
-        enabled = true,
-      },
       servers = lsp_servers,
     },
     config = function(_, opts)
@@ -315,16 +306,6 @@ return {
     'stevearc/conform.nvim',
     event = { 'BufWritePre' },
     cmd = { 'ConformInfo' },
-    keys = {
-      {
-        '<leader>cf',
-        function()
-          require('conform').format { async = true, lsp_format = 'fallback' }
-        end,
-        mode = '',
-        desc = 'Format buffer',
-      },
-    },
     opts = {
       notify_on_error = false,
       ---@type nil|conform.FormatOpts|fun(bufnr: integer): nil|conform.FormatOpts
@@ -340,9 +321,9 @@ return {
           lsp_format_opt = 'fallback'
         end
 
-        -- Disable autoformat for files in a certain path
+        -- Disable autoformat for files in a certain paths
         local bufname = vim.api.nvim_buf_get_name(bufnr)
-        if bufname:match '/node_modules/' then return end
+        if bufname:match '/node_modules|vendor/' then return end
 
         return {
           timeout_ms = 500,

config/nvim/lua/plugins/mini.lua

@@ -165,20 +165,6 @@ return {
       -- Replaced lukas-reineke/indent-blankline.nvim
       require('mini.indentscope').setup()
 
-      -- Jump to next/previous single character
-      require('mini.jump').setup {
-        mappings = {
-          forward = 'f',
-          backward = 'F',
-          forward_till = 't',
-          backward_till = 'T',
-          repeat_jump = ';',
-        },
-      }
-
-      -- Move lines and blocks of text
-      require('mini.move').setup()
-
       -- Text edit operators
       -- g= - Evaluate text and replace with output
       -- gx - Exchange text regions
@@ -223,11 +209,11 @@ return {
         content = {
           active = function()
             local mode, mode_hl = sl.section_mode { trunc_width = 120 }
-            local git = sl.section_git { trunc_width = 75 }
+            local git = sl.section_git { trunc_width = 9999 }
-            local diagnostics = sl.section_diagnostics { trunc_width = 75 }
+            local diagnostics = sl.section_diagnostics { trunc_width = 9999 }
             local filename = sl.section_filename { trunc_width = 9999 }
-            local fileinfo = sl.section_fileinfo { trunc_width = 120 }
+            local fileinfo = sl.section_fileinfo { trunc_width = 9999 }
-            local location = sl.section_location { trunc_width = 75 }
+            local location = sl.section_location { trunc_width = 9999 }
             return sl.combine_groups {
               { hl = mode_hl, strings = { mode } },
               { hl = 'statuslineDevinfo', strings = { git, diagnostics } },

config/tmux/.ignore

@@ -0,0 +1 @@
+plugins/*

config/tmux/config-plugins.conf

@@ -40,6 +40,8 @@ run-shell "$TMUX_PLUGINS/tmux-sensible/sensible.tmux"
 run-shell "$TMUX_PLUGINS/tmux-window-name/tmux_window_name.tmux"
 run-shell "$TMUX_PLUGINS/tmux-mode-indicator/mode_indicator.tmux"
 run-shell "$TMUX_PLUGINS/tmux-suspend/suspend.tmux"
+run-shell "$TMUX_PLUGINS/tmux-continuum/continuum.tmux"
+run-shell "$TMUX_PLUGINS/tmux-sessionist/sessionist.tmux"
 run-shell "$TMUX_PLUGINS/tmux-yank/yank.tmux"
 run-shell "$TMUX_PLUGINS/tmux-current-pane-hostname/current_pane_hostname.tmux"
 run-shell "$TMUX_PLUGINS/tmux-dark-notify/main.tmux"

config/zed/settings.json

@@ -1,8 +1,11 @@
 {
+  "telemetry": {
+    "metrics": false
+  },
   "assistant": {
     "default_model": {
       "provider": "copilot_chat",
-      "model": "gpt-4o"
+      "model": "claude-3-5-sonnet"
     },
     "version": "2"
   },

docs/nvim-keybindings.md

@@ -54,7 +54,7 @@ n  <Space>xq   * :Trouble quickfix<CR>
                  Quickfix
 n  <Space>xl   * :Trouble loclist<CR>
                  Location List
-n  <Space>xd   * :Trouble document_diagnostics<CR>
+n  <Space>xd   * :Trouble diagnostics<CR>
                  Document Diagnostics
 n  <Space>sx   * :Telescope import<CR>
                  Telescope: Import
@@ -64,7 +64,7 @@ n  <Space>ss   * :Telescope treesitter<CR>
                  Treesitter
 n  <Space>sq   * :Telescope quickfix<CR>
                  Quickfix
-n  <Space>sp   * :lua require("telescope").extensions.lazy_plugins.lazy_plugins()<CR>
+n  <Space>sp   * ~/.config/nvim/lua/keymaps.lua
                  Lazy Plugins
 n  <Space>so   * :Telescope oldfiles<CR>
                  Old Files
@@ -80,14 +80,6 @@ n  <Space>sd   * :Telescope diagnostics<CR>
                  Search Diagnostics
 n  <Space>sc   * :Telescope commands<CR>
                  Commands
-n  <Space>pt   * :PhpactorTransform<CR>
-                 PHPactor: Transform
-n  <Space>ps   * :PhpactorClassSearch<CR>
-                 PHPactor: Class Search
-n  <Space>pn   * :PhpactorClassNew<CR>
-                 PHPactor: Class New
-n  <Space>pm   * :PhpactorContextMenu<CR>
-                 PHPactor: Context Menu
 n  <Space>/    * ~/.config/nvim/lua/keymaps.lua
                  Fuzzily search in current buffer
 n  <Space>,    * :Telescope buffers<CR>
@@ -104,37 +96,33 @@ n  <Space>cbd  * <Cmd>CBd<CR>
                  CB: Remove a box
 n  <Space>cbb  * <Cmd>CBccbox<CR>
                  CB: Box Title
-n  <Space>cw   * :Lspsaga diagnostic_jump_next<CR>
+n  <Space>cwd  * ~/.config/nvim/lua/keymaps.lua
-                 Diagnostic Jump Next
+                 Dynamic Workspace Symbols
-n  <Space>cv   * :Lspsaga diagnostic_jump_prev<CR>
+n  <Space>cws  * ~/.config/nvim/lua/keymaps.lua
-                 Diagnostic Jump Prev
+                 Workspace Symbols
-n  <Space>cu   * :Lspsaga preview_definition<CR>
+n  <Space>ct   * ~/.config/nvim/lua/keymaps.lua
-                 Preview Definition
+                 treesitter
-n  <Space>cT   * :Telescope lsp_type_definitions<CR>
-                 LSP Type Definitions
-n  <Space>ct   * :Lspsaga peek_type_definition<CR>
-                 Peek Type Definition
 n  <Space>cs   * :Telescope lsp_document_symbols<CR>
                  LSP Document Symbols
-n  <Space>cR   * :Lspsaga rename ++project<CR>
+n  <Space>cr   * ~/.local/share/bob/v0.10.2/nvim-macos-arm64/share/nvim/runtime/lua/vim/lsp/buf.lua
-                 Rename Project wide
-n  <Space>cr   * :Lspsaga rename<CR>
                  Rename
-n  <Space>cp   * :Lspsaga peek_definition<CR>
+n  <Space>cp   * ~/.config/nvim/lua/keymaps.lua
-                 Peek Definition
+                 Type Definition
-n  <Space>cl   * :Lspsaga show_cursor_diagnostics<CR>
+n  <Space>ci   * ~/.config/nvim/lua/keymaps.lua
-                 Cursor Diagnostics
-n  <Space>ci   * :Lspsaga implement<CR>
                  Implementations
 n  <Space>cg   * :lua require("neogen").generate()<CR>
                  Generate annotations
-n  <Space>cd   * :Lspsaga show_line_diagnostics<CR>
+x  <Space>cf   * :lua vim.lsp.buf.format()<CR>
-                 Line Diagnostics
+                 Format
-n  <Space>cco  * :Lspsaga outgoing_calls<CR>
+n  <Space>cf   * :lua vim.lsp.buf.format()<CR>
-                 Outgoing Calls
+                 Format
-n  <Space>cci  * :Lspsaga incoming_calls<CR>
+n  <Space>cd   * ~/.config/nvim/lua/keymaps.lua
-                 Incoming Calls
+                 Definitions
-n  <Space>ca   * :Lspsaga code_action<CR>
+n  <Space>cco  * ~/.config/nvim/lua/keymaps.lua
+                 Outgoing calls
+n  <Space>cci  * ~/.config/nvim/lua/keymaps.lua
+                 Incoming calls
+n  <Space>ca   * :lua vim.lsp.buf.code_action()<CR>
                  Code Action
 n  <Space>bw   * :lua MiniBufremove.wipeout()<CR>
                  Wipeout
@@ -150,6 +138,14 @@ n  <Space>bd   * :lua MiniBufremove.delete()<CR>
                  Delete
 n  <Space>ba   * :%bd|e#|bd#<CR>
                  Close all except current
+n  <Space>apt  * :PhpactorTransform<CR>
+                 PHPactor: Transform
+n  <Space>aps  * :PhpactorClassSearch<CR>
+                 PHPactor: Class Search
+n  <Space>apn  * :PhpactorClassNew<CR>
+                 PHPactor: Class New
+n  <Space>apm  * :PhpactorContextMenu<CR>
+                 PHPactor: Context Menu
 n  <Space>av   * :silent TestVisit<CR>
                  Test Visit
 n  <Space>al   * :silent TestLast<CR>
@@ -184,8 +180,6 @@ n  <Space>tmc  * <Cmd>setlocal cursorline! cursorline?<CR>
                  Toggle 'cursorline'
 n  <Space>tmb  * <Cmd>lua vim.o.bg = vim.o.bg == "dark" and "light" or "dark"; print(vim.o.bg)<CR>
                  Toggle 'background'
-   <Space>cf   * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
-                 Format buffer
 x  #           * vim/_defaults.lua
                  :help v_#-default
 o  %             <Plug>(MatchitOperationForward)
@@ -194,17 +188,11 @@ n  %             <Plug>(MatchitNormalForward)
 n  &           * :&&<CR>
                  :help &-default
 n  '?          & :<C-U>echo ":Start" dispatch#start_focus(v:count > 1 ? 0 : v:count ? line(".") : -1)<CR>
-n  '!          & <SNR>30_:.Start!
+n  '!          & <SNR>28_:.Start!
-n  '<Space>    & <SNR>30_:.Start<Space>
+n  '<Space>    & <SNR>28_:.Start<Space>
-n  '<CR>       & <SNR>30_:.Start<CR>
+n  '<CR>       & <SNR>28_:.Start<CR>
 x  *           * vim/_defaults.lua
                  :help v_star-default
-o  ;           * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua
-                 Repeat jump
-x  ;           * <Cmd>lua MiniJump.jump()<CR>
-                 Repeat jump
-n  ;           * <Cmd>lua MiniJump.jump()<CR>
-                 Repeat jump
 v  <           * <gv
                  Indent Left
 n  <           * <gv
@@ -217,31 +205,19 @@ n  @           * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua
                  Execute macro without 'mini.clue' triggers
 x  @           * mode() ==# 'V' ? ':normal! @'.getcharstr().'<CR>' : '@'
                  :help v_@-default
-o  F           * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua
+n  K           * :lua vim.lsp.buf.hover()<CR>
-                 Jump backward
-x  F           * <Cmd>lua MiniJump.smart_jump(true, false)<CR>
-                 Jump backward
-n  F           * <Cmd>lua MiniJump.smart_jump(true, false)<CR>
-                 Jump backward
-n  K           * :Lspsaga hover_doc<CR>
                  Hover Documentation
 n  Q           * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua
                  Execute macro without 'mini.clue' triggers
 x  Q           * mode() ==# 'V' ? ':normal! @<C-R>=reg_recorded()<CR><CR>' : 'Q'
                  :help v_Q-default
-o  T           * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua
-                 Jump backward till
-x  T           * <Cmd>lua MiniJump.smart_jump(true, true)<CR>
-                 Jump backward till
-n  T           * <Cmd>lua MiniJump.smart_jump(true, true)<CR>
-                 Jump backward till
 n  Y           * y$
                  :help Y-default
-n  Zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+o  Zk          * ~/.config/nvim/lua/keymaps.lua
                  Flash Treesitter
-o  Zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+x  Zk          * ~/.config/nvim/lua/keymaps.lua
                  Flash Treesitter
-x  Zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+n  Zk          * ~/.config/nvim/lua/keymaps.lua
                  Flash Treesitter
 o  [%            <Plug>(MatchitOperationMultiBackward)
 x  [%            <Plug>(MatchitVisualMultiBackward)
@@ -289,10 +265,10 @@ n  ]h          * <Cmd>lua MiniDiff.goto_hunk('next')<CR>
                  Next hunk
 n  ]d          * vim/_defaults.lua
                  Jump to the next diagnostic
-n  `?          & <SNR>30_:.FocusDispatch<CR>
+n  `?          & <SNR>28_:.FocusDispatch<CR>
-n  `!          & <SNR>30_:.Dispatch!
+n  `!          & <SNR>28_:.Dispatch!
-n  `<Space>    & <SNR>30_:.Dispatch<Space>
+n  `<Space>    & <SNR>28_:.Dispatch<Space>
-n  `<CR>       & <SNR>30_:.Dispatch<CR>
+n  `<CR>       & <SNR>28_:.Dispatch<CR>
 x  a%            <Plug>(MatchitVisualTextObject)
 o  ax            <Plug>(textobj-xmlattr-attr-a)
 x  ax            <Plug>(textobj-xmlattr-attr-a)
@@ -300,25 +276,19 @@ o  ai          * <Cmd>lua MiniIndentscope.textobject(true)<CR>
                  Object scope with border
 x  ai          * <Cmd>lua MiniIndentscope.textobject(true)<CR>
                  Object scope with border
-o  f           * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua
-                 Jump forward
-x  f           * <Cmd>lua MiniJump.smart_jump(false, false)<CR>
-                 Jump forward
-n  f           * <Cmd>lua MiniJump.smart_jump(false, false)<CR>
-                 Jump forward
 n  gR          * :RegexplainerToggle<CR>
                  Toggle Regexplainer
 o  g%            <Plug>(MatchitOperationBackward)
 x  g%            <Plug>(MatchitVisualBackward)
 n  g%            <Plug>(MatchitNormalBackward)
 n  g`?         & :<C-U>echo ":Spawn" dispatch#spawn_focus(v:count > 1 ? 0 : v:count ? line(".") : -1)<CR>
-n  g`!         & <SNR>30_:.Spawn!
+n  g`!         & <SNR>28_:.Spawn!
-n  g`<Space>   & <SNR>30_:.Spawn<Space>
+n  g`<Space>   & <SNR>28_:.Spawn<Space>
-n  g`<CR>      & <SNR>30_:.Spawn<CR>
+n  g`<CR>      & <SNR>28_:.Spawn<CR>
 n  g'?         & :<C-U>echo ":Spawn" dispatch#spawn_focus(v:count > 1 ? 0 : v:count ? line(".") : -1)<CR>
-n  g'!         & <SNR>30_:.Spawn!
+n  g'!         & <SNR>28_:.Spawn!
-n  g'<Space>   & <SNR>30_:.Spawn<Space>
+n  g'<Space>   & <SNR>28_:.Spawn<Space>
-n  g'<CR>      & <SNR>30_:.Spawn<CR>
+n  g'<CR>      & <SNR>28_:.Spawn<CR>
 x  gS          * :<C-U>lua MiniSplitjoin.toggle({ region = MiniSplitjoin.get_visual_region() })<CR>
                  Toggle arguments
 n  gS          * v:lua.MiniSplitjoin.operator("toggle") . " "
@@ -400,9 +370,9 @@ x  k           * v:count == 0 ? 'gk' : 'k'
 n  k           * v:count == 0 ? 'gk' : 'k'
                  Move up
 n  m?          & :<C-U>echo ":Dispatch" dispatch#make_focus(v:count > 1 ? 0 : v:count ? line(".") : -1)<CR>
-n  m!          & <SNR>30_:.Make!
+n  m!          & <SNR>28_:.Make!
-n  m<Space>    & <SNR>30_:.Make<Space>
+n  m<Space>    & <SNR>28_:.Make<Space>
-n  m<CR>       & <SNR>30_:.Make<CR>
+n  m<CR>       & <SNR>28_:.Make<CR>
 n  shn         * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua
                  Highlight next surrounding
 n  sFn         * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua
@@ -439,17 +409,11 @@ n  sd          * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua
                  Delete surrounding
 n  sa          * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua
                  Add surrounding
-o  t           * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua
+o  zk          * ~/.config/nvim/lua/keymaps.lua
-                 Jump forward till
-x  t           * <Cmd>lua MiniJump.smart_jump(false, true)<CR>
-                 Jump forward till
-n  t           * <Cmd>lua MiniJump.smart_jump(false, true)<CR>
-                 Jump forward till
-o  zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
                  Flash
-x  zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+x  zk          * ~/.config/nvim/lua/keymaps.lua
                  Flash
-n  zk          * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua
+n  zk          * ~/.config/nvim/lua/keymaps.lua
                  Flash
 n  <F1>        * :FloatermToggle<CR>
                  Toggle Floaterm
@@ -492,30 +456,30 @@ x  <Plug>(MatchitVisualBackward) * :<C-U>call matchit#Match_wrapper('',0,'v')<CR
 x  <Plug>(MatchitVisualForward) * :<C-U>call matchit#Match_wrapper('',1,'v')<CR>:if col("''") != col("$") | exe ":normal! m'" | endif<CR>gv``
 n  <Plug>(MatchitNormalBackward) * :<C-U>call matchit#Match_wrapper('',0,'n')<CR>
 n  <Plug>(MatchitNormalForward) * :<C-U>call matchit#Match_wrapper('',1,'n')<CR>
-n  <SNR>30_:.  & :<C-R>=getcmdline() =~ ',' ? "\0250" : ""<CR>
+o  <Plug>(textobj-xmlattr-attr-i) & <SNR>34_(save-cursor-pos):<C-U>call g:__textobj_xmlattr.do_by_pattern("select","attr-i","o")<CR>
-o  <Plug>(textobj-xmlattr-attr-i) & <SNR>26_(save-cursor-pos):<C-U>call g:__textobj_xmlattr.do_by_pattern("select","attr-i","o")<CR>
+v  <Plug>(textobj-xmlattr-attr-i) & <SNR>34_(save-cursor-pos):<C-U>call g:__textobj_xmlattr.do_by_pattern("select","attr-i","v")<CR>
-v  <Plug>(textobj-xmlattr-attr-i) & <SNR>26_(save-cursor-pos):<C-U>call g:__textobj_xmlattr.do_by_pattern("select","attr-i","v")<CR>
+o  <Plug>(textobj-xmlattr-attr-a) & <SNR>34_(save-cursor-pos):<C-U>call g:__textobj_xmlattr.do_by_pattern("select","attr-a","o")<CR>
-o  <Plug>(textobj-xmlattr-attr-a) & <SNR>26_(save-cursor-pos):<C-U>call g:__textobj_xmlattr.do_by_pattern("select","attr-a","o")<CR>
+v  <Plug>(textobj-xmlattr-attr-a) & <SNR>34_(save-cursor-pos):<C-U>call g:__textobj_xmlattr.do_by_pattern("select","attr-a","v")<CR>
-v  <Plug>(textobj-xmlattr-attr-a) & <SNR>26_(save-cursor-pos):<C-U>call g:__textobj_xmlattr.do_by_pattern("select","attr-a","v")<CR>
+n  <SNR>34_    * <SNR>34_
-n  <SNR>26_    * <SNR>26_
+   <SNR>34_(save-cursor-pos) * <SNR>34_save_cursor_pos()
-   <SNR>26_(save-cursor-pos) * <SNR>26_save_cursor_pos()
+n  <SNR>28_:.  & :<C-R>=getcmdline() =~ ',' ? "\0250" : ""<CR>
 n  <Plug>PlenaryTestFile * :lua require('plenary.test_harness').test_file(vim.fn.expand("%:p"))<CR>
-n  <M-k>       * <Cmd>lua MiniMove.move_line('up')<CR>
+s  <Plug>luasnip-jump-prev * ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua
-                 Move line up
+                 LuaSnip: Jump to the previous node
-n  <M-j>       * <Cmd>lua MiniMove.move_line('down')<CR>
+s  <Plug>luasnip-jump-next * ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua
-                 Move line down
+                 LuaSnip: Jump to the next node
-n  <M-l>       * <Cmd>lua MiniMove.move_line('right')<CR>
+s  <Plug>luasnip-prev-choice * ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua
-                 Move line right
+                 LuaSnip: Change to the previous choice from the choiceNode
-n  <M-h>       * <Cmd>lua MiniMove.move_line('left')<CR>
+s  <Plug>luasnip-next-choice * ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua
-                 Move line left
+                 LuaSnip: Change to the next choice from the choiceNode
-x  <M-k>       * <Cmd>lua MiniMove.move_selection('up')<CR>
+s  <Plug>luasnip-expand-snippet * ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua
-                 Move up
+                 LuaSnip: Expand the current snippet
-x  <M-j>       * <Cmd>lua MiniMove.move_selection('down')<CR>
+s  <Plug>luasnip-expand-or-jump * ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua
-                 Move down
+                 LuaSnip: Expand or jump in the current snippet
-x  <M-l>       * <Cmd>lua MiniMove.move_selection('right')<CR>
+   <Plug>luasnip-expand-repeat * ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua
-                 Move right
+                 LuaSnip: Repeat last node expansion
-x  <M-h>       * <Cmd>lua MiniMove.move_selection('left')<CR>
+n  <Plug>luasnip-delete-check * ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua
-                 Move left
+                 LuaSnip: Removes current snippet from jumplist
 x  <C-S>       * <Esc><Cmd>silent! update | redraw<CR>
                  Save and go to Normal mode
 n  <C-S>       * :w!<CR>
@@ -528,4 +492,4 @@ n  <C-L>       * :lua vim.lsp.buf.signature_help()<CR>
                  Signature
 ```
 
-- Generated on Tue  7 Jan 2025 21:37:18 EET
+- Generated on Tue 21 Jan 2025 15:24:13 EET

scripts/install-macos-defaults.sh

@@ -26,7 +26,7 @@ msgr nested "Change user shell to zsh if it is available and not the current"
 
 # Change user shell to zsh if not that already.
 if hash zsh 2> /dev/null; then
-  [[ "$SHELL" != $(which zsh) ]] && chsh -s "$(which zsh)"
+  [[ $SHELL != $(which zsh) ]] && chsh -s "$(which zsh)"
 fi
 
 ###############################################################################
@@ -150,7 +150,7 @@ msgr nested "Settings for Finder"
 # Set Desktop as the default location for new Finder windows
 # For other paths, use `PfLo` and `file:///full/path/here/`
 defaults write com.apple.finder NewWindowTarget -string "PfDe"
-defaults write com.apple.finder NewWindowTargetPath -string "file://${HOME}/Desktop/"
+defaults write com.apple.finder NewWindowTargetPath -string "file://${HOME}/"
 
 # Show icons for external hard drives, servers, and removable media on the desktop
 defaults write com.apple.finder ShowExternalHardDrivesOnDesktop -bool true
@@ -201,6 +201,10 @@ defaults write com.apple.finder FXInfoPanesExpanded -dict \
   OpenWith -bool true \
   Privileges -bool true
 
+# Move windows by dragging any part of the window
+# From https://nikitabobko.github.io/AeroSpace/goodies
+defaults write -g NSWindowShouldDragOnGesture -bool true
+
 ###############################################################################
 # Screenshots                                                                 #
 ###############################################################################

ssh/config

@@ -1,7 +1,9 @@
+# vim: ft=sshconfig
 Include shared.d/*
 Include local.d/*
 
 Host *
   ServerAliveInterval 300 # send null packets every 5min to keep connection alive
   ServerAliveCountMax 2 # if the server doesn't respond 2 times, it's gone so give up
-#  IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+  ForwardAgent yes
+  #  IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"

ssh/shared.d/turingpi

@@ -1,3 +1,5 @@
+# vim: ft=sshconfig
+
 Host t1
   User ubuntu
   HostName t1.home.antiprocess.net
@@ -14,4 +16,3 @@ Host t4
   User ubuntu
   HostName t4.home.antiprocess.net
   IdentityFile ~/.ssh/id_rsa
-