fix(git): submodule registration script

config/nvim v3.36.0

.actrc

@@ -0,0 +1,3 @@
+--container-architecture linux/amd64
+--env-file .env
+--secret-file .env

.editorconfig

@@ -8,6 +8,22 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.php]
+indent_size = 4
+
 [.git{ignore,modules}]
 indent_style = tab
 indent_size = 1
+
+[*.plist]
+indent_size = 1
+indent_style = tab
+
+[local/bin/*]
+shell_variant      = bash # --language-variant
+binary_next_line   = true
+switch_case_indent = true # --case-indent
+space_redirects    = true
+keep_padding       = true
+function_next_line = true # --func-next-line
+

.gitattributes

@@ -219,3 +219,9 @@ git/*              text
 **/git/*           text
 **/alias           text
 ssh/*              text
+
+# Git Crypt special files
+*-secret   filter=git-crypt diff=git-crypt
+*.key      filter=git-crypt diff=git-crypt
+secrets/** filter=git-crypt diff=git-crypt
+

.github/README.md

@@ -0,0 +1,118 @@
+# .dotfiles
+
+Welcome to [ivuorinen](https://github.com/ivuorinen)'s .dotfiles repository.
+It's a hodgepodge of scripts and configurations, tests and mistakes I'm not
+aware of yet. As I find more interesting tools, configs and other stuff,
+this repository will live accordingly.
+
+Please for the love of everything good do not use these 1:1 as your own dotfiles,
+fork or download the repo as a zip and go from there with your own configs.
+
+## Setup
+
+### First time setup
+
+1. Clone this repository to `$HOME/.dotfiles`
+2. `./install`
+3. ???
+4. Profit
+
+### Updates
+
+`cd $HOME/.dotfiles && git pull && ./install`
+
+## The looks
+
+## tmux with powerlevel10k, the default view
+
+![screenshot of tmux with powerlevel10k](./screenshots/tmux-powerlevel10k-130x20.png)
+
+## tmux + nvim (astronvim) editing this repository
+
+![screenshot of tmux showing nvim](./screenshots/tmux-astronvim-130x40.png)
+
+## Interesting files and locations
+
+### Interesting folders
+
+| Path                | Description                                  |
+|---------------------|----------------------------------------------|
+| `.github`           | GitHub Repository configuration files.       |
+| `hosts/{hostname}/` | Configs that should apply to that host only. |
+| `local/bin`         | Helper scripts that I've collected or wrote. |
+| `scripts`           | Setup scripts.                               |
+
+### dotfile folders
+
+| Repo      | Destination | Description                                 |
+|-----------|-------------|---------------------------------------------|
+| `base/`   | `.*`        | `$HOME` level files.                        |
+| `config/` | `.config/`  | Configurations for applications.            |
+| `local/`  | `.local/`   | XDG Base folder: `bin`, `share` and `state` |
+| `ssh/`    | `.ssh/`     | SSH Configurations.                         |
+
+### dfm - the dotfiles manager
+
+`.local/bin/dfm` is a shell script that has some tools that help with dotfiles management.
+
+## Configuration
+
+The folder structure follows [XDG Base Directory Specification][xdg] where possible.
+
+### XDG Variables
+
+| Env                | Default              | Short description                              |
+|--------------------|----------------------|------------------------------------------------|
+| `$XDG_BIN_HOME`    | `$HOME/.local/bin`   | Local binaries                                 |
+| `$XDG_CONFIG_HOME` | `$HOME/.config`      | User-specific configs                          |
+| `$XDG_DATA_HOME`   | `$HOME/.local/share` | User-specific data files                       |
+| `$XDG_STATE_HOME`  | `$HOME/.local/state` | App state that should persist between restarts |
+
+#### XDG_BIN_HOME (`$HOME/.local/bin`)
+
+`$XDG_BIN_HOME` defines directory that contains local binaries.
+
+User-specific executable files may be stored in `$HOME/.local/bin`.
+Distributions should ensure this directory shows up in the UNIX `$PATH`
+environment variable, at an appropriate place.
+
+#### XDG_DATA_HOME (`$HOME/.local/share`)
+
+`$XDG_DATA_HOME` defines the base directory relative to which
+user-specific *data files* should be stored.
+
+If `$XDG_DATA_HOME` is either not set or empty,
+a default equal to `$HOME/.local/share` should be used.
+
+#### XDG_CONFIG_HOME (`$HOME/.config`)
+
+`$XDG_CONFIG_HOME` defines the base directory relative to which
+user-specific *configuration files* should be stored.
+
+If `$XDG_CONFIG_HOME` is either not set or empty,
+a default equal to `$HOME/.config` should be used.
+
+#### XDG_STATE_HOME (`$HOME/.local/state`)
+
+`$XDG_STATE_HOME` defines the base directory relative to which
+user-specific *state files* should be stored.
+
+If `$XDG_STATE_HOME` is either not set or empty,
+a default equal to `$HOME/.local/state` should be used.
+
+The `$XDG_STATE_HOME` contains *state data* that should
+*persist between (application) restarts*, but that is not important or
+portable enough to the user that it should be stored in `$XDG_DATA_HOME`.
+
+- It may contain:
+  - actions history (logs, history, recently used files, …)
+  - current state of the application that can be reused
+    on a restart (view, layout, open files, undo history, …)
+
+#### XDG_DATA_DIRS
+
+`$XDG_DATA_DIRS` defines the preference-ordered set of base directories
+to search for data files in addition to the `$XDG_DATA_HOME` base directory.
+The directories in `$XDG_DATA_DIRS` should be seperated with a colon ':'.
+
+[xdg]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/tag-changelog-config.js

@@ -0,0 +1,35 @@
+module.exports = {
+  types: [
+    { types: ['feat', 'feature', 'Feat'], label: '🎉 New Features' },
+    { types: ['fix', 'bugfix', 'Fix'], label: '🐛 Bugfixes' },
+    { types: ['improvements', 'enhancement'], label: '🔨 Improvements' },
+    { types: ['perf'], label: '🏎️ Performance Improvements' },
+    { types: ['build', 'ci'], label: '🏗️ Build System' },
+    { types: ['refactor'], label: '🪚 Refactors' },
+    { types: ['doc', 'docs'], label: '📚 Documentation Changes' },
+    { types: ['test', 'tests'], label: '🔍 Tests' },
+    { types: ['style', 'codestyle'], label: '💅 Code Style Changes' },
+    { types: ['chore', 'Chore'], label: '🧹 Chores' },
+    { types: ['other', 'Other'], label: 'Other Changes' },
+  ],
+
+  excludeTypes: [],
+
+  renderTypeSection: function (label, commits) {
+    let text = `\n## ${ label }\n\n`
+
+    commits.forEach((commit) => {
+      const scope = commit.scope ? `**${ commit.scope }:** ` : ''
+      text += `- ${ scope }${ commit.subject }\n`
+    })
+
+    return text
+  },
+
+  renderChangelog: function (release, changes) {
+    const now = new Date()
+    const d = now.toISOString().substring(0, 10);
+    const header = `# ${ release } - ${ d }\n`;
+    return header + changes + '\n\n'
+  },
+}

.github/workflows/changelog.yml

@@ -0,0 +1,18 @@
+name: Debug Changelog # Workflow name displayed on GitHub
+on:
+  workflow_dispatch: # Trigger manually
+jobs:
+  debug-changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Create changelog text
+        id: changelog
+        uses: loopwerk/tag-changelog@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          config_file: .github/tag-changelog-config.js
+      - name: "Echo results"
+        id: output-changelog
+        run: |
+          echo "${{ steps.changelog.outputs.changes }}"

.github/workflows/new-release.yml

@@ -0,0 +1,34 @@
+name: Release Daily State # Workflow name displayed on GitHub
+on:
+  workflow_dispatch: # Trigger manually
+  schedule:
+    - cron: "30 20 * * *" # UTC is 2-3 hours behind Europe/Helsinki, my timezone
+permissions:
+  contents: write
+jobs:
+  new-daily-release:
+    runs-on: ubuntu-latest
+    outputs:
+      created: ${{ steps.daily-version.outputs.created }}
+      version: ${{ steps.daily-version.outputs.version }}
+    steps:
+      - uses: actions/checkout@v3 # Checkout our working repository
+      - name: Create tag if necessary
+        uses: fregante/daily-version-action@v2
+        id: daily-version
+      - name: Create changelog text
+        if: steps.daily-version.outputs.created
+        id: changelog
+        uses: loopwerk/tag-changelog@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          config_file: .github/tag-changelog-config.js
+      - name: Create release
+        if: steps.daily-version.outputs.created
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.daily-version.outputs.version }}
+          release_name: Release ${{ steps.daily-version.outputs.version }}
+          body: ${{ steps.changelog.outputs.changes }}

.github/workflows/update-submodules.yml

@@ -0,0 +1,36 @@
+name: Update submodules
+on:
+  schedule: [{cron: 0 3 * * *}]
+  workflow_dispatch:
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+jobs:
+  update-submodules:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+          token: ${{secrets.GITHUB_TOKEN}}
+      - name: Config Git User
+        run: |
+          git config --global user.name "${{ github.actor }}"
+          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+      - name: Update submodules
+        run: |
+          if git commit -am"chore(git): Update submodules (automated)
+
+          $(git submodule --quiet foreach \
+            'tag="$(git describe --tags --abbrev=0 origin/HEAD)"
+            if [ "$(git describe --tags)" != "$tag" ]; then
+              git checkout --quiet "$tag"
+              echo "$name" "$tag"
+            fi')"
+          then
+            git show --raw
+            git push
+          fi

.gitignore

@@ -5,3 +5,12 @@ Brewfile.lock.json
 .idea
 .vscode
 config/fzf
+config/cheat/cheatsheets/pure-bash-bible/*
+config/cheat/cheatsheets/tldr/*
+config/git/credentials
+config/zsh/.zcompdump
+ssh/local.d/*
+!ssh/local.d/.gitkeep
+!.gitkeep
+.env
+

.gitmodules

@@ -1,16 +1,16 @@
 # vim: set expandtab:
 [submodule "dotbot"]
-	path = dotbot
+	path = tools/dotbot
 	url = https://github.com/anishathalye/dotbot.git
 	ignore = dirty
 
 [submodule "dotbot-brew"]
-	path = dotbot-brew
+	path = tools/dotbot-brew
 	url = https://github.com/wren/dotbot-brew.git
 	ignore = dirty
 
 [submodule "dotbot-include"]
-	path = dotbot-include
+	path = tools/dotbot-include
 	url = https://gitlab.com/gnfzdz/dotbot-include.git
 	ignore = dirty
 
@@ -18,8 +18,7 @@
 	path = config/nvim
 	url = https://github.com/AstroNvim/AstroNvim.git
 	ignore = dirty
-	branch = main
-	update = checkout
+	shallow = true
 
 [submodule "cheat-community"]
 	path = config/cheat/cheatsheets/community
@@ -29,3 +28,43 @@
 [submodule "tmux/tpm"]
 	path = config/tmux/plugins/tpm
 	url = https://github.com/tmux-plugins/tpm.git
+	ignore = dirty
+[submodule "tmux/catppuccin"]
+	path = config/tmux/plugins/catppuccin
+	url = https://github.com/catppuccin/tmux.git
+[submodule "tmux/tmux-1password"]
+	path = config/tmux/plugins/tmux-1password
+	url = https://github.com/yardnsm/tmux-1password.git
+[submodule "tmux/tmux-autoreload"]
+	path = config/tmux/plugins/tmux-autoreload
+	url = https://github.com/b0o/tmux-autoreload.git
+[submodule "tmux/tmux-continuum"]
+	path = config/tmux/plugins/tmux-continuum
+	url = https://github.com/tmux-plugins/tmux-continuum
+[submodule "tmux/tmux-fzf"]
+	path = config/tmux/plugins/tmux-fzf
+	url = https://github.com/sainnhe/tmux-fzf.git
+[submodule "tmux/tmux-menus"]
+	path = config/tmux/plugins/tmux-menus
+	url = https://github.com/jaclu/tmux-menus.git
+[submodule "tmux/tmux-notify"]
+	path = config/tmux/plugins/tmux-notify
+	url = https://github.com/ChanderG/tmux-notify.git
+[submodule "tmux/tmux-resurrect"]
+	path = config/tmux/plugins/tmux-resurrect
+	url = https://github.com/tmux-plugins/tmux-resurrect
+[submodule "tmux/tmux-sensible"]
+	path = config/tmux/plugins/tmux-sensible
+	url = https://github.com/tmux-plugins/tmux-sensible.git
+[submodule "tmux/tmux-sessionist"]
+	path = config/tmux/plugins/tmux-sessionist
+	url = https://github.com/tmux-plugins/tmux-sessionist.git
+[submodule "tmux/tmux-suspend"]
+	path = config/tmux/plugins/tmux-suspend
+	url = https://github.com/MunifTanjim/tmux-suspend.git
+[submodule "tmux/tmux-yank"]
+	path = config/tmux/plugins/tmux-yank
+	url = https://github.com/tmux-plugins/tmux-yank.git
+[submodule "tmux/vim-tmux-navigator"]
+	path = config/tmux/plugins/vim-tmux-navigator
+	url = https://github.com/christoomey/vim-tmux-navigator.git

.ignore

@@ -0,0 +1,5 @@
+config/cheat/cheatsheets/community/**
+config/tmux/**
+config/nvim/**
+tools/**
+

.markdownlint.json

@@ -0,0 +1,19 @@
+{
+  "extends": "markdownlint/style/prettier",
+  "code-block-style": {
+    "style": "fenced"
+  },
+  "code-fence-style": {
+    "style": "backtick"
+  },
+  "heading-style": {
+    "style": "atx"
+  },
+  "no-duplicate-heading": {
+    "siblings_only": true
+  },
+  "required-headings": false,
+  "ul-style": {
+    "style": "dash"
+  }
+}

.python-version

@@ -1 +1 @@
-3
+3.11

.yamlfmt

@@ -18,7 +18,7 @@ include:
   - ./**/*.{yml,yaml}
 
 exclude:
-  - ./dotbot/**
-  - ./dotbot-*/**
+  - ./tools/dotbot/**
+  - ./tools/dotbot-*/**
   - ./config/astronvim/**
   - ./config/nvim/**

README.md

@@ -1,94 +0,0 @@
-# .dotfiles
-
-Welcome to [ivuorinen](https://github.com/ivuorinen)'s .dotfiles repository.
-It's a hodgepodge of scripts and configurations, tests and mistakes I'm not
-aware of yet. As I find more interesting tools, configs and other stuff,
-this repository will live accordingly.
-
-Please for the love of everything good do not use these 1:1 as your own dotfiles,
-fork or download the repo as a zip and go from there with your own configs.
-
-## Setup
-
-### First time setup
-
-1. Clone this repository to `$HOME/.dotfiles`
-2. `./install`
-3. ???
-4. Profit
-
-## Interesting files and locations
-
-### Interesting folders
-
-| Path                | Description                                  |
-| ------------------- | -------------------------------------------- |
-| `.github`           | GitHub Repository configuration files.       |
-| `hosts/{hostname}/` | Configs that should apply to that host only. |
-| `local/bin`         | Helper scripts that I've collected or wrote. |
-| `scripts`           | Setup scripts.                               |
-
-### dotfile folders
-
-| Repo      | Destination | Description                                 |
-| --------- | ----------- | ------------------------------------------- |
-| `base/`   | `.*`        | `$HOME` level files.                        |
-| `config/` | `.config/`  | Configurations for applications.            |
-| `local/`  | `.local/`   | XDG Base folder: `bin`, `share` and `state` |
-| `ssh/`    | `.ssh/`     | SSH Configurations.                         |
-
-### dfm - the dotfiles manager
-
-`.local/bin/dfm` is a shell script that has some tools that help with dotfiles management.
-
-## Configuration
-
-The folder structure follows [XDG Base Directory Specification][xdg] where possible.
-
-### XDG Variables
-
-| Var                | Default              |
-| ------------------ | -------------------- |
-| `$XDG_DATA_HOME`   | `$HOME/.local/share` |
-| `$XDG_STATE_HOME`  | `$HOME/.local/state` |
-| `$XDG_CONFIG_HOME` | `$HOME/.config`      |
-| `$XDG_BIN_HOME`    | `$HOME/.local/bin`   |
-
-- `$XDG_BIN_HOME` is a custom `env` for `.local/bin` folder.
-- `$XDG_DATA_HOME` defines the base directory relative to which user-specific data
-  files should be stored. If `$XDG_DATA_HOME` is either not set or empty,
-  a default equal to `$HOME/.local/share` should be used.
-- `$XDG_CONFIG_HOME` defines the base directory relative to which user-specific configuration
-  files should be stored. If `$XDG_CONFIG_HOME` is either not set or empty,
-  a default equal to `$HOME/.config` should be used.
-- `$XDG_STATE_HOME` defines the base directory relative
-  to which user-specific state files should be stored.
-  If `$XDG_STATE_HOME` is either not set or empty, a default
-  equal to `$HOME/.local/state` should be used.
-- The `$XDG_STATE_HOME` contains state data that should persist
-  between (application) restarts,
-  but that is not important or portable enough to the user that
-  it should be stored in `$XDG_DATA_HOME`.
-  It may contain:
-  - actions history (logs, history, recently used files, …)
-  - current state of the application that can be reused
-    on a restart (view, layout, open files, undo history, …)
-- User-specific executable files may be stored in `$HOME/.local/bin`.
-  Distributions should ensure this directory shows up in the UNIX `$PATH`
-  environment variable, at an appropriate place.
-- `$XDG_DATA_DIRS` defines the preference-ordered set of base directories
-  to search for data files in addition to the `$XDG_DATA_HOME` base directory.
-  The directories in `$XDG_DATA_DIRS` should be seperated with a colon ':'.
-
-[xdg]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-
-## Interesting links
-
-### Interesting dotfiles repos
-
-- [dotfiles.github.io/inspiration/](https://dotfiles.github.io/inspiration)
-- [frdmn/dotfiles](https://github.com/github.com/frdmn/dotfiles) - Ansible-based
-  dotfile setup for macOS
-- [mvdan/dotfiles](https://github.com/mvdan/dotfiles) - Here be dragons
-- [vsouza/dotfiles](https://github.com/vsouza/dotfiles) - 🏡 My dotfiles
-- [freekmurze/dotfiles](https://github.com/freekmurze/dotfiles) - My personal dotfiles

add-submodules.sh

@@ -1,7 +1,37 @@
 #!/usr/bin/env bash
 
-git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git dotbot-brew
-git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git dotbot-include
+git submodule add --name dotbot -f https://github.com/anishathalye/dotbot.git tools/dotbot
+git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew
+git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include
 git submodule add --name cheat-community -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
-git submodule add --name tmux/tpm -f https://github.com/tmux-plugins/tpm.git config/tmux/plugins/tpm
+
+# tmux plugin manager and plugins
+git submodule add --name tmux/tpm \
+  -f https://github.com/tmux-plugins/tpm.git config/tmux/plugins/tpm
+git submodule add --name tmux/catppuccin \
+  -f https://github.com/catppuccin/tmux.git config/tmux/plugins/catppuccin
+git submodule add --name tmux/tmux-1password \
+  -f https://github.com/yardnsm/tmux-1password.git config/tmux/plugins/tmux-1password
+git submodule add --name tmux/tmux-autoreload \
+  -f https://github.com/b0o/tmux-autoreload.git config/tmux/plugins/tmux-autoreload
+git submodule add --name tmux/tmux-continuum \
+  -f https://github.com/tmux-plugins/tmux-continuum config/tmux/plugins/tmux-continuum
+git submodule add --name tmux/tmux-fzf \
+  -f https://github.com/sainnhe/tmux-fzf.git config/tmux/plugins/tmux-fzf
+git submodule add --name tmux/tmux-menus \
+  -f https://github.com/jaclu/tmux-menus.git config/tmux/plugins/tmux-menus
+git submodule add --name tmux/tmux-notify \
+  -f https://github.com/ChanderG/tmux-notify.git config/tmux/plugins/tmux-notify
+git submodule add --name tmux/tmux-resurrect \
+  -f https://github.com/tmux-plugins/tmux-resurrect config/tmux/plugins/tmux-resurrect
+git submodule add --name tmux/tmux-sensible \
+  -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible
+git submodule add --name tmux/tmux-sessionist \
+  -f https://github.com/tmux-plugins/tmux-sessionist.git config/tmux/plugins/tmux-sessionist
+git submodule add --name tmux/tmux-suspend \
+  -f https://github.com/MunifTanjim/tmux-suspend.git config/tmux/plugins/tmux-suspend
+git submodule add --name tmux/tmux-yank \
+  -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank
+git submodule add --name tmux/vim-tmux-navigator \
+  -f https://github.com/christoomey/vim-tmux-navigator.git config/tmux/plugins/vim-tmux-navigator
 

base/bashrc

@@ -1,6 +1,10 @@
 # this is my bashrc config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] \
+  && builtin source "$HOME/.fig/shell/bashrc.pre.bash"
+
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
 
@@ -9,10 +13,10 @@ function x-load-configs()
 {
     # Load the shell dotfiles, and then some:
     for file in $DOTFILES/config/{exports,alias,functions}; do
-        [ -r "$file" ] && [ -f "$file" ] && source "$file"
-        [ -r "$file-secret" ] && [ -f "$file-secret" ] && source "$file-secret"
-        [ -r "$file-$HOSTNAME" ] && [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-        [ -r "$file-$HOSTNAME-secret" ] && [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
+        [ -r "$file" ] && source "$file"
+        [ -r "$file-secret" ] && source "$file-secret"
+        [ -r "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
+        [ -r "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
     done
 }
 x-load-configs
@@ -20,4 +24,9 @@ x-load-configs
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null;
 
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
+[ -f "${DOTFILES}/config/fzf/fzf.bash" ] \
+  && source "${DOTFILES}/config/fzf/fzf.bash"
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] \
+  && builtin source "$HOME/.fig/shell/bashrc.post.bash"

base/git_profiles

@@ -1,7 +0,0 @@
-[work]
-name  = Ismo Vuorinen
-email = ismo.vuorinen@vincit.fi
-
-[home]
-name  = Ismo Vuorinen
-email = ismo@vuorinen.net

base/gitprofile

@@ -0,0 +1,34 @@
+{
+  "profiles": {
+    "github": [
+      {
+        "key": "user.name",
+        "value": "Ismo Vuorinen"
+      },
+      {
+        "key": "user.email",
+        "value": "ivuorinen@users.noreply.github.com"
+      }
+    ],
+    "home": [
+      {
+        "key": "user.email",
+        "value": "ismo@ivuorinen.net"
+      },
+      {
+        "key": "user.name",
+        "value": "Ismo Vuorinen"
+      }
+    ],
+    "work": [
+      {
+        "key": "user.email",
+        "value": "ismo.vuorinen@vincit.fi"
+      },
+      {
+        "key": "user.name",
+        "value": "Ismo Vuorinen"
+      }
+    ]
+  }
+}

base/nbrc

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+###############################################################################
+# .nbrc
+#
+# Configuration file for `nb`, a command line note-taking, bookmarking,
+# and knowledge base application with encryption, search, Git-backed syncing,
+# and more in a single portable script.
+#
+# Edit this file manually or manage settings using the `nb settings`
+# subcommand. Configuration options are set as environment variables, eg:
+#   export NB_ENCRYPTION_TOOL=gpg
+#
+# https://github.com/xwmx/nb
+###############################################################################
+
+export NB_DIR="${NB_DIR:-$HOME/.local/state/nb}" # Set by `nb` • Mon May  8 15:25:12 EEST 2023
+
+export NB_COLOR_THEME="${NB_COLOR_THEME:-unicorn}" # Set by `nb` • Mon May  8 15:41:22 EEST 2023

base/zshrc

@@ -1,24 +1,49 @@
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-autoload -U colors zsh/terminfo
-colors
-setopt correct
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] \
+  && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
 # shellcheck source=shared.sh
 source "$DOTFILES/scripts/shared.sh"
 
+autoload -U colors zsh/terminfo
+colors
+setopt correct
+
+export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
+x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
+
+# Add completion scripts to zsh path
+FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
+autoload -Uz compinit
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+
+if type brew &>/dev/null
+then
+  FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
+  compinit
+fi
+
 # Run x-load-configs in your terminal to reload the files.
 function x-load-configs()
 {
   # Load the shell dotfiles, and then some:
   for file in $DOTFILES/config/{exports,alias,functions}; do
-    [ -f "$file" ] && source "$file"
-    [ -f "$file-secret" ] && source "$file-secret"
-    [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-    [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
+    [ -r "$file" ] && source "$file"
+    [ -r "$file-secret" ] && source "$file-secret"
+    [ -r "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
+    [ -r "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
   done
 }
 x-load-configs
@@ -40,7 +65,16 @@ have antigen && {
   antigen apply
 }
 
-# starship is present
-have starship && eval "$(starship init zsh)"
+[ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
+  && source "${DOTFILES}/config/fzf/fzf.zsh"
+
+export LESSHISTFILE="$XDG_CACHE_HOME"/less_history
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] \
+  && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+export P10K_LOCATION="$XDG_CONFIG_HOME/zsh/p10k.zsh"
+[[ ! -f $P10K_LOCATION ]] || source $P10K_LOCATION
 
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh

config/act/actrc

@@ -0,0 +1,4 @@
+-P ubuntu-latest=catthehacker/ubuntu:act-latest
+-P ubuntu-22.04=catthehacker/ubuntu:act-22.04
+-P ubuntu-20.04=catthehacker/ubuntu:act-20.04
+-P ubuntu-18.04=catthehacker/ubuntu:act-18.04

config/alias

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # shellcheck source="../scripts/shared.sh"
+# shellcheck disable=1091,2139
 source "$DOTFILES/scripts/shared.sh"
 
 # Get installed php versions from brew and setup aliases
@@ -54,6 +55,11 @@ if [[ $(uname) == 'Darwin' ]]; then
   alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
 fi
 
+# tmux: automatically attach or create session with name 'main'
+alias tmux='tmux new-session -A -s main'
+# tmux: attach or create new session
+alias ta='tmux attach || tmux'
+
 # watch with: differences, precise, beep and color
 alias watchx='watch -dpbc'
 # delete .DS_Store files
@@ -83,3 +89,6 @@ if [[ -f "$HOME/.aliases.local" ]]; then
   # shellcheck disable=SC1091
   source "$HOME/.aliases.local"
 fi
+
+alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
+alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"

config/astronvim/lua/user/.luacheckrc

@@ -0,0 +1,18 @@
+-- Global objects
+globals = {
+  "astronvim",
+  "astronvim_installation",
+  "vim",
+  "bit",
+}
+
+-- Rerun tests only if their modification time changed
+cache = true
+
+-- Don't report unused self arguments of methods
+self = false
+
+ignore = {
+  "631", -- max_line_length
+  "212/_.*", -- unused argument, for vars with "_" prefix
+}

config/astronvim/lua/user/.neoconf.json

@@ -0,0 +1,20 @@
+{
+  "neodev": {
+    "library": {
+      "enabled": true,
+      "plugins": true
+    }
+  },
+  "neoconf": {
+    "plugins": {
+      "lua_ls": {
+        "enabled": true
+      }
+    }
+  },
+  "lspconfig": {
+    "lua_ls": {
+      "Lua.format.enable": false
+    }
+  }
+}

config/astronvim/lua/user/init.lua

@@ -1,3 +1,4 @@
+-- luacheck: globals vim
 return {
   -- Configure AstroNvim updates
   updater = {
@@ -78,6 +79,32 @@ return {
   -- augroups/autocommands and custom filetypes also this just pure lua so
   -- anything that doesn't fit in the normal config locations above can go here
   polish = function()
+    local function yaml_ft(path, bufnr)
+      -- get content of buffer as string
+      local content = vim.filetype.getlines(bufnr)
+      if type(content) == "table" then content = table.concat(content, "\n") end
+
+      -- check if file is in roles, tasks, or handlers folder
+      local path_regex = vim.regex "(tasks\\|roles\\|handlers)/"
+      if path_regex and path_regex:match_str(path) then return "yaml.ansible" end
+      -- check for known ansible playbook text and if found, return yaml.ansible
+      local regex = vim.regex "hosts:\\|tasks:"
+      if regex and regex:match_str(content) then return "yaml.ansible" end
+
+      -- return yaml if nothing else
+      return "yaml"
+    end
+
+    vim.filetype.add {
+      extension = {
+        yml = yaml_ft,
+        yaml = yaml_ft,
+      },
+    }
+
+    require("notify").setup({
+      background_colour = "#000000",
+    })
     -- Set up custom filetypes
     -- vim.filetype.add {
     --   extension = {

config/astronvim/lua/user/mappings.lua

@@ -17,11 +17,33 @@ return {
       end,
       desc = "Pick to close",
     },
-    -- tables with the `name` key will be registered with which-key if it's installed
-    -- this is useful for naming menus
+    -- tables with the `name` key will be registered with which-key
+    -- if it's installed this is useful for naming menus
     ["<leader>b"] = { name = "Buffers" },
-    -- quick save
-    -- ["<C-s>"] = { ":w!<cr>", desc = "Save File" },  -- change description but the same command
+    -- quick save (change description)
+    ["<C-s>"] = { ":w!<cr>", desc = "Save File" },
+    ["<leader>P"] = {
+      ":Telescope projects<cr>",
+      desc = "Update Projects listing"
+    },
+    -- close_buffers
+    ['<leader>bch'] = {
+      "<CMD>lua require('close_buffers').delete({type = 'hidden'})<CR>",
+      desc = "Delete hidden buffers"
+    },
+    -- comment-box
+    ["<leader>bb"] = {
+      "<cmd>lua require('comment-box').lbox()<cr>",
+      desc = "Left aligned fixed size box with left aligned text"
+    },
+    ["<leader>bc"] = {
+      "<cmd>lua require('comment-box').ccbox()<cr>",
+      desc = "Centered adapted box with centered text"
+    },
+    ["<leader>bl"] = {
+      "<cmd>lua require('comment-box').cline()<cr>",
+      desc = "Centered line"
+    },
   },
   t = {
     -- setting a mapping to false will disable it

config/astronvim/lua/user/options.lua

@@ -25,6 +25,8 @@ return {
     icons_enabled = true,
     -- disable notifications when toggling UI elements
     ui_notifications_enabled = true,
+    -- enable experimental resession.nvim session management (will be default in AstroNvim v4)
+    resession_enabled = false,
   },
 }
 -- If you need more control, you can use the function()...end notation

config/astronvim/lua/user/plugins/community.lua

@@ -1,12 +1,14 @@
-return {                      -- Add the community repository of plugin specifications
-  "AstroNvim/astrocommunity", -- example of imporing a plugin, comment out to use it or add your own
+return {
+  -- Add the community repository of plugin specifications
+  "AstroNvim/astrocommunity",
+  -- example of imporing a plugin, comment out to use it or add your own.
   -- available plugins can be found at
   -- https://github.com/AstroNvim/astrocommunity
   {
     import = "astrocommunity.colorscheme.catppuccin",
     opts = {
       flavour = "mocha",
-      transparent_background = false,
+      transparent_background = true,
       dim_inactive = {
         enabled = true,
         shade = "dark",
@@ -15,26 +17,47 @@ return {                      -- Add the community repository of plugin specific
     }
   },
   -- { import = "astrocommunity.completion.copilot-lua-cmp" },
+  { import = "astrocommunity.completion.tabnine-nvim" },
   { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" },
   {
     "m4xshen/smartcolumn.nvim",
     opts = {
       colorcolumn = { "80", "100", "120" },
-      disabled_filetypes = { "help", "text", "markdown" },
+      disabled_filetypes = { "help", "text", "markdown", "json" },
     },
   },
-  { import = "astrocommunity.code-runner.overseer-nvim" },
-  --- { import = "astrocommunity.diagnostics.lsp_lines-nvim" },
   { import = "astrocommunity.diagnostics.trouble-nvim" },
+  {
+    "folke/trouble.nvim",
+    opts = {
+      auto_open = true,
+      position = "bottom"
+    }
+  },
+  { import = "astrocommunity.debugging.telescope-dap-nvim" },
+  { import = "astrocommunity.editing-support.comment-box-nvim" },
   { import = "astrocommunity.editing-support.refactoring-nvim" },
   { import = "astrocommunity.editing-support.neogen" },
   { import = "astrocommunity.editing-support.nvim-regexplainer" },
   { import = "astrocommunity.editing-support.todo-comments-nvim" },
   { import = "astrocommunity.indent.mini-indentscope" },
-  { import = "astrocommunity.markdown-and-latex.glow-nvim" },
+  { import = "astrocommunity.lsp.lsp-signature-nvim" },
+  { import = "astrocommunity.motion.harpoon" },
+  { import = "astrocommunity.pack.ansible" },
+  { import = "astrocommunity.pack.bash" },
+  { import = "astrocommunity.pack.docker" },
+  { import = "astrocommunity.pack.go" },
+  { import = "astrocommunity.pack.html-css" },
+  { import = "astrocommunity.pack.json" },
+  { import = "astrocommunity.pack.markdown" },
   { import = "astrocommunity.pack.php" },
   { import = "astrocommunity.pack.typescript" },
-  { import = "astrocommunity.project.neoconf-nvim" },
+  { import = "astrocommunity.pack.vue" },
+  { import = "astrocommunity.pack.yaml" },
+  { import = "astrocommunity.project.nvim-spectre" },
+  { import = "astrocommunity.project.project-nvim" },
   { import = "astrocommunity.test.neotest" },
   { import = "astrocommunity.utility.neodim" },
+  { import = "astrocommunity.utility.transparent-nvim" },
 }
+

config/astronvim/lua/user/plugins/core.lua

@@ -5,20 +5,18 @@ return {
     opts = function(_, opts)
       -- customize the dashboard header
       opts.section.header.val = {
-        "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░",
-        "░░░░░░░░░░▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄░░░░░░░░░",
-        "░░░░░░░░▄▀░░░░░░░░░░░░▄░░░░░░░▀▄░░░░░░░",
-        "░░░░░░░░█░░▄░░░░▄░░░░░░░░░░░░░░█░░░░░░░",
-        "░░░░░░░░█░░░░░░░░░░░░▄█▄▄░░▄░░░█░▄▄▄░░░",
-        "░▄▄▄▄▄░░█░░░░░░▀░░░░▀█░░▀▄░░░░░█▀▀░██░░",
-        "░██▄▀██▄█░░░▄░░░░░░░██░░░░▀▀▀▀▀░░░░██░░",
-        "░░▀██▄▀██░░░░░░░░▀░██▀░░░░░░░░░░░░░▀██░",
-        "░░░░▀████░▀░░░░▄░░░██░░░▄█░░░░▄░▄█░░██░",
-        "░░░░░░░▀█░░░░▄░░░░░██░░░░▄░░░▄░░▄░░░██░",
-        "░░░░░░░▄█▄░░░░░░░░░░░▀▄░░▀▀▀▀▀▀▀▀░░▄▀░░",
-        "░░░░░░█▀▀█████████▀▀▀▀████████████▀░░░░",
-        "░░░░░░████▀░░███▀░░░░░░▀███░░▀██▀░░░░░░",
-        "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░"
+        "         ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄        ",
+        "       ▄▀░░░░░░░░░░░░▄░░░░░░░▀▄      ",
+        "       █░░▄░░░░▄░░░░░░░░░░░░░░█      ",
+        "       █░░░░░░░░░░░░▄█▄▄░░▄░░░█ ▄▄▄  ",
+        "▄▄▄▄▄  █░░░░░░▀░░░░▀█░░▀▄░░░░░█▀▀░██ ",
+        "██▄▀██▄█░░░▄░░░░░░░██░░░░▀▀▀▀▀░░░░██ ",
+        " ▀██▄▀██░░░░░░░░▀░██▀░░░░░░░░░░░░░▀██",
+        "   ▀████░▀░░░░▄░░░██░░░▄█░░░░▄░▄█░░██",
+        "      ▀█░░░░▄░░░░░██░░░░▄░░░▄░░▄░░░██",
+        "      ▄█▄░░░░░░░░░░░▀▄░░▀▀▀▀▀▀▀▀░░▄▀ ",
+        "     █▀▀█████████▀▀▀▀████████████▀   ",
+        "     ████▀  ███▀      ▀███  ▀██▀     ",
       }
       return opts
     end,
@@ -47,11 +45,15 @@ return {
         visible = false,
         show_hidden_count = true,
         hide_dotfiles = false,
-        hide_gitignored = true,
+        hide_gitignored = false,
         hide_by_name = {
+          '.idea',
+          '.DS_Store'
         },
         never_show = {
           '.git',
+          '.idea',
+          '.mypy_cache',
           '.DS_Store',
           'thumbs.db'
         },
@@ -99,9 +101,12 @@ return {
       require "plugins.configs.which-key" (plugin, opts)
       -- Add bindings which show up as group name
       local wk = require "which-key"
-      wk.register({
-        b = { name = "Buffer" },
-      }, { mode = "n", prefix = "<leader>" })
+      wk.register(
+        {
+          b = { name = "Buffer" },
+        },
+        { mode = "n", prefix = "<leader>" }
+      )
     end,
   },
 }

config/astronvim/lua/user/plugins/mason.lua

@@ -1,50 +1,44 @@
 -- customize mason plugins
-return { -- use mason-lspconfig to configure LSP installations
+return {
+  -- use mason-lspconfig to configure LSP installations
   {
     "williamboman/mason-lspconfig.nvim",
     -- overrides `require("mason-lspconfig").setup(...)`
-    opts = {
-      ensure_installed = {
-        "ansiblels",
-        "bashls",
-        "clangd",
-        "codeqlls",
-        "cssls",
-        "diagnosticls",
-        "docker_compose_language_service",
-        "dockerls",
-        "emmet_ls",
-        "eslint",
-        "graphql",
-        "html",
-        "intelephense",
-        "jsonls",
-        "marksman",
-        "psalm",
-        "stylelint_lsp",
-        "sqlls",
-        "tailwindcss",
-        "tsserver",
-        "vuels",
-        "yamlls",
-      },
-    },
-  }, -- use mason-null-ls to configure Formatters/Linter installation for null-ls sources
+    opts = function(_, opts)
+      -- add more things to the ensure_installed table protecting against community packs modifying it
+      opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, {
+        -- "lua_ls",
+      })
+    end,
+  },
+  -- use mason-null-ls to configure Formatters/Linter
+  -- installation for null-ls sources
   {
     "jay-babu/mason-null-ls.nvim",
     -- overrides `require("mason-null-ls").setup(...)`
-    opts = {
-      automatic_setup = true,
-      automatic_installation = true,
-    },
+    opts = function(_, opts)
+      -- add more things to the ensure_installed table protecting against community packs modifying it
+      opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, {
+        -- "prettier",
+        -- "stylua",
+      })
+      opts.automatic_setup = true
+      opts.automatic_installation = true
+    end,
   },
   {
     "jay-babu/mason-nvim-dap.nvim",
     -- overrides `require("mason-nvim-dap").setup(...)`
-    opts = {
-      automatic_installation = true,
-      automatic_setup = true,
-      ensure_installed = { "python", "php", "js", "bash" },
-    },
+    opts = function(_, opts)
+      -- add more things to the ensure_installed table protecting against community packs modifying it
+      opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, {
+        "python",
+        "php",
+        "js",
+        "bash"
+      })
+      opts.automatic_installation = true
+      opts.automatic_setup = true
+    end,
   },
 }

config/astronvim/lua/user/plugins/null-ls.lua

@@ -12,7 +12,6 @@ return {
       null_ls.builtins.code_actions.eslint,
       null_ls.builtins.code_actions.refactoring,
       null_ls.builtins.code_actions.shellcheck,
-      null_ls.builtins.code_actions.xo,
       null_ls.builtins.diagnostics.actionlint,
       null_ls.builtins.diagnostics.alex,
       null_ls.builtins.diagnostics.ansiblelint,
@@ -21,47 +20,25 @@ return {
       null_ls.builtins.diagnostics.eslint,
       null_ls.builtins.diagnostics.jsonlint,
       null_ls.builtins.diagnostics.luacheck,
-      null_ls.builtins.diagnostics.markdownlint,
-      null_ls.builtins.diagnostics.mypy,
       null_ls.builtins.diagnostics.php,
       null_ls.builtins.diagnostics.phpcs,
       null_ls.builtins.diagnostics.phpstan,
       null_ls.builtins.diagnostics.psalm,
-      null_ls.builtins.diagnostics.pydocstyle,
       null_ls.builtins.diagnostics.semgrep,
       null_ls.builtins.diagnostics.shellcheck,
-      null_ls.builtins.diagnostics.standardjs,
       null_ls.builtins.diagnostics.stylelint,
       null_ls.builtins.diagnostics.tfsec,
       null_ls.builtins.diagnostics.trail_space,
       null_ls.builtins.diagnostics.tsc,
-      null_ls.builtins.diagnostics.vacuum,
-      null_ls.builtins.diagnostics.vint,
-      null_ls.builtins.diagnostics.vulture,
-      null_ls.builtins.diagnostics.xo,
-      null_ls.builtins.diagnostics.yamllint,
       null_ls.builtins.diagnostics.zsh,
-      null_ls.builtins.formatting.black,
-      null_ls.builtins.formatting.blade_formatter,
-      null_ls.builtins.formatting.cbfmt,
       null_ls.builtins.formatting.clang_format,
-      null_ls.builtins.formatting.eslint,
       null_ls.builtins.formatting.fixjson,
       null_ls.builtins.formatting.isort,
       null_ls.builtins.formatting.jq,
-      null_ls.builtins.formatting.markdownlint,
-      null_ls.builtins.formatting.nginx_beautifier,
-      null_ls.builtins.formatting.pg_format,
       null_ls.builtins.formatting.phpcsfixer,
-      null_ls.builtins.formatting.prettier_eslint,
-      null_ls.builtins.formatting.prettier,
-      null_ls.builtins.formatting.puppet_lint,
-      null_ls.builtins.formatting.rome,
-      null_ls.builtins.formatting.rustfmt,
       null_ls.builtins.formatting.shfmt.with {
         args = { "-i", "1", "-bn", "-ci", "-sr", "-kb", "-fn" },
       },
-      null_ls.builtins.formatting.stylelint,
     }
     return config -- return final config table
   end,

config/astronvim/lua/user/plugins/treesitter.lua

@@ -1,7 +1,7 @@
 return {
   "nvim-treesitter/nvim-treesitter",
-  opts = {
-    ensure_installed = {
+  opts = function(_, opts)
+    opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, {
       "bash",
       "c",
       "cmake",
@@ -28,6 +28,6 @@ return {
       "vim",
       "vue",
       "yaml",
-    },
-  },
+    })
+  end,
 }

config/astronvim/lua/user/plugins/user.lua

@@ -1,3 +1,4 @@
+-- luacheck: globals vim
 return {
   -- You can also add new plugins here as well:
   -- Add plugins, the lazy syntax
@@ -12,4 +13,95 @@ return {
     lazy = false,
     enabled = true,
   },
+  {
+    "nvim-treesitter/nvim-treesitter-context",
+    lazy = false,
+    enabled = true,
+    opts = {
+      enable = true,
+      mode = "cursor", -- cursor, or topline
+    },
+  },
+  { "kazhala/close-buffers.nvim" },
+  {
+    "folke/edgy.nvim",
+    event = "VeryLazy",
+    dependencies = {
+      {
+        'nvim-neo-tree/neo-tree.nvim',
+        config = function()
+          require('neo-tree').setup({
+            open_files_do_not_replace_types = {
+              'terminal', 'Trouble', 'qf', 'edgy'
+            },
+          })
+        end,
+      },
+      {
+        'simrat39/symbols-outline.nvim',
+        config = function()
+          require('symbols-outline').setup()
+        end,
+      },
+    },
+    init = function()
+      vim.opt.laststatus = 3
+      vim.opt.splitkeep = "screen"
+    end,
+    opts = {
+      bottom = {
+        -- toggleterm / lazyterm at the bottom with
+        -- a height of 40% of the screen
+        {
+          ft = "toggleterm",
+          size = { height = 0.4 },
+          -- exclude floating windows
+          filter = function(_, win)
+            return vim.api.nvim_win_get_config(win).relative == ""
+          end,
+        },
+        {
+          ft = "lazyterm",
+          title = "LazyTerm",
+          size = { height = 0.4 },
+          filter = function(buf)
+            return not vim.b[buf].lazyterm_cmd
+          end,
+        },
+        "Trouble",
+        { ft = "qf", title = "QuickFix" },
+        {
+          ft = "help",
+          size = { height = 20 },
+          -- only show help buffers
+          filter = function(buf)
+            return vim.bo[buf].buftype == "help"
+          end,
+        },
+        { ft = "spectre_panel", size = { height = 0.4 } },
+      },
+      left = {
+        -- Neo-tree filesystem always takes half the screen height
+        {
+          title = "Neo-Tree",
+          ft = "neo-tree",
+          filter = function(buf)
+            return vim.b[buf].neo_tree_source == "filesystem"
+          end,
+          size = { height = 0.5 },
+        },
+        {
+          title = "Neo-Tree Buffers",
+          ft = "neo-tree",
+          filter = function(buf)
+            return vim.b[buf].neo_tree_source == "buffers"
+          end,
+          pinned = true,
+          open = "Neotree position=top buffers",
+        },
+        -- any other neo-tree windows
+        "neo-tree",
+      },
+    },
+  },
 }

config/cheat/cheatsheets/personal/git-alias

@@ -0,0 +1,43 @@
+---
+tags: [ vcs, alias ]
+---
+
+# git branchbydate
+
+List repository branches by date when last updated and extra information.
+
+# git branchcolor
+
+List repository branches sorted by when they were last updated.
+
+# git llog
+
+Show log with fuller information.
+
+# git logs
+
+Git logs with detailed information and git tree.
+
+# git nah
+
+Reset all changes.
+
+# git reset-origin
+
+Reset to origin.
+
+# git reset-upstream
+
+Hard reset to upstream master.
+
+# git rl
+
+Colored reflog.
+
+# git tagdate
+
+List tags in date order and with graph.
+
+# git undo-commit
+
+Undoes last commit.

config/cheat/conf.yml

@@ -1,24 +1,19 @@
----
 # The editor to use with 'cheat -e <sheet>'. Defaults to $EDITOR or $VISUAL.
-editor: $EDITOR
+# editor: $EDITOR
 
 # Should 'cheat' always colorize output?
 colorize: true
-
 # Which 'chroma' colorscheme should be applied to the output?
 # Options are available here:
 #   https://github.com/alecthomas/chroma/tree/master/styles
-style: catppuccin-mocha
-
+style: "catppuccin"
 # Which 'chroma' "formatter" should be applied?
 # One of: "terminal", "terminal256", "terminal16m"
 formatter: terminal256
-
 # Through which pager should output be piped?
 # 'less -FRX' is recommended on Unix systems
 # 'more' is recommended on Windows
 pager: less -FRX
-
 # Cheatpaths are paths at which cheatsheets are available on your local
 # filesystem.
 #
@@ -68,9 +63,17 @@ cheatpaths:
   # If you have personalized cheatsheets, list them last. They will take
   # precedence over the more global cheatsheets.
   - name: personal
-    path: ~/.config/cheat/cheatsheets/personal
+    path: ~/.dotfiles/config/cheat/cheatsheets/personal
     tags: [personal]
     readonly: false
+  - name: pure-bash-bible
+    path: ~/.dotfiles/config/cheat/cheatsheets/pure-bash-bible
+    tags: [pure-bash-bible]
+    readonly: true
+  - name: tldr
+    path: ~/.dotfiles/config/cheat/cheatsheets/tldr
+    tags: [tldr]
+    readonly: true
 
 # While it requires no configuration here, it's also worth noting that
 # cheat will automatically append directories named '.cheat' within the

config/exports

@@ -17,24 +17,20 @@ export XDG_BIN_HOME="$HOME/.local/bin"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_RUNTIME_DIR="$HOME/.local/run"
 
-# Homebrew configuration
-export HOMEBREW="/opt/homebrew"
-export HOMEBREW_BIN="$HOMEBREW/bin"
-export HOMEBREW_SBIN="$HOMEBREW/sbin"
-export HOMEBREW_PKG="$HOMEBREW/opt"
-export HOMEBREW_NO_ENV_HINTS=1
+eval "$(brew shellenv)"
+
+export HOMEBREW_PREFIX="$XDG_STATE_HOME/homebrew"
+
+export HOMEBREW_BIN="$HOMEBREW_PREFIX/bin"
+export HOMEBREW_PKG="$HOMEBREW_PREFIX/opt"
+export HOMEBREW_SBIN="$HOMEBREW_PREFIX/sbin"
 
 path_append "/usr/local/bin"
-path_append "$HOMEBREW_SBIN"
-path_append "$HOMEBREW_BIN"
-path_append "$XDG_BIN_HOME"
+path_prepend "$XDG_BIN_HOME"
 
 # brew, https://brew.sh
 have brew && {
-  path_append "$(brew --prefix python)/bin"
-  path_append "$(brew --prefix coreutils)/libexec/gnubin"
-  path_append "$(brew --prefix ruby)/bin"
-  path_append "$(gem environment gemdir)/bin"
+  have_brew python && path_append "$(brew --prefix python)/bin"
 }
 
 source "$DOTFILES/config/exports-shell"

config/exports-apps

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # shellcheck enable=external-sources
-# shellcheck disable=1091
+# shellcheck disable=1091,2139
 # vim: filetype=zsh
 source "$DOTFILES/scripts/shared.sh"
 
@@ -13,34 +13,34 @@ export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
 
 # Ansible configuration
 # https://docs.ansible.com/ansible/latest/reference_appendices/config.html
+export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible"
+export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible.cfg"
+export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy_cache"
 have ansible && {
-  export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible"
-  export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible.cfg"
-  export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy_cache"
   x-dc "$ANSIBLE_HOME"
   x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
 }
 
+export ANDROID_HOME="$XDG_DATA_HOME/android"
+
 # composer, https://getcomposer.org/
+export COMPOSER_HOME="$XDG_STATE_HOME/composer"
+export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
 have composer && {
-  export COMPOSER_HOME="$XDG_STATE_HOME/composer"
-  export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
   export PATH="$COMPOSER_BIN:$PATH"
 }
 
 # docker, https://docs.docker.com/engine/reference/commandline/cli/
+export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
 have docker && {
-  export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
   x-dc "$DOCKER_CONFIG"
   # Docker: Disable snyk ad
   export DOCKER_SCAN_SUGGEST=false
 }
 
 # ffmpeg
-have ffmpeg && {
-  export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
-  x-dc "$FFMPEG_DATADIR"
-}
+export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
+have ffmpeg && x-dc "$FFMPEG_DATADIR"
 
 # gcloud
 have gcloud && {
@@ -49,20 +49,12 @@ have gcloud && {
   [[ -f "$GCLOUD_LOC/completion.zsh.inc" ]] && builtin source "$GCLOUD_LOC/completion.zsh.inc"
 }
 
-# gem, rubygems
-have gem && {
-  export GEM_HOME="$XDG_STATE_HOME/gem"
-  export GEM_PATH="$XDG_STATE_HOME/gem"
-  export PATH="$GEM_HOME/bin:$PATH"
-  path_append "$GEM_PATH/bin"
-}
+# GnuPG
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 
-# If we have go packages, include them to the PATH
-have go && {
-  export GOPATH="$XDG_DATA_HOME/go"
-  export GOBIN="$XDG_BIN_HOME"
-  x-dc "$GOPATH"
-}
+# Go
+export GOPATH="$XDG_DATA_HOME/go"
+export GOBIN="$XDG_BIN_HOME"
 
 # irssi
 have irssi && {
@@ -72,6 +64,10 @@ have irssi && {
   x-dc "$IRSSI_CONFIG_HOME"
 }
 
+# nb, https://xwmx.github.io/nb/
+export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
+export NB_DIR="$XDG_STATE_HOME/nb"
+
 # nvm, the node version manager
 export NVM_LAZY_LOAD=true
 export NVM_COMPLETION=true
@@ -80,23 +76,56 @@ export NVM_DIR="$XDG_CONFIG_HOME/nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"                   # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
 
+# Add npm packages to path
+have node && {
+  NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
+  path_append "$NVM_NODE_BIN_DIR"
+}
+
 # op (1Password cli) is present
+export OP_CACHE="$XDG_STATE_HOME/1password"
 have op && {
-  export OP_CACHE="$XDG_STATE_HOME/1password"
-  x-dc "$OP_CACHE"
   eval "$(op completion zsh)"
   compdef _op op
 }
 
+# Python
+#
 # pyenv, python environments
+export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
+export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
 have pyenv && {
-  export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
-  x-dc "$PYENV_ROOT"
+  path_append "$(pyenv root)/shims"
   path_append "$PYENV_ROOT/bin"
-
   eval "$(pyenv init -)"
 }
 
+# Ruby
+#
+# including: bundler, rbenv
+export GEM_HOME="${XDG_DATA_HOME}"/gem
+export GEM_SPEC_CACHE="${XDG_CACHE_HOME}"/gem
+export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle
+export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
+export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
+export RBENV_ROOT="$XDG_STATE_HOME/rbenv"
+x-dc "$RBENV_ROOT"
+have gem && path_append "$(gem environment gemdir)/bin"
+have rbenv && eval "$(rbenv init - zsh)"
+
+# Rust / cargo
+export CARGO_HOME="$XDG_STATE_HOME/cargo"
+path_append "$CARGO_HOME/bin"
+
+# screen
+export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
+
+# sonarlint
+export SONARLINT_USER_HOME="$XDG_DATA_HOME/sonarlint"
+
+# tmux
+export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
+
 # wakatime, https://github.com/wakatime/wakatime-cli
 export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
 x-dc "$WAKATIME_HOME"
@@ -106,6 +135,6 @@ export _Z_DATA="$XDG_STATE_HOME/z"
 [[ -f "$XDG_BIN_HOME/z/z.sh" ]] && source "$XDG_BIN_HOME/z/z.sh"
 
 # Misc
-export ANDROID_HOME="$XDG_DATA_HOME/android"
-export GNUPGHOME="$XDG_DATA_HOME/gnupg"
-export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
+export BAT_THEME="ansi"
+export CHEAT_USE_FZF=true
+export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history

config/exports-shell

@@ -4,7 +4,7 @@
 # vim: filetype=zsh
 source "$DOTFILES/scripts/shared.sh"
 
-export LC_ALL=fi_FI.utf8
+export LC_ALL=fi_FI.UTF-8
 
 # Bash completion file location
 export BASH_COMPLETION_USER_FILE="${XDG_CONFIG_HOME}/bash-completion/bash_completion"

config/functions

@@ -31,10 +31,10 @@ digga()
   dig +nocmd "$1" any +multiline +noall +answer
 }
 
-# Rector project to php version 8.0 by default.
+# Rector project to php version 8.2 by default.
 rector()
 {
-  local php="${1:-80}"
+  local php="${1:-82}"
   docker run -v "$(pwd)":/project rector/rector:latest process \
     "/project/$1" \
     --set "php${php}" \
@@ -84,12 +84,14 @@ ask()
 # Defines default antigen bundles
 x-default-antigen-bundles()
 {
+  # the theme to use
+  antigen theme romkatv/powerlevel10k
+
   # these should be always available
   antigen bundle colored-man-pages
   antigen bundle command-not-found
   antigen bundle ssh-agent
   antigen bundle MichaelAquilina/zsh-you-should-use
-  antigen bundle Sparragus/zsh-auto-nvm-use
   antigen bundle jreese/zsh-titles
   antigen bundle unixorn/autoupdate-antigen.zshplugin
   antigen bundle zsh-users/zsh-completions
@@ -101,6 +103,7 @@ x-default-antigen-bundles()
   have docker-compose && antigen bundle sroze/docker-compose-zsh-plugin
   have jq && antigen bundle reegnz/jq-zsh-plugin
   have nvm && antigen bundle nvm
+  have nvm && antigen bundle "$DOTFILES/config/zsh/plugins/nvm-auto-use"
   have php && antigen bundle php
   have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
   have rvm && antigen bundle unixorn/rvm-plugin

config/git/config

@@ -1,59 +1,7 @@
+[include]
+  path = ~/.dotfiles/config/git/shared
+
 [user]
   name = Ismo Vuorinen
   email = ismo@ivuorinen.net
 
-[credential]
-  helper = store --file ~/.cache/git/git-credentials
-  helper = cache --timeout 30000
-
-[core]
-  excludesfile = ~/.config/git/gitignore
-
-[alias]
-  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
-  nah = !git reset --hard && git clean -df
-  undo-commit = reset HEAD~ --soft
-  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
-  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\"
-  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]++'"
-
-[diff]
-  tool = difftastic
-
-[difftool]
-  prompt = false
-
-[difftool "difftastic"]
-  cmd = difft "$LOCAL" "$REMOTE"
-
-[filter "lfs"]
-  clean = git-lfs clean -- %f
-  smudge = git-lfs smudge -- %f
-  process = git-lfs filter-process
-  required = true
-
-[init]
-  defaultBranch = main
-
-[pull]
-  rebase = true
-
-[color]
-  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
-
-[submodule]
-  recurse = true

config/git/shared

@@ -0,0 +1,61 @@
+[credential]
+  helper = store --file ~/.cache/git/git-credentials
+  helper = cache --timeout 30000
+
+[core]
+  excludesfile = ~/.config/git/gitignore
+
+[init]
+  defaultBranch = main
+
+[pull]
+  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
+  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
+  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"
+  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-commit = reset HEAD~ --soft
+
+[filter "lfs"]
+  clean = git-lfs clean -- %f
+  smudge = git-lfs smudge -- %f
+  process = git-lfs filter-process
+  required = true
+
+[diff]
+  tool = difftastic
+
+[difftool]
+  prompt = false
+
+[difftool "difftastic"]
+  cmd = difft "$LOCAL" "$REMOTE"
+
+[color]
+  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
+
+[submodule]
+  recurse = true
+
+# dotfiles special config
+[includeIf "hasconfig:remote.*.url:https://github.com/ivuorinen/dotfiles.git"]
+  path = ~/.dotfiles/config/git/special/dotfiles ;
+

config/git/special/dotfiles

@@ -0,0 +1,2 @@
+[submodule]
+  recurse = false

config/gpg-tui/gpg-tui.toml

@@ -0,0 +1,32 @@
+[general]
+  splash = false
+  tick_rate = 250
+  color = "gray"
+  style = "plain"
+  file_explorer = "xplr"
+  detail_level = "minimum"
+  # key_bindings = [
+  #   { keys = [ "?" ], command = ":help" },
+  #   { keys = [ "o" ], command = ":options" },
+  #   { keys = [ "n" ], command = ":normal" },
+  #   { keys = [ "v" ], command = ":visual" },
+  #   { keys = [ "c" ], command = ":copy" },
+  #   { keys = [ "p", "C-v" ], command = ":paste" },
+  #   { keys = [ "x" ], command = ":export" },
+  #   { keys = [ "s" ], command = ":set prompt :sign" },
+  #   { keys = [ "e" ], command = ":set prompt :edit" },
+  #   { keys = [ "i" ], command = ":set prompt :import"},
+  #   { keys = [ "f" ], command = ":set prompt :receive" },
+  #   { keys = [ "u" ], command = ":set prompt :send" },
+  #   { keys = [ "g" ], command = ":generate" },
+  #   { keys = [ "d", "backspace" ], command = ":delete" },
+  #   { keys = [ "C-r" ], command = ":refresh" },
+  # ]
+
+[gpg]
+  armor = false
+  # homedir = "~/.gnupg"
+  # outdir = "~/.gnupg/out"
+  # outfile = "{type}_{query}.{ext}"
+  # default_key = "0xA1B2C3XY"
+

config/homebrew/Brewfile

@@ -6,27 +6,54 @@ tap "gesquive/tap"
 tap "github/gh"
 tap "homebrew/autoupdate"
 tap "homebrew/bundle"
-tap "homebrew/cask"
 tap "homebrew/cask-fonts"
-tap "homebrew/core"
 tap "homebrew/services"
 tap "jesseduffield/lazygit"
 tap "mongodb/brew"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
 tap "teamookla/speedtest"
+tap "xwmx/taps"
+# Run your GitHub Actions locally
+brew "act"
+# Mozilla CA certificate store
+brew "ca-certificates"
 # Interpreted, interactive, object-oriented programming language
 brew "python@3.11"
+# YAML Parser
+brew "libyaml"
 # Automate deployment, configuration, and upgrading
 brew "ansible"
 # Checks ansible playbooks for practices and behaviour
 brew "ansible-lint"
+# Generic-purpose lossless compression algorithm by Google
+brew "brotli"
+# Library and utilities for processing GIFs
+brew "giflib"
+# Performance-portable, length-agnostic SIMD with runtime dispatch
+brew "highway"
+# Library of 2D and 3D vector, matrix, and math operations
+brew "imath"
+# JPEG image codec that aids compression and decompression
+brew "jpeg-turbo"
 # Zstandard is a real-time compression algorithm
 brew "zstd"
+# New file format for still image compression
+brew "jpeg-xl"
+# Codec library for encoding and decoding AV1 video streams
+brew "aom"
+# Apache Portable Runtime library
+brew "apr"
+# Companion library to apr, the Apache Portable Runtime library
+brew "apr-util"
+# Password hashing library and CLI utility
+brew "argon2"
 # Open Source Kubernetes Marketplace
 brew "arkade"
 # Automatic configure script builder
 brew "autoconf"
+# 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
@@ -35,14 +62,18 @@ brew "asdf"
 brew "aspell"
 # Official Amazon AWS command-line interface
 brew "awscli"
-# Terminal bandwidth utilization tool
-brew "bandwhich"
 # Clone of cat(1) with syntax highlighting and Git integration
 brew "bat"
 # Yet another cross-platform graphical process/system monitor
 brew "bottom"
 # Switch Apache / Valet / CLI configs between PHP versions
 brew "brew-php-switcher"
+# Software library to render fonts
+brew "freetype"
+# XML-based font configuration API for X Windows
+brew "fontconfig"
+# GNU internationalization (i18n) and localization (l10n) library
+brew "gettext"
 # Core application library for C
 brew "glib"
 # Manage compile and link flags for libraries
@@ -61,6 +92,8 @@ brew "curl"
 brew "difftastic"
 # Tool for exploring each layer in a docker image
 brew "dive"
+# Lightweight DNS forwarder and DHCP server
+brew "dnsmasq"
 # Command-line DNS client
 brew "dog"
 # Lightning-fast linter for .env files written in Rust
@@ -69,8 +102,16 @@ brew "dotenv-linter"
 brew "editorconfig-checker"
 # Useful examples at the command-line
 brew "eg-examples"
-# CLI for templating and/or deploying FaaS functions
-brew "faas-cli"
+# C/C++ and Java libraries for Unicode and globalization
+brew "icu4c"
+# OpenType text shaping engine
+brew "harfbuzz"
+# Development kit for the Java programming language
+brew "openjdk"
+# Run arbitrary commands when files change
+brew "entr"
+# Perl lib for reading and writing EXIF metadata
+brew "exiftool"
 # Simple, fast and user-friendly alternative to find
 brew "fd"
 # Banner-like program prints strings as ASCII art
@@ -81,16 +122,18 @@ brew "freetds"
 brew "fswatch"
 # Command-line fuzzy finder written in Go
 brew "fzf"
+# Graphics library to dynamically manipulate images
+brew "gd"
 # Disk usage analyzer with console interface written in Go
-brew "gdu", link: false
+brew "gdu"
 # GitHub command-line tool
 brew "gh"
 # Distributed revision control system
 brew "git"
+# Enable transparent encryption/decryption of files in a git repo
+brew "git-crypt"
 # Small git utilities
 brew "git-extras"
-# AVH edition of git-flow
-brew "git-flow-avh"
 # See your latest local git branches, formatted real fancy
 brew "git-recent"
 # Open-source GitLab command-line tool
@@ -107,12 +150,14 @@ brew "gnutls"
 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!
+brew "gpg-tui"
 # Image manipulation
 brew "netpbm"
-# C/C++ and Java libraries for Unicode and globalization
-brew "icu4c"
-# OpenType text shaping engine
-brew "harfbuzz"
+# Framework for layout and rendering of i18n text
+brew "pango"
 # Library to render SVG files using Cairo
 brew "librsvg"
 # Graph visualization software from AT&T and Bell Labs
@@ -127,14 +172,18 @@ brew "hadolint"
 brew "htop"
 # Website copier/offline browser
 brew "httrack"
+# Configurable static site generator
+brew "hugo"
+# ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
+brew "libheif"
 # Tools and libraries to manipulate images in many formats
 brew "imagemagick"
 # Lightweight and flexible command-line JSON processor
 brew "jq"
+# Network authentication protocol
+brew "krb5"
 # Lazier way to manage everything docker
 brew "lazydocker"
-# Postgres C API library
-brew "libpq"
 # Linguistic software and Finnish dictionary
 brew "libvoikko"
 # Rainbows and unicorns in your console!
@@ -145,16 +194,18 @@ brew "luarocks"
 brew "m-cli"
 # Mac App Store command-line interface
 brew "mas"
-# Terminal-based visual file manager
-brew "midnight-commander"
+# NCurses Disk Usage
+brew "ncdu"
 # Ambitious Vim-fork focused on extensibility and agility
 brew "neovim"
+# HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
+brew "nginx"
 # Port scanning utility for large networks
 brew "nmap"
 # Manage multiple Node.js versions
 brew "nvm"
 # Development kit for the Java programming language
-brew "openjdk"
+brew "openjdk@11"
 # Generate clients, server & docs from an OpenAPI spec (v2, v3)
 brew "openapi-generator"
 # Swiss-army knife of markup format conversion
@@ -175,24 +226,28 @@ brew "pyenv-virtualenv"
 brew "python@3.10"
 # Interpreted, interactive, object-oriented programming language
 brew "python@3.8"
+# Ruby version manager
+brew "rbenv"
 # RC file (dotfile) management
 brew "rcm"
 # Search tool like grep and The Silver Searcher
 brew "ripgrep"
-# Powerful, clean, object-oriented scripting language
-brew "ruby"
+# Safe, concurrent, practical language
+brew "rust"
 # Static analysis and lint tool, for (ba)sh scripts
 brew "shellcheck"
 # Autoformat shell script source code
 brew "shfmt"
-# Cross-shell prompt for astronauts
-brew "starship"
+# Support CI generation of SBOMs via golang tooling
+brew "spdx-sbom-generator"
 # Version control system designed to be a better CVS
 brew "subversion"
+# Feature-rich console based todo list manager
+brew "task"
+# Terminal user interface for taskwarrior
+brew "taskwarrior-tui"
 # Send macOS User Notifications from the command-line
-brew "terminal-notifier", link: false
-# Tool to build, change, and version infrastructure
-brew "terraform", link: false
+brew "terminal-notifier"
 # Thin wrapper for Terraform e.g. for locking state
 brew "terragrunt"
 # Tool which checks for the support of TLS/SSL ciphers and flaws
@@ -225,6 +280,8 @@ brew "wget"
 brew "wtfutil"
 # Check your $HOME for unwanted files and directories
 brew "xdg-ninja"
+# Hackable, minimal, fast TUI file explorer
+brew "xplr"
 # JavaScript package manager
 brew "yarn"
 # A vulnerability scanner for container images and filesystems
@@ -237,6 +294,8 @@ brew "gesquive/tap/git-user"
 brew "jesseduffield/lazygit/lazygit"
 # High-performance, schema-free, document-oriented database
 brew "mongodb/brew/mongodb-community"
+# Imagick PHP extension
+brew "shivammathur/extensions/imagick@8.2"
 # Xdebug PHP extension
 brew "shivammathur/extensions/xdebug@7.4"
 # Xdebug PHP extension
@@ -253,14 +312,20 @@ brew "shivammathur/php/php@8.0"
 brew "teamookla/speedtest/speedtest"
 # Command-line helper for the 1Password password manager
 cask "1password-cli"
+# Turn audio CDs and files into audiobooks
+cask "audiobook-builder"
 # Text editor
 cask "coda"
 # Universal database tool and SQL client
 cask "dbeaver-community"
+# Database version management tool
+cask "dbngin"
 # App to build and share containerized applications and microservices
 cask "docker"
 # Reimagine your terminal
 cask "fig"
+# UI toolkit for building applications for mobile, web and desktop
+cask "flutter"
 # Unofficial overcast.fm podcast app
 cask "fog"
 # Typeface made for developers
@@ -289,10 +354,12 @@ cask "jetbrains-toolbox"
 cask "lens"
 # Keep all tasks from your todo apps on your menu bar
 cask "monofocus"
-# Neovim Client
-cask "neovide"
 # Reverse proxy, secure introspectable tunnels to localhost
 cask "ngrok"
+# Simple application that will prevent iTunes or Apple Music from launching
+cask "notunes"
+# Knowledge base that works on top of a local folder of plain text Markdown files
+cask "obsidian"
 # Scheduling application focusing on organization
 cask "omnifocus"
 # Collaboration platform for API development
@@ -313,6 +380,10 @@ cask "quitter"
 cask "raycast"
 # Move and resize windows using keyboard shortcuts or snap areas
 cask "rectangle"
+# GUI for rsync
+cask "rsyncosx"
+# GUI for rsync
+cask "rsyncui"
 # MySQL/MariaDB database management
 cask "sequel-ace"
 # Collection of apps available by subscription
@@ -333,10 +404,82 @@ cask "vlc"
 cask "voikkospellservice"
 # Rust-based terminal
 cask "warp"
-# Mastodon, Pleroma, and Misskey client
-cask "whalebird"
-# View output from scripts in the menu bar
-cask "xbar"
 mas "1Password for Safari", id: 1569813296
-mas "Flow", id: 1423210932
+mas "Actions", id: 1586435171
+mas "Audiobook Builder", id: 1437681957
+mas "Ivory", id: 6444602274
+mas "Keynote", id: 409183694
+mas "Numbers", id: 409203825
+mas "Pages", id: 409201541
 mas "Tailscale", id: 1475387142
+mas "Xcode", id: 497799835
+vscode "akamud.vscode-theme-onelight"
+vscode "amiralizadeh9480.laravel-extra-intellisense"
+vscode "andrewleedham.vscode-css-modules"
+vscode "andrewmcodes.tailwindcss-extension-pack"
+vscode "austenc.tailwind-docs"
+vscode "bmewburn.vscode-intelephense-client"
+vscode "Box-Of-Hats.bemhelper"
+vscode "bradlc.vscode-tailwindcss"
+vscode "christian-kohler.npm-intellisense"
+vscode "christian-kohler.path-intellisense"
+vscode "DavidAnson.vscode-markdownlint"
+vscode "dbaeumer.vscode-eslint"
+vscode "DotJoshJohnson.xml"
+vscode "eamodio.gitlens"
+vscode "EditorConfig.EditorConfig"
+vscode "esbenp.prettier-vscode"
+vscode "formulahendry.auto-close-tag"
+vscode "formulahendry.auto-rename-tag"
+vscode "formulahendry.code-runner"
+vscode "gencer.html-slim-scss-css-class-completion"
+vscode "github.vscode-github-actions"
+vscode "GitHub.vscode-pull-request-github"
+vscode "GraphQL.vscode-graphql"
+vscode "GraphQL.vscode-graphql-execution"
+vscode "GraphQL.vscode-graphql-syntax"
+vscode "heybourn.headwind"
+vscode "JohnnyMorganz.stylua"
+vscode "jumpinjackie.vscode-map-preview"
+vscode "k--kato.intellij-idea-keybindings"
+vscode "liamhammett.inline-parameters"
+vscode "macieklad.tailwind-sass-syntax"
+vscode "MehediDracula.php-namespace-resolver"
+vscode "mikestead.dotenv"
+vscode "MisterJ.vue-volar-extention-pack"
+vscode "MrChetan.phpstorm-parameter-hints-in-vscode"
+vscode "mrorz.language-gettext"
+vscode "ms-azuretools.vscode-docker"
+vscode "ms-python.python"
+vscode "ms-python.vscode-pylance"
+vscode "ms-toolsai.jupyter"
+vscode "ms-toolsai.jupyter-renderers"
+vscode "ms-toolsai.vscode-jupyter-cell-tags"
+vscode "ms-toolsai.vscode-jupyter-slideshow"
+vscode "ms-vscode-remote.remote-containers"
+vscode "ms-vscode-remote.remote-wsl"
+vscode "ms-vscode.cpptools"
+vscode "msjsdiag.vscode-react-native"
+vscode "mtxr.sqltools"
+vscode "neilbrayfield.php-docblocker"
+vscode "nhoizey.gremlins"
+vscode "oderwat.indent-rainbow"
+vscode "pflannery.vscode-versionlens"
+vscode "phiter.phpstorm-snippets"
+vscode "sibiraj-s.vscode-scss-formatter"
+vscode "SonarSource.sonarlint-vscode"
+vscode "stylelint.vscode-stylelint"
+vscode "syler.sass-indented"
+vscode "timonwong.shellcheck"
+vscode "tootone.org-mode"
+vscode "valeryanm.vscode-phpsab"
+vscode "Vue.volar"
+vscode "Vue.vscode-typescript-vue-plugin"
+vscode "WakaTime.vscode-wakatime"
+vscode "withfig.fig"
+vscode "wix.vscode-import-cost"
+vscode "xdebug.php-debug"
+vscode "xdebug.php-pack"
+vscode "yinfei.luahelper"
+vscode "yoavbls.pretty-ts-errors"
+vscode "ZainChen.json"

config/homebrew/brew.env

@@ -0,0 +1,11 @@
+# shellcheck shell=bash
+# vim: filetype=zsh
+# dotenv-linter:off LowercaseKey, KeyWithoutValue, ExtraBlankLine, EndingBlankLine
+#
+# Homebrew configuration
+
+export HOMEBREW_AUTOREMOVE=true
+export HOMEBREW_AUTO_UPDATE_SECS=86400
+export HOMEBREW_CLEANUP_MAX_AGE_DAYS=30
+export HOMEBREW_NO_ENV_HINTS=1
+

config/iterm2/com.googlecode.iterm2.plist

@@ -2,24 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>AboutToPasteTabsWithCancel</key>
-	<true/>
-	<key>AboutToPasteTabsWithCancel_selection</key>
-	<integer>0</integer>
 	<key>AllowClipboardAccess</key>
 	<true/>
-	<key>AlternateMouseScroll</key>
+	<key>AutoHideTmuxClientSession</key>
 	<true/>
-	<key>AppleAntiAliasingThreshold</key>
-	<integer>1</integer>
-	<key>ApplePressAndHoldEnabled</key>
-	<false/>
-	<key>AppleScrollAnimationEnabled</key>
-	<integer>0</integer>
-	<key>AppleSmoothFixedFontsSizeThreshold</key>
-	<integer>1</integer>
-	<key>AppleWindowTabbingMode</key>
-	<string>manual</string>
 	<key>Custom Color Presets</key>
 	<dict>
 		<key>catppuccin-mocha</key>
@@ -352,25 +338,29 @@
 		</dict>
 	</dict>
 	<key>Default Bookmark Guid</key>
-	<string>82636119-EA17-4A26-9AA7-408172F4A9C8</string>
+	<string>B563F48B-314D-48CC-908E-ACA971D430BE</string>
 	<key>DimBackgroundWindows</key>
 	<false/>
 	<key>DimOnlyText</key>
 	<true/>
 	<key>DisableFullscreenTransparency</key>
 	<true/>
+	<key>EnableDivisionView</key>
+	<true/>
 	<key>HapticFeedbackForEsc</key>
 	<false/>
+	<key>HideActivityIndicator</key>
+	<false/>
+	<key>HideScrollbar</key>
+	<true/>
+	<key>HideTabNumber</key>
+	<false/>
 	<key>HotkeyMigratedFromSingleToMulti</key>
 	<true/>
 	<key>IRMemory</key>
 	<integer>4</integer>
 	<key>MaxVertically</key>
 	<true/>
-	<key>NeverWarnAboutShortLivedSessions_82636119-EA17-4A26-9AA7-408172F4A9C8</key>
-	<true/>
-	<key>NeverWarnAboutShortLivedSessions_82636119-EA17-4A26-9AA7-408172F4A9C8_selection</key>
-	<integer>0</integer>
 	<key>New Bookmarks</key>
 	<array>
 		<dict>
@@ -378,6 +368,8 @@
 			<true/>
 			<key>ASCII Ligatures</key>
 			<false/>
+			<key>Allow Title Reporting</key>
+			<true/>
 			<key>Ambiguous Double Width</key>
 			<false/>
 			<key>Ansi 0 Color</key>
@@ -618,26 +610,12 @@
 				<key>Red Component</key>
 				<real>1</real>
 			</dict>
-			<key>Badge Font</key>
-			<string>JetBrainsMonoNerdFontCompleteM-Bold</string>
-			<key>Badge Max Height</key>
-			<real>0.10000000000000001</real>
-			<key>Badge Max Width</key>
-			<real>0.45000000000000001</real>
-			<key>Badge Right Margin</key>
-			<real>10</real>
-			<key>Badge Text</key>
-			<string></string>
-			<key>Badge Top Margin</key>
-			<real>10</real>
-			<key>Blend</key>
-			<real>0.24709154211956524</real>
 			<key>Blinking Cursor</key>
 			<false/>
 			<key>Blur</key>
 			<true/>
 			<key>Blur Radius</key>
-			<real>9.5927277260638313</real>
+			<real>20</real>
 			<key>Bold Color</key>
 			<dict>
 				<key>Alpha Component</key>
@@ -656,11 +634,9 @@
 			<key>Close Sessions On End</key>
 			<true/>
 			<key>Columns</key>
-			<integer>120</integer>
+			<integer>130</integer>
 			<key>Command</key>
 			<string></string>
-			<key>Cursor Boost</key>
-			<real>0.0</real>
 			<key>Cursor Color</key>
 			<dict>
 				<key>Alpha Component</key>
@@ -728,11 +704,9 @@
 				<real>0.80392156862745101</real>
 			</dict>
 			<key>Guid</key>
-			<string>82636119-EA17-4A26-9AA7-408172F4A9C8</string>
+			<string>B563F48B-314D-48CC-908E-ACA971D430BE</string>
 			<key>Horizontal Spacing</key>
 			<real>1</real>
-			<key>Icon</key>
-			<integer>1</integer>
 			<key>Idle Code</key>
 			<integer>0</integer>
 			<key>Jobs to Ignore</key>
@@ -1038,8 +1012,6 @@
 				<key>Red Component</key>
 				<real>0.53725490196078429</real>
 			</dict>
-			<key>Minimum Contrast</key>
-			<real>0.14973958333333334</real>
 			<key>Mouse Reporting</key>
 			<true/>
 			<key>Name</key>
@@ -1049,19 +1021,23 @@
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>JetBrainsMonoNerdFontCompleteM-Light 15</string>
+			<string>JetBrainsMonoNFM-Regular 13</string>
 			<key>Only The Default BG Color Uses Transparency</key>
 			<true/>
+			<key>Open Password Manager Automatically</key>
+			<true/>
 			<key>Option Key Sends</key>
 			<integer>0</integer>
 			<key>Prompt Before Closing 2</key>
 			<false/>
+			<key>Reduce Flicker</key>
+			<true/>
 			<key>Right Option Key Sends</key>
 			<integer>0</integer>
 			<key>Rows</key>
 			<integer>25</integer>
 			<key>Screen</key>
-			<integer>-2</integer>
+			<integer>-1</integer>
 			<key>Scrollback Lines</key>
 			<integer>0</integer>
 			<key>Selected Text Color</key>
@@ -1092,30 +1068,180 @@
 			</dict>
 			<key>Send Code When Idle</key>
 			<false/>
+			<key>Set Local Environment Vars</key>
+			<false/>
 			<key>Shortcut</key>
 			<string></string>
-			<key>Silence Bell</key>
+			<key>Show Mark Indicators</key>
 			<false/>
-			<key>Smart Cursor Color</key>
+			<key>Show Status Bar</key>
+			<false/>
+			<key>Show Timestamps</key>
+			<integer>2</integer>
+			<key>Silence Bell</key>
 			<true/>
+			<key>Status Bar Layout</key>
+			<dict>
+				<key>advanced configuration</key>
+				<dict>
+					<key>algorithm</key>
+					<integer>0</integer>
+					<key>auto-rainbow style</key>
+					<integer>0</integer>
+					<key>font</key>
+					<string>.AppleSystemUIFont 12</string>
+					<key>remove empty components</key>
+					<true/>
+				</dict>
+				<key>components</key>
+				<array>
+					<dict>
+						<key>class</key>
+						<string>iTermStatusBarClockComponent</string>
+						<key>configuration</key>
+						<dict>
+							<key>knobs</key>
+							<dict>
+								<key>base: compression resistance</key>
+								<integer>1</integer>
+								<key>base: priority</key>
+								<real>5</real>
+								<key>format</key>
+								<string>YYYY-MM-dd HH:mm</string>
+								<key>localize</key>
+								<integer>0</integer>
+								<key>maxwidth</key>
+								<real>150</real>
+								<key>minwidth</key>
+								<real>150</real>
+							</dict>
+							<key>layout advanced configuration dictionary value</key>
+							<dict>
+								<key>algorithm</key>
+								<integer>0</integer>
+								<key>auto-rainbow style</key>
+								<integer>0</integer>
+								<key>remove empty components</key>
+								<false/>
+							</dict>
+						</dict>
+					</dict>
+					<dict>
+						<key>class</key>
+						<string>iTermStatusBarHostnameComponent</string>
+						<key>configuration</key>
+						<dict>
+							<key>knobs</key>
+							<dict>
+								<key>abbreviate-localhost</key>
+								<string></string>
+								<key>base: compression resistance</key>
+								<real>1</real>
+								<key>base: priority</key>
+								<real>5</real>
+								<key>maxwidth</key>
+								<real>+infinity</real>
+								<key>minwidth</key>
+								<string>0</string>
+								<key>shared text color</key>
+								<dict>
+									<key>Alpha Component</key>
+									<real>1</real>
+									<key>Blue Component</key>
+									<real>0.43218994140625</real>
+									<key>Color Space</key>
+									<string>sRGB</string>
+									<key>Green Component</key>
+									<real>0.34513998031616211</real>
+									<key>Red Component</key>
+									<real>0.0</real>
+								</dict>
+							</dict>
+							<key>layout advanced configuration dictionary value</key>
+							<dict>
+								<key>algorithm</key>
+								<integer>0</integer>
+								<key>auto-rainbow style</key>
+								<integer>0</integer>
+								<key>font</key>
+								<string>.AppleSystemUIFont 12</string>
+								<key>remove empty components</key>
+								<true/>
+							</dict>
+						</dict>
+					</dict>
+					<dict>
+						<key>class</key>
+						<string>iTermStatusBarSpringComponent</string>
+						<key>configuration</key>
+						<dict>
+							<key>knobs</key>
+							<dict>
+								<key>base: compression resistance</key>
+								<integer>1</integer>
+								<key>base: priority</key>
+								<real>5</real>
+								<key>iTermStatusBarSpringComponentSizeMultipleKey</key>
+								<integer>1</integer>
+								<key>iTermStatusBarSpringComponentSpringConstantKey</key>
+								<real>0.01</real>
+							</dict>
+							<key>layout advanced configuration dictionary value</key>
+							<dict>
+								<key>algorithm</key>
+								<integer>0</integer>
+								<key>auto-rainbow style</key>
+								<integer>0</integer>
+								<key>font</key>
+								<string>.AppleSystemUIFont 12</string>
+								<key>remove empty components</key>
+								<true/>
+							</dict>
+						</dict>
+					</dict>
+					<dict>
+						<key>class</key>
+						<string>iTermStatusBarSpringComponent</string>
+						<key>configuration</key>
+						<dict>
+							<key>knobs</key>
+							<dict>
+								<key>base: compression resistance</key>
+								<integer>1</integer>
+								<key>base: priority</key>
+								<real>5</real>
+								<key>iTermStatusBarSpringComponentSizeMultipleKey</key>
+								<integer>1</integer>
+								<key>iTermStatusBarSpringComponentSpringConstantKey</key>
+								<real>0.01</real>
+							</dict>
+							<key>layout advanced configuration dictionary value</key>
+							<dict>
+								<key>algorithm</key>
+								<integer>0</integer>
+								<key>auto-rainbow style</key>
+								<integer>0</integer>
+								<key>remove empty components</key>
+								<false/>
+							</dict>
+						</dict>
+					</dict>
+				</array>
+			</dict>
 			<key>Sync Title</key>
 			<false/>
 			<key>Tags</key>
 			<array/>
 			<key>Terminal Type</key>
 			<string>xterm-256color</string>
-			<key>Title Components</key>
-			<integer>512</integer>
 			<key>Transparency</key>
-			<real>0.10293218085106381</real>
+			<real>0.14999999999999997</real>
 			<key>Unlimited Scrollback</key>
 			<true/>
 			<key>Use Bold Font</key>
 			<true/>
 			<key>Use Bright Bold</key>
 			<true/>
-			<key>Use Cursor Guide</key>
-			<false/>
 			<key>Use Italic Font</key>
 			<true/>
 			<key>Use Non-ASCII Font</key>
@@ -1130,12 +1256,6 @@
 			<string>/Users/ivuorinen/Code</string>
 		</dict>
 	</array>
-	<key>OpenArrangementAtStartup</key>
-	<false/>
-	<key>OpenNoWindowsAtStartup</key>
-	<false/>
-	<key>OpenTmuxWindowsIn</key>
-	<integer>1</integer>
 	<key>PointerActions</key>
 	<dict>
 		<key>Button,1,1,,</key>
@@ -1169,16 +1289,34 @@
 			<string>kNextWindowPointerAction</string>
 		</dict>
 	</dict>
+	<key>PreserveWindowSizeWhenTabBarVisibilityChanges</key>
+	<true/>
+	<key>Print In Black And White</key>
+	<true/>
+	<key>PromptOnQuit</key>
+	<false/>
+	<key>SeparateStatusBarsPerPane</key>
+	<false/>
 	<key>SmartPlacement</key>
 	<true/>
 	<key>SoundForEsc</key>
 	<false/>
 	<key>SplitPaneDimmingAmount</key>
-	<real>0.59999999999999998</real>
+	<real>0.29999999999999993</real>
+	<key>StatusBarPosition</key>
+	<integer>0</integer>
 	<key>TabStyleWithAutomaticOption</key>
 	<integer>5</integer>
+	<key>TabsHaveCloseButton</key>
+	<false/>
+	<key>ThreeFingerEmulates</key>
+	<true/>
+	<key>TmuxUnpauseAutomatically</key>
+	<true/>
 	<key>VisualIndicatorForEsc</key>
 	<false/>
+	<key>WindowNumber</key>
+	<true/>
 	<key>kCPKSelectionViewPreferredModeKey</key>
 	<integer>0</integer>
 	<key>kCPKSelectionViewShowHSBTextFieldsKey</key>

config/nvm/default-packages

@@ -3,8 +3,6 @@ corepack
 editorconfig-checker
 github-release-notes
 neovim
-prettier
-standardjs
 stylelint-lsp
 tldr
 

config/starship.toml

@@ -1,37 +0,0 @@
-# Get editor completions based on the config schema
-"$schema" = 'https://starship.rs/config-schema.json'
-
-# Inserts a blank line between shell prompts
-add_newline = true
-
-# Timeout for commands executed by starship (in milliseconds).
-command_timeout = 1000
-
-# Replace the '❯' symbol in the prompt with '➜'
-[character] # The name of the module we are configuring is 'character'
-success_symbol = '[➜](bold green)' # The 'success_symbol' segment is being set to '➜' with the color 'bold green'
-
-[cmd_duration]
-disabled = true
-
-[git_branch]
-symbol = '🌱 '
-truncation_length = 20
-truncation_symbol = '…'
-ignore_branches = ['master', 'main']
-
-[git_status]
-up_to_date = '✓'
-staged = '[++\($count\)](green)'
-
-[package]
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'
-
-[php]
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'
-
-[nodejs]
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'

config/task/taskrc

@@ -0,0 +1,82 @@
+# [Created by task 2.6.2 5/11/2023 09:33:14]
+# Taskwarrior program configuration file.
+# For more documentation, see https://taskwarrior.org or try 'man task', 'man task-color',
+# 'man task-sync' or 'man taskrc'
+
+# Here is an example of entries that use the default, override and blank values
+#   variable=foo   -- By specifying a value, this overrides the default
+#   variable=      -- By specifying no value, this means no default
+#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default
+
+# You can also refence environment variables:
+#   variable=$HOME/task
+#   variable=$VALUE
+
+# Use the command 'task show' to see all defaults and overrides
+
+# Files
+data.location=$XDG_DATA_HOME/task/
+
+# To use the default location of the XDG directories,
+# move this configuration file from ~/.taskrc to ~/.config/task/taskrc and uncomment below
+
+#data.location=$XDG_DATA_HOME/task
+#hooks.location=~/.config/task/hooks
+
+# Color theme (uncomment one to use)
+#include light-16.theme
+#include light-256.theme
+#include dark-16.theme
+#include dark-256.theme
+#include dark-red-256.theme
+#include dark-green-256.theme
+#include dark-blue-256.theme
+#include dark-violets-256.theme
+#include dark-yellow-green.theme
+#include dark-gray-256.theme
+#include dark-gray-blue-256.theme
+#include solarized-dark-256.theme
+#include solarized-light-256.theme
+#include no-color.theme
+
+weekstart=monday
+
+news.version=2.6.0
+
+default.project=Inbox
+calendar.details=full
+calendar.holidays=sparse
+recurrence=on
+
+uda.taskwarrior-tui.keyconfig.quit=q
+uda.taskwarrior-tui.keyconfig.refresh=r
+uda.taskwarrior-tui.keyconfig.go-to-bottom=G
+uda.taskwarrior-tui.keyconfig.go-to-top=g
+uda.taskwarrior-tui.keyconfig.down=j
+uda.taskwarrior-tui.keyconfig.up=k
+uda.taskwarrior-tui.keyconfig.page-down=J
+uda.taskwarrior-tui.keyconfig.page-up=K
+uda.taskwarrior-tui.keyconfig.delete=x
+uda.taskwarrior-tui.keyconfig.done=d
+uda.taskwarrior-tui.keyconfig.start-stop=s
+uda.taskwarrior-tui.keyconfig.quick-tag=t
+uda.taskwarrior-tui.keyconfig.undo=u
+uda.taskwarrior-tui.keyconfig.edit=e
+uda.taskwarrior-tui.keyconfig.modify=m
+uda.taskwarrior-tui.keyconfig.shell=!
+uda.taskwarrior-tui.keyconfig.log=l
+uda.taskwarrior-tui.keyconfig.add=a
+uda.taskwarrior-tui.keyconfig.annotate=A
+uda.taskwarrior-tui.keyconfig.filter=/
+uda.taskwarrior-tui.keyconfig.zoom=z
+uda.taskwarrior-tui.keyconfig.context-menu=c
+uda.taskwarrior-tui.keyconfig.next-tab=.
+uda.taskwarrior-tui.keyconfig.previous-tab=,
+
+taskd.certificate=$XDG_DATA_HOME/task/private.certificate.pem
+taskd.key=$XDG_DATA_HOME/task/private.key.pem
+taskd.ca=$XDG_DATA_HOME/task/ca.cert.pem
+taskd.server=inthe.am:53589
+taskd.credentials=inthe_am/ivuorinen/b99a4970-94fb-4fb8-b9fe-e1a8140dd44d
+taskd.trust=strict
+

config/tmux/tmux.conf

@@ -4,6 +4,27 @@
 # - https://tmuxguide.readthedocs.io/en/latest/tmux/tmux.html
 # - https://github.com/dreamsofcode-io/tmux/blob/main/tmux.conf
 
+## Install plugins, starting with plugin manager
+set -g @tpm_plugins '           \
+  tmux-plugins/tpm               \
+  b0o/tmux-autoreload            \
+  catppuccin/tmux                \
+  ChanderG/tmux-notify           \
+  christoomey/vim-tmux-navigator \
+  yardnsm/tmux-1password         \
+  jaclu/tmux-menus               \
+  sainnhe/tmux-fzf               \
+  MunifTanjim/tmux-suspend       \
+  tmux-plugins/tmux-continuum    \
+  tmux-plugins/tmux-resurrect    \
+  tmux-plugins/tmux-sensible     \
+  tmux-plugins/tmux-sessionist   \
+  tmux-plugins/tmux-yank         \
+'
+
+# Set plugins install dir
+set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.dotfiles/config/tmux/plugins/'
+
 set-option -sa terminal-overrides ",xterm*:Tc"
 
 # Mouse support
@@ -51,17 +72,51 @@ bind N new-window
 
 # Plugins related configurations
 
+## https://github.com/jaclu/tmux-menus
+set -g @menus_trigger 'm'
+
+## https://github.com/jaclu/tmux-1password
+set -g @1password-key 'x'
+
 ## https://github.com/catppuccin/tmux
 set -g @catppuccin_flavour 'mocha' # latte/frappe/macchiato/mocha
 set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs
 
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'christoomey/vim-tmux-navigator'
-set -g @plugin 'tmux-plugins/tmux-yank'
-set -g @plugin 'catppuccin/tmux'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'tmux-plugins/tmux-continuum'
+## https://github.com/MunifTanjim/tmux-mode-indicator
+set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}'
+
+set -g @mode_indicator_prefix_prompt ' WAIT '
+set -g @mode_indicator_copy_prompt ' COPY '
+set -g @mode_indicator_sync_prompt ' SYNC '
+set -g @mode_indicator_empty_prompt ' TMUX '
+set -g @mode_indicator_prefix_mode_style 'bg=blue,fg=black'
+set -g @mode_indicator_copy_mode_style 'bg=yellow,fg=black'
+set -g @mode_indicator_sync_mode_style 'bg=red,fg=black'
+set -g @mode_indicator_empty_mode_style 'bg=cyan,fg=black'
+
+## https://github.com/MunifTanjim/tmux-suspend
+set -g @suspend_key 'F12'
+set -g @suspend_suspended_options " \
+  @mode_indicator_custom_prompt:: ---- , \
+  @mode_indicator_custom_mode_style::bg=brightblack\\,fg=black, \
+"
+
+## https://github.com/tmux-plugins/tmux-continuum
+set -g @continuum-restore 'on'
+set -g @continuum-boot 'on'
+set -g @continuum-boot-options 'iterm'
+
+## https://github.com/tmux-plugins/tmux-resurrect
+set -g @resurrect-strategy-nvim 'session'
+
+## https://github.com/b0o/tmux-autoreload
+set-option -g @tmux-autoreload-configs '~/.dotfiles/config/tmux/tmux.conf'
+
+## https://github.com/sainnhe/tmux-fzf
+TMUX_FZF_LAUNCH_KEY="l"
+
+## https://github.com/ChanderG/tmux-notify
+set -g @tnotify-verbose 'on'
 
 # set vi-mode
 set-window-option -g mode-keys vi
@@ -71,7 +126,7 @@ bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
 bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
 
 bind '"' split-window -v -c "#{pane_current_path}"
-bind % split-window -h -c "#{pane_current_path}"
+bind '!' split-window -h -c "#{pane_current_path}"
 
 # synchronize all panes in a window
 bind y setw synchronize-panes
@@ -89,5 +144,4 @@ unbind p
 bind p paste-buffer
 
 # Finally run the tmux plugin manager
-run '~/.config/tmux/plugins/tpm/tpm'
-
+run '~/.dotfiles/config/tmux/plugins/tpm/tpm'

config/zsh/completion/_cheat

@@ -0,0 +1,66 @@
+#compdef cheat
+# vim: ft=zsh
+
+local cheats taglist pathlist
+
+_cheat_complete_personal_cheatsheets()
+{
+  cheats=("${(f)$(cheat -l -t personal | tail -n +2 | cut -d' ' -f1)}")
+  _describe -t cheats 'cheats' cheats
+}
+
+_cheat_complete_full_cheatsheets()
+{
+  cheats=("${(f)$(cheat -l | tail -n +2 | cut -d' ' -f1)}")
+  _describe -t cheats 'cheats' cheats
+}
+
+_cheat_complete_tags()
+{
+  taglist=("${(f)$(cheat -T)}")
+  _describe -t taglist 'taglist' taglist
+}
+
+_cheat_complete_paths()
+{
+  pathlist=("${(f)$(cheat -d | cut -d':' -f1)}")
+  _describe -t pathlist 'pathlist' pathlist
+}
+
+_cheat() {
+
+  _arguments -C \
+    '(--init)--init[Write a default config file to stdout]: :->none' \
+    '(-c --colorize)'{-c,--colorize}'[Colorize output]: :->none' \
+    '(-d --directories)'{-d,--directories}'[List cheatsheet directories]: :->none' \
+    '(-e --edit)'{-e,--edit}'[Edit <sheet>]: :->personal' \
+    '(-l --list)'{-l,--list}'[List cheatsheets]: :->full' \
+    '(-p --path)'{-p,--path}'[Return only sheets found on path <name>]: :->pathlist' \
+    '(-r --regex)'{-r,--regex}'[Treat search <phrase> as a regex]: :->none' \
+    '(-s --search)'{-s,--search}'[Search cheatsheets for <phrase>]: :->none' \
+    '(-t --tag)'{-t,--tag}'[Return only sheets matching <tag>]: :->taglist' \
+    '(-T --tags)'{-T,--tags}'[List all tags in use]: :->none' \
+    '(-v --version)'{-v,--version}'[Print the version number]: :->none' \
+    '(--rm)--rm[Remove (delete) <sheet>]: :->personal'
+
+  case $state in
+    (none)
+      ;;
+    (full)
+      _cheat_complete_full_cheatsheets
+      ;;
+    (personal)
+      _cheat_complete_personal_cheatsheets
+      ;;
+    (taglist)
+      _cheat_complete_tags
+      ;;
+    (pathlist)
+      _cheat_complete_paths
+      ;;
+    (*)
+      ;;
+  esac
+}
+
+compdef _cheat cheat

config/zsh/completion/_git-profile

@@ -0,0 +1,177 @@
+#compdef _git-profile git-profile
+
+# zsh completion for git-profile                          -*- shell-script -*-
+
+__git-profile_debug()
+{
+    local file="$BASH_COMP_DEBUG_FILE"
+    if [[ -n ${file} ]]; then
+        echo "$*" >> "${file}"
+    fi
+}
+
+_git-profile()
+{
+    local shellCompDirectiveError=1
+    local shellCompDirectiveNoSpace=2
+    local shellCompDirectiveNoFileComp=4
+    local shellCompDirectiveFilterFileExt=8
+    local shellCompDirectiveFilterDirs=16
+
+    local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace
+    local -a completions
+
+    __git-profile_debug "\n========= starting completion logic =========="
+    __git-profile_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}"
+
+    # The user could have moved the cursor backwards on the command-line.
+    # We need to trigger completion from the $CURRENT location, so we need
+    # to truncate the command-line ($words) up to the $CURRENT location.
+    # (We cannot use $CURSOR as its value does not work when a command is an alias.)
+    words=("${=words[1,CURRENT]}")
+    __git-profile_debug "Truncated words[*]: ${words[*]},"
+
+    lastParam=${words[-1]}
+    lastChar=${lastParam[-1]}
+    __git-profile_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
+
+    # For zsh, when completing a flag with an = (e.g., git-profile -n=<TAB>)
+    # completions must be prefixed with the flag
+    setopt local_options BASH_REMATCH
+    if [[ "${lastParam}" =~ '-.*=' ]]; then
+        # We are dealing with a flag with an =
+        flagPrefix="-P ${BASH_REMATCH}"
+    fi
+
+    # Prepare the command to obtain completions
+    requestComp="${words[1]} __complete ${words[2,-1]}"
+    if [ "${lastChar}" = "" ]; then
+        # If the last parameter is complete (there is a space following it)
+        # We add an extra empty parameter so we can indicate this to the go completion code.
+        __git-profile_debug "Adding extra empty parameter"
+        requestComp="${requestComp} \"\""
+    fi
+
+    __git-profile_debug "About to call: eval ${requestComp}"
+
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 2>/dev/null)
+    __git-profile_debug "completion output: ${out}"
+
+    # Extract the directive integer following a : from the last line
+    local lastLine
+    while IFS='\n' read -r line; do
+        lastLine=${line}
+    done < <(printf "%s\n" "${out[@]}")
+    __git-profile_debug "last line: ${lastLine}"
+
+    if [ "${lastLine[1]}" = : ]; then
+        directive=${lastLine[2,-1]}
+        # Remove the directive including the : and the newline
+        local suffix
+        (( suffix=${#lastLine}+2))
+        out=${out[1,-$suffix]}
+    else
+        # There is no directive specified.  Leave $out as is.
+        __git-profile_debug "No directive found.  Setting do default"
+        directive=0
+    fi
+
+    __git-profile_debug "directive: ${directive}"
+    __git-profile_debug "completions: ${out}"
+    __git-profile_debug "flagPrefix: ${flagPrefix}"
+
+    if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
+        __git-profile_debug "Completion received error. Ignoring completions."
+        return
+    fi
+
+    while IFS='\n' read -r comp; do
+        if [ -n "$comp" ]; then
+            # If requested, completions are returned with a description.
+            # The description is preceded by a TAB character.
+            # For zsh's _describe, we need to use a : instead of a TAB.
+            # We first need to escape any : as part of the completion itself.
+            comp=${comp//:/\\:}
+
+            local tab=$(printf '\t')
+            comp=${comp//$tab/:}
+
+            __git-profile_debug "Adding completion: ${comp}"
+            completions+=${comp}
+            lastComp=$comp
+        fi
+    done < <(printf "%s\n" "${out[@]}")
+
+    if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then
+        __git-profile_debug "Activating nospace."
+        noSpace="-S ''"
+    fi
+
+    if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then
+        # File extension filtering
+        local filteringCmd
+        filteringCmd='_files'
+        for filter in ${completions[@]}; do
+            if [ ${filter[1]} != '*' ]; then
+                # zsh requires a glob pattern to do file filtering
+                filter="\*.$filter"
+            fi
+            filteringCmd+=" -g $filter"
+        done
+        filteringCmd+=" ${flagPrefix}"
+
+        __git-profile_debug "File filtering command: $filteringCmd"
+        _arguments '*:filename:'"$filteringCmd"
+    elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then
+        # File completion for directories only
+        local subdir
+        subdir="${completions[1]}"
+        if [ -n "$subdir" ]; then
+            __git-profile_debug "Listing directories in $subdir"
+            pushd "${subdir}" >/dev/null 2>&1
+        else
+            __git-profile_debug "Listing directories in ."
+        fi
+
+        local result
+        _arguments '*:dirname:_files -/'" ${flagPrefix}"
+        result=$?
+        if [ -n "$subdir" ]; then
+            popd >/dev/null 2>&1
+        fi
+        return $result
+    else
+        __git-profile_debug "Calling _describe"
+        if eval _describe "completions" completions $flagPrefix $noSpace; then
+            __git-profile_debug "_describe found some completions"
+
+            # Return the success of having called _describe
+            return 0
+        else
+            __git-profile_debug "_describe did not find completions."
+            __git-profile_debug "Checking if we should do file completion."
+            if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
+                __git-profile_debug "deactivating file completion"
+
+                # We must return an error code here to let zsh know that there were no
+                # completions found by _describe; this is what will trigger other
+                # matching algorithms to attempt to find completions.
+                # For example zsh can match letters in the middle of words.
+                return 1
+            else
+                # Perform file completion
+                __git-profile_debug "Activating file completion"
+
+                # We must return the result of this command, so it must be the
+                # last command, or else we must store its result to return it.
+                _arguments '*:filename:_files'" ${flagPrefix}"
+            fi
+        fi
+    fi
+}
+
+# don't run the completion function when being source-ed or eval-ed
+if [ "$funcstack[1]" = "_git-profile" ]; then
+    _git-profile
+fi

config/zsh/completion/git-profile

@@ -0,0 +1,177 @@
+#compdef _git-profile git-profile
+
+# zsh completion for git-profile                          -*- shell-script -*-
+
+__git-profile_debug()
+{
+    local file="$BASH_COMP_DEBUG_FILE"
+    if [[ -n ${file} ]]; then
+        echo "$*" >> "${file}"
+    fi
+}
+
+_git-profile()
+{
+    local shellCompDirectiveError=1
+    local shellCompDirectiveNoSpace=2
+    local shellCompDirectiveNoFileComp=4
+    local shellCompDirectiveFilterFileExt=8
+    local shellCompDirectiveFilterDirs=16
+
+    local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace
+    local -a completions
+
+    __git-profile_debug "\n========= starting completion logic =========="
+    __git-profile_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}"
+
+    # The user could have moved the cursor backwards on the command-line.
+    # We need to trigger completion from the $CURRENT location, so we need
+    # to truncate the command-line ($words) up to the $CURRENT location.
+    # (We cannot use $CURSOR as its value does not work when a command is an alias.)
+    words=("${=words[1,CURRENT]}")
+    __git-profile_debug "Truncated words[*]: ${words[*]},"
+
+    lastParam=${words[-1]}
+    lastChar=${lastParam[-1]}
+    __git-profile_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
+
+    # For zsh, when completing a flag with an = (e.g., git-profile -n=<TAB>)
+    # completions must be prefixed with the flag
+    setopt local_options BASH_REMATCH
+    if [[ "${lastParam}" =~ '-.*=' ]]; then
+        # We are dealing with a flag with an =
+        flagPrefix="-P ${BASH_REMATCH}"
+    fi
+
+    # Prepare the command to obtain completions
+    requestComp="${words[1]} __complete ${words[2,-1]}"
+    if [ "${lastChar}" = "" ]; then
+        # If the last parameter is complete (there is a space following it)
+        # We add an extra empty parameter so we can indicate this to the go completion code.
+        __git-profile_debug "Adding extra empty parameter"
+        requestComp="${requestComp} \"\""
+    fi
+
+    __git-profile_debug "About to call: eval ${requestComp}"
+
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 2>/dev/null)
+    __git-profile_debug "completion output: ${out}"
+
+    # Extract the directive integer following a : from the last line
+    local lastLine
+    while IFS='\n' read -r line; do
+        lastLine=${line}
+    done < <(printf "%s\n" "${out[@]}")
+    __git-profile_debug "last line: ${lastLine}"
+
+    if [ "${lastLine[1]}" = : ]; then
+        directive=${lastLine[2,-1]}
+        # Remove the directive including the : and the newline
+        local suffix
+        (( suffix=${#lastLine}+2))
+        out=${out[1,-$suffix]}
+    else
+        # There is no directive specified.  Leave $out as is.
+        __git-profile_debug "No directive found.  Setting do default"
+        directive=0
+    fi
+
+    __git-profile_debug "directive: ${directive}"
+    __git-profile_debug "completions: ${out}"
+    __git-profile_debug "flagPrefix: ${flagPrefix}"
+
+    if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
+        __git-profile_debug "Completion received error. Ignoring completions."
+        return
+    fi
+
+    while IFS='\n' read -r comp; do
+        if [ -n "$comp" ]; then
+            # If requested, completions are returned with a description.
+            # The description is preceded by a TAB character.
+            # For zsh's _describe, we need to use a : instead of a TAB.
+            # We first need to escape any : as part of the completion itself.
+            comp=${comp//:/\\:}
+
+            local tab=$(printf '\t')
+            comp=${comp//$tab/:}
+
+            __git-profile_debug "Adding completion: ${comp}"
+            completions+=${comp}
+            lastComp=$comp
+        fi
+    done < <(printf "%s\n" "${out[@]}")
+
+    if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then
+        __git-profile_debug "Activating nospace."
+        noSpace="-S ''"
+    fi
+
+    if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then
+        # File extension filtering
+        local filteringCmd
+        filteringCmd='_files'
+        for filter in ${completions[@]}; do
+            if [ ${filter[1]} != '*' ]; then
+                # zsh requires a glob pattern to do file filtering
+                filter="\*.$filter"
+            fi
+            filteringCmd+=" -g $filter"
+        done
+        filteringCmd+=" ${flagPrefix}"
+
+        __git-profile_debug "File filtering command: $filteringCmd"
+        _arguments '*:filename:'"$filteringCmd"
+    elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then
+        # File completion for directories only
+        local subdir
+        subdir="${completions[1]}"
+        if [ -n "$subdir" ]; then
+            __git-profile_debug "Listing directories in $subdir"
+            pushd "${subdir}" >/dev/null 2>&1
+        else
+            __git-profile_debug "Listing directories in ."
+        fi
+
+        local result
+        _arguments '*:dirname:_files -/'" ${flagPrefix}"
+        result=$?
+        if [ -n "$subdir" ]; then
+            popd >/dev/null 2>&1
+        fi
+        return $result
+    else
+        __git-profile_debug "Calling _describe"
+        if eval _describe "completions" completions $flagPrefix $noSpace; then
+            __git-profile_debug "_describe found some completions"
+
+            # Return the success of having called _describe
+            return 0
+        else
+            __git-profile_debug "_describe did not find completions."
+            __git-profile_debug "Checking if we should do file completion."
+            if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
+                __git-profile_debug "deactivating file completion"
+
+                # We must return an error code here to let zsh know that there were no
+                # completions found by _describe; this is what will trigger other
+                # matching algorithms to attempt to find completions.
+                # For example zsh can match letters in the middle of words.
+                return 1
+            else
+                # Perform file completion
+                __git-profile_debug "Activating file completion"
+
+                # We must return the result of this command, so it must be the
+                # last command, or else we must store its result to return it.
+                _arguments '*:filename:_files'" ${flagPrefix}"
+            fi
+        fi
+    fi
+}
+
+# don't run the completion function when being source-ed or eval-ed
+if [ "$funcstack[1]" = "_git-profile" ]; then
+    _git-profile
+fi

config/zsh/plugins/nvm-auto-use/nvm-auto-use.plugin.zsh

@@ -0,0 +1,27 @@
+# shellcheck shell=zsh
+# Source: https://github.com/nvm-sh/nvm#zsh
+# place this after nvm initialization!
+autoload -U add-zsh-hook
+
+load-nvmrc() {
+  local nvmrc_path
+  nvmrc_path="$(nvm_find_nvmrc)"
+
+  if [ -n "$nvmrc_path" ]; then
+    local nvmrc_node_version
+    nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
+
+    if [ "$nvmrc_node_version" = "N/A" ]; then
+      nvm install
+    elif [ "$nvmrc_node_version" != "$(nvm version)" ]; then
+      nvm use
+    fi
+  elif [ -n "$(PWD=$OLDPWD nvm_find_nvmrc)" ] && [ "$(nvm version)" != "$(nvm version default)" ]; then
+    echo "Reverting to nvm default version"
+    nvm use default
+  fi
+}
+
+add-zsh-hook chpwd load-nvmrc
+load-nvmrc
+

docs/nvim-keybindings.md

@@ -0,0 +1,220 @@
+# nvim keybindings
+
+```md
+n  !           * <Cmd>lua require("which-key").show("!", {mode = "n", auto = true})<CR>
+n  '           * <Cmd>lua require("which-key").show("'", {mode = "n", auto = true})<CR>
+n  "           * <Cmd>lua require("which-key").show("\"", {mode = "n", auto = true})<CR>
+n  [           * <Cmd>lua require("which-key").show("[", {mode = "n", auto = true})<CR>
+n  [b          * <Lua 246: ~/.config/nvim/lua/astronvim/mappings.lua:54> Previous buffer
+n  [g          * <Lua 277: ~/.config/nvim/lua/astronvim/mappings.lua:150> Previous Git hunk
+n  [t          * <Lua 281: ~/.config/nvim/lua/astronvim/mappings.lua:120> Previous tab
+n  ]           * <Cmd>lua require("which-key").show("]", {mode = "n", auto = true})<CR>
+n  ]b          * <Lua 250: ~/.config/nvim/lua/astronvim/mappings.lua:52> Next buffer
+n  ]g          * <Lua 278: ~/.config/nvim/lua/astronvim/mappings.lua:149> Next Git hunk
+n  ]t          * <Lua 282: ~/.config/nvim/lua/astronvim/mappings.lua:119> Next tab
+n  @           * <Cmd>lua require("which-key").show("@", {mode = "n", auto = true})<CR>
+n  \           * <Cmd>split<CR> Horizontal Split
+n  &           * :&&<CR> Nvim builtin
+n  `* <Cmd>lua require("which-key").show("`", {mode = "n", auto = true})<CR>
+n  <           * <Cmd>lua require("which-key").show("<", {mode = "n", auto = true})<CR>
+n  <b          * <Lua 297: ~/.config/nvim/lua/astronvim/mappings.lua:62> Move buffer tab left
+n  <C-'>       * <Cmd>ToggleTerm<CR> Toggle terminal
+n  <C-Down>    * <Lua 263: ~/.config/nvim/lua/astronvim/mappings.lua:213> Resize split down
+n  <C-H>       * <Lua 266: ~/.config/nvim/lua/astronvim/mappings.lua:208> Move to left split
+n  <C-J>       * <Lua 283: ~/.config/nvim/lua/astronvim/mappings.lua:209> Move to below split
+n  <C-K>       * <Lua 327: ~/.config/nvim/lua/astronvim/mappings.lua:210> Move to above split
+n  <C-L>       * <Lua 265: ~/.config/nvim/lua/astronvim/mappings.lua:211> Move to right split
+n  <C-Left>    * <Lua 262: ~/.config/nvim/lua/astronvim/mappings.lua:214> Resize split left
+n  <C-N>       * <Lua 79: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Goto next mark
+n  <C-P>       * <Lua 80: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Goto previous mark
+n  <C-Q>       * <Cmd>q!<CR> Force quit
+n  <C-Right>   * <Lua 261: ~/.config/nvim/lua/astronvim/mappings.lua:215> Resize split right
+n  <C-S>       * <Cmd>w!<CR> Force write
+n  <C-Up>      * <Lua 264: ~/.config/nvim/lua/astronvim/mappings.lua:212> Resize split up
+n  <C-W>       * <Cmd>lua require("which-key").show("\23", {mode = "n", auto = true})<CR>
+n  <CR>        *@<Lua 391: ~/.local/share/nvim/lazy/alpha-nvim/lua/alpha.lua:705>
+n  <F10>       * <Lua 348: ~/.config/nvim/lua/astronvim/mappings.lua:353> Debugger: Step Over
+n  <F11>       * <Lua 333: ~/.config/nvim/lua/astronvim/mappings.lua:354> Debugger: Step Into
+n  <F17>       * <Lua 344: ~/.config/nvim/lua/astronvim/mappings.lua:341> Debugger: Stop
+n  <F21>       * <Lua 342: ~/.config/nvim/lua/astronvim/mappings.lua:343> Debugger: Conditional Breakpoint
+n  <F23>       * <Lua 331: ~/.config/nvim/lua/astronvim/mappings.lua:355> Debugger: Step Out
+n  <F29>       * <Lua 334: ~/.config/nvim/lua/astronvim/mappings.lua:350> Debugger: Restart
+n  <F5>        * <Lua 341: ~/.config/nvim/lua/astronvim/mappings.lua:340> Debugger: Start
+n  <F6>        * <Lua 339: ~/.config/nvim/lua/astronvim/mappings.lua:351> Debugger: Pause
+n  <F7>        * <Cmd>ToggleTerm<CR> Toggle terminal
+n  <F9>        * <Lua 337: ~/.config/nvim/lua/astronvim/mappings.lua:352> Debugger: Toggle Breakpoint
+n  <M-CR>      *@<Lua 394: ~/.local/share/nvim/lazy/alpha-nvim/lua/alpha.lua:708>
+n  <Plug>PlenaryTestFile *:lua require('plenary.test_harness').test_directory(vim.fn.expand("%:p"))<CR>
+n  <Space>     * <Cmd>lua require("which-key").show(" ", {mode = "n", auto = true})<CR>
+n  <Space>/    * <Lua 279: ~/.config/nvim/lua/astronvim/mappings.lua:139> Comment line
+n  <Space><Space> * <Lua 49: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Harpoon
+n  <Space><Space>a * <Lua 81: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Add file
+n  <Space><Space>e * <Lua 82: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Toggle quick menu
+n  <Space><Space>j * <Lua 48: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Goto to TMUX tmux window
+n  <Space><Space>m * <Lua 83: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Show marks in Telescope
+n  <Space><Space>t * <Lua 84: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Goto to terminal window
+n  <Space>a    * <Lua 102: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Annotation
+n  <Space>a<CR> * <Lua 103: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Current
+n  <Space>ac   * <Lua 104: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Class
+n  <Space>af   * <Lua 105: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Function
+n  <Space>aF   * <Lua 96: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> File
+n  <Space>at   * <Lua 86: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Type
+n  <Space>b\   * <Lua 285: ~/.config/nvim/lua/astronvim/mappings.lua:100> Horizontal split buffer from tabline
+n  <Space>b|   * <Lua 284: ~/.config/nvim/lua/astronvim/mappings.lua:109> Vertical split buffer from tabline
+n  <Space>bb   * <Lua 294: ~/.config/nvim/lua/astronvim/mappings.lua:71> Select buffer from tabline
+n  <Space>bC   * <Lua 295: ~/.config/nvim/lua/astronvim/mappings.lua:69> Close all buffers
+n  <Space>bc   * <Lua 296: ~/.config/nvim/lua/astronvim/mappings.lua:68> Close all buffers except current
+n  <Space>bd   * <Lua 293: ~/.config/nvim/lua/astronvim/mappings.lua:77> Delete buffer from tabline
+n  <Space>bD   * <Lua 320: ~/.config/astronvim/lua/user/mappings.lua:13> Pick to close
+n  <Space>bl   * <Lua 292: ~/.config/nvim/lua/astronvim/mappings.lua:85> Close all buffers to the left
+n  <Space>bn   * <Cmd>tabnew<CR> New tab
+n  <Space>br   * <Lua 291: ~/.config/nvim/lua/astronvim/mappings.lua:87> Close all buffers to the right
+n  <Space>bse  * <Lua 290: ~/.config/nvim/lua/astronvim/mappings.lua:90> Sort by extension (buffers)
+n  <Space>bsi  * <Lua 287: ~/.config/nvim/lua/astronvim/mappings.lua:96> Sort by buffer number (buffers)
+n  <Space>bsm  * <Lua 286: ~/.config/nvim/lua/astronvim/mappings.lua:98> Sort by modification (buffers)
+n  <Space>bsp  * <Lua 288: ~/.config/nvim/lua/astronvim/mappings.lua:94> Sort by full path (buffers)
+n  <Space>bsr  * <Lua 289: ~/.config/nvim/lua/astronvim/mappings.lua:92> Sort by relative path (buffers)
+n  <Space>C    * <Lua 299: ~/.config/nvim/lua/astronvim/mappings.lua:50> Force close buffer
+n  <Space>c    * <Lua 300: ~/.config/nvim/lua/astronvim/mappings.lua:49> Close buffer
+n  <Space>dB   * <Lua 328: ~/.config/nvim/lua/astronvim/mappings.lua:357> Clear Breakpoints
+n  <Space>db   * <Lua 329: ~/.config/nvim/lua/astronvim/mappings.lua:356> Toggle Breakpoint (F9)
+n  <Space>dC   * <Lua 324: ~/.config/nvim/lua/astronvim/mappings.lua:360> Conditional Breakpoint (S-F9)
+n  <Space>dc   * <Lua 326: ~/.config/nvim/lua/astronvim/mappings.lua:358> Start/Continue (F5)
+n  <Space>dE   * <Lua 308: ~/.config/nvim/lua/astronvim/mappings.lua:379> Evaluate Input
+n  <Space>dh   * <Lua 305: ~/.config/nvim/lua/astronvim/mappings.lua:388> Debugger Hover
+n  <Space>di   * <Lua 323: ~/.config/nvim/lua/astronvim/mappings.lua:367> Step Into (F11)
+n  <Space>dO   * <Lua 321: ~/.config/nvim/lua/astronvim/mappings.lua:369> Step Out (S-F11)
+n  <Space>do   * <Lua 322: ~/.config/nvim/lua/astronvim/mappings.lua:368> Step Over (F10)
+n  <Space>dp   * <Lua 316: ~/.config/nvim/lua/astronvim/mappings.lua:372> Pause (F6)
+n  <Space>dQ   * <Lua 318: ~/.config/nvim/lua/astronvim/mappings.lua:371> Terminate Session (S-F5)
+n  <Space>dq   * <Lua 319: ~/.config/nvim/lua/astronvim/mappings.lua:370> Close Session
+n  <Space>dR   * <Lua 312: ~/.config/nvim/lua/astronvim/mappings.lua:374> Toggle REPL
+n  <Space>dr   * <Lua 314: ~/.config/nvim/lua/astronvim/mappings.lua:373> Restart (C-F5)
+n  <Space>ds   * <Lua 310: ~/.config/nvim/lua/astronvim/mappings.lua:375> Run To Cursor
+n  <Space>du   * <Lua 315: ~/.config/nvim/lua/astronvim/mappings.lua:387> Toggle Debugger UI
+n  <Space>e    * <Cmd>Neotree toggle<CR> Toggle Explorer
+n  <Space>f'   * <Lua 255: ~/.config/nvim/lua/astronvim/mappings.lua:241> Find marks
+n  <Space>f<CR> * <Lua 256: ~/.config/nvim/lua/astronvim/mappings.lua:240> Resume previous search
+n  <Space>fa   * <Lua 254: ~/.config/nvim/lua/astronvim/mappings.lua:243> Find AstroNvim config files
+n  <Space>fb   * <Lua 253: ~/.config/nvim/lua/astronvim/mappings.lua:263> Find buffers
+n  <Space>fC   * <Lua 251: ~/.config/nvim/lua/astronvim/mappings.lua:266> Find commands
+n  <Space>fc   * <Lua 252: ~/.config/nvim/lua/astronvim/mappings.lua:265> Find for word under cursor
+n  <Space>fF   * <Lua 248: ~/.config/nvim/lua/astronvim/mappings.lua:269> Find all files
+n  <Space>ff   * <Lua 249: ~/.config/nvim/lua/astronvim/mappings.lua:267> Find files
+n  <Space>fh   * <Lua 247: ~/.config/nvim/lua/astronvim/mappings.lua:272> Find help
+n  <Space>fk   * <Lua 245: ~/.config/nvim/lua/astronvim/mappings.lua:273> Find keymaps
+n  <Space>fm   * <Lua 309: ~/.config/nvim/lua/astronvim/mappings.lua:274> Find man
+n  <Space>fn   * <Lua 242: ~/.config/nvim/lua/astronvim/mappings.lua:277> Find notifications
+n  <Space>fo   * <Lua 240: ~/.config/nvim/lua/astronvim/mappings.lua:279> Find history
+n  <Space>fr   * <Lua 239: ~/.config/nvim/lua/astronvim/mappings.lua:280> Find registers
+n  <Space>ft   * <Lua 238: ~/.config/nvim/lua/astronvim/mappings.lua:282> Find themes
+n  <Space>fW   * <Lua 236: ~/.config/nvim/lua/astronvim/mappings.lua:285> Find words in all files
+n  <Space>fw   * <Lua 237: ~/.config/nvim/lua/astronvim/mappings.lua:283> Find words
+n  <Space>gb   * <Lua 259: ~/.config/nvim/lua/astronvim/mappings.lua:237> Git branches
+n  <Space>gc   * <Lua 258: ~/.config/nvim/lua/astronvim/mappings.lua:238> Git commits
+n  <Space>gd   * <Lua 268: ~/.config/nvim/lua/astronvim/mappings.lua:159> View Git diff
+n  <Space>gg   * <Lua 304: ~/.config/nvim/lua/astronvim/mappings.lua:312> ToggleTerm lazygit
+n  <Space>gh   * <Lua 273: ~/.config/nvim/lua/astronvim/mappings.lua:154> Reset Git hunk
+n  <Space>gL   * <Lua 275: ~/.config/nvim/lua/astronvim/mappings.lua:152> View full Git blame
+n  <Space>gl   * <Lua 276: ~/.config/nvim/lua/astronvim/mappings.lua:151> View Git blame
+n  <Space>gp   * <Lua 274: ~/.config/nvim/lua/astronvim/mappings.lua:153> Preview Git hunk
+n  <Space>gr   * <Lua 272: ~/.config/nvim/lua/astronvim/mappings.lua:155> Reset Git buffer
+n  <Space>gS   * <Lua 270: ~/.config/nvim/lua/astronvim/mappings.lua:157> Stage Git buffer
+n  <Space>gs   * <Lua 271: ~/.config/nvim/lua/astronvim/mappings.lua:156> Stage Git hunk
+n  <Space>gt   * <Lua 257: ~/.config/nvim/lua/astronvim/mappings.lua:239> Git status
+n  <Space>gu   * <Lua 269: ~/.config/nvim/lua/astronvim/mappings.lua:158> Unstage Git hunk
+n  <Space>h    * <Lua 280: ~/.config/nvim/lua/astronvim/mappings.lua:125> Home Screen
+n  <Space>lD   * <Lua 313: ~/.config/nvim/lua/astronvim/mappings.lua:293> Search diagnostics
+n  <Space>ls   * <Lua 235: ~/.config/nvim/lua/astronvim/mappings.lua:295> Search symbols
+n  <Space>lS   * <Lua 260: ~/.config/nvim/lua/astronvim/mappings.lua:230> Symbols outline
+n  <Space>n    * <Cmd>enew<CR> New File
+n  <Space>o    * <Lua 267: ~/.config/nvim/lua/astronvim/mappings.lua:166> Toggle Explorer Focus
+n  <Space>p    * <Cmd>lua require("which-key").show(" p", {mode = "n", auto = true})<CR>
+n  <Space>pA   * <Cmd>AstroUpdate<CR> AstroNvim Update
+n  <Space>pa   * <Cmd>AstroUpdatePackages<CR> Update Plugins and Mason
+n  <Space>pi   * <Lua 307: ~/.config/nvim/lua/astronvim/mappings.lua:36> Plugins Install
+n  <Space>pl   * <Cmd>AstroChangelog<CR> AstroNvim Changelog
+n  <Space>pm   * <Cmd>Mason<CR> Mason Installer
+n  <Space>pM   * <Cmd>MasonUpdateAll<CR> Mason Update
+n  <Space>pS   * <Lua 233: ~/.config/nvim/lua/astronvim/mappings.lua:38> Plugins Sync
+n  <Space>ps   * <Lua 234: ~/.config/nvim/lua/astronvim/mappings.lua:37> Plugins Status
+n  <Space>pU   * <Lua 229: ~/.config/nvim/lua/astronvim/mappings.lua:40> Plugins Update
+n  <Space>pu   * <Lua 231: ~/.config/nvim/lua/astronvim/mappings.lua:39> Plugins Check Updates
+n  <Space>pv   * <Cmd>AstroVersion<CR> AstroNvim Version
+n  <Space>q    * <Cmd>confirm q<CR> Quit
+n  <Space>s    * <Lua 45: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Search / Replace
+n  <Space>S.   * <Cmd>SessionManager! load_current_dir_session<CR> Load current directory session
+n  <Space>Sd   * <Cmd>SessionManager! delete_session<CR> Delete session
+n  <Space>Sf   * <Cmd>SessionManager! load_session<CR> Search sessions
+n  <Space>sf   * <Lua 36: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Spectre (current file)
+n  <Space>Sl   * <Cmd>SessionManager! load_last_session<CR> Load last session
+n  <Space>Ss   * <Cmd>SessionManager! save_current_session<CR> Save this session
+n  <Space>ss   * <Lua 35: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Spectre
+n  <Space>tf   * <Cmd>ToggleTerm direction=float<CR> ToggleTerm float
+n  <Space>th   * <Cmd>ToggleTerm size=10 direction=horizontal<CR> ToggleTerm horizontal split
+n  <Space>tl   * <Lua 232: ~/.config/nvim/lua/astronvim/mappings.lua:313> ToggleTerm lazygit
+n  <Space>tn   * <Lua 230: ~/.config/nvim/lua/astronvim/mappings.lua:316> ToggleTerm node
+n  <Space>tp   * <Lua 311: ~/.config/nvim/lua/astronvim/mappings.lua:325> ToggleTerm python
+n  <Space>tt   * <Lua 306: ~/.config/nvim/lua/astronvim/mappings.lua:322> ToggleTerm btm
+n  <Space>tu   * <Lua 355: ~/.config/nvim/lua/astronvim/mappings.lua:319> ToggleTerm gdu
+n  <Space>tv   * <Cmd>ToggleTerm size=80 direction=vertical<CR> ToggleTerm vertical split
+n  <Space>ua   * <Lua 350: ~/.config/nvim/lua/astronvim/utils/ui.lua:27> Toggle autopairs
+n  <Space>ub   * <Lua 303: ~/.config/nvim/lua/astronvim/utils/ui.lua:58> Toggle background
+n  <Space>uC   * <Cmd>ColorizerToggle<CR> Toggle color highlight
+n  <Space>uc   * <Lua 354: ~/.config/nvim/lua/astronvim/utils/ui.lua:64> Toggle autocompletion
+n  <Space>ud   * <Lua 353: ~/.config/nvim/lua/astronvim/utils/ui.lua:43> Toggle diagnostics
+n  <Space>ug   * <Lua 301: ~/.config/nvim/lua/astronvim/utils/ui.lua:134> Toggle signcolumn
+n  <Space>uh   * <Lua 352: ~/.config/nvim/lua/astronvim/utils/ui.lua:215> Toggle foldcolumn
+n  <Space>ui   * <Lua 325: ~/.config/nvim/lua/astronvim/utils/ui.lua:146> Change indent setting
+n  <Space>ul   * <Lua 330: ~/.config/nvim/lua/astronvim/utils/ui.lua:117> Toggle statusline
+n  <Space>uL   * <Lua 345: ~/.config/nvim/lua/astronvim/utils/ui.lua:98> Toggle CodeLens
+n  <Space>uN   * <Lua 340: ~/.config/nvim/lua/astronvim/utils/ui.lua:21> Toggle UI notifications
+n  <Space>un   * <Lua 343: ~/.config/nvim/lua/astronvim/utils/ui.lua:161> Change line numbering
+n  <Space>up   * <Lua 338: ~/.config/nvim/lua/astronvim/utils/ui.lua:183> Toggle paste mode
+n  <Space>uS   * <Lua 332: ~/.config/nvim/lua/astronvim/utils/ui.lua:111> Toggle conceal
+n  <Space>us   * <Lua 335: ~/.config/nvim/lua/astronvim/utils/ui.lua:177> Toggle spellcheck
+n  <Space>uT   * <Cmd>TransparentToggle<CR> Toggle transparency
+n  <Space>ut   * <Lua 302: ~/.config/nvim/lua/astronvim/utils/ui.lua:105> Toggle tabline
+n  <Space>uu   * <Lua 351: ~/.config/nvim/lua/astronvim/utils/ui.lua:208> Toggle URL highlight
+n  <Space>uw   * <Lua 349: ~/.config/nvim/lua/astronvim/utils/ui.lua:189> Toggle wrap
+n  <Space>uy   * <Lua 346: ~/.config/nvim/lua/astronvim/utils/ui.lua:195> Toggle syntax highlight
+n  <Space>w    * <Cmd>w<CR> Save
+n  <Space>x    * <Lua 126: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Trouble
+n  <Space>xl   * <Lua 171: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Location List (Trouble)
+n  <Space>xq   * <Lua 172: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Quickfix List (Trouble)
+n  <Space>xX   * <Lua 132: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Workspace Diagnostics (Trouble)
+n  <Space>xx   * <Lua 170: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Document Diagnostics (Trouble)
+n  >           * <Cmd>lua require("which-key").show(">", {mode = "n", auto = true})<CR>
+n  >b          * <Lua 298: ~/.config/nvim/lua/astronvim/mappings.lua:58> Move buffer tab right
+n  |           * <Cmd>vsplit<CR> Vertical Split
+n  c           * <Cmd>lua require("which-key").show("c", {mode = "n", auto = true})<CR>
+n  d           * <Cmd>lua require("which-key").show("d", {mode = "n", auto = true})<CR>
+n  g           * <Cmd>lua require("which-key").show("g", {mode = "n", auto = true})<CR>
+n  gb          * <Lua 123: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Comment toggle blockwise
+n  gc          * <Lua 107: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Comment toggle linewise
+n  gx          * <Lua 241: ~/.config/nvim/lua/astronvim/utils/init.lua:134> Open the file under cursor with system app
+n  j           * v:count == 0 ? 'gj' : 'j' Move cursor down
+n  k           * v:count == 0 ? 'gk' : 'k' Move cursor up
+n  v           * <Cmd>lua require("which-key").show("v", {mode = "n", auto = true})<CR>
+n  y           * <Cmd>lua require("which-key").show("y", {mode = "n", auto = true})<CR>
+n  Y           * y$ Nvim builtin
+n  z           * <Cmd>lua require("which-key").show("z", {mode = "n", auto = true})<CR>
+n  zM          * <Lua 244: ~/.config/nvim/lua/astronvim/mappings.lua:395> Close all folds
+n  zm          * <Lua 317: ~/.config/nvim/lua/astronvim/mappings.lua:397> Fold more
+n  zp          * <Lua 347: ~/.config/nvim/lua/astronvim/mappings.lua:398> Peek fold
+n  zr          * <Lua 243: ~/.config/nvim/lua/astronvim/mappings.lua:396> Fold less
+n  zR          * <Lua 336: ~/.config/nvim/lua/astronvim/mappings.lua:394> Open all folds
+v  <Tab>       * >gv indent line
+v  <S-Tab>     * <gv unindent line
+v  <Space>/    * <Esc><Cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR> Toggle comment line
+v  <Space>dE   * <Lua 228: ~/.config/nvim/lua/astronvim/mappings.lua:386> Evaluate Input
+v  gb          * <Lua 124: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Comment toggle blockwise
+v  gc          * <Lua 114: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Comment toggle linewise
+x  "           * <Cmd>lua require("which-key").show("\"", {mode = "v", auto = true})<CR>
+x  ** y/\V<C-R>"<CR> Nvim builtin
+x  #           * y?\V<C-R>"<CR> Nvim builtin
+x  <Space>     * <Cmd>lua require("which-key").show(" ", {mode = "v", auto = true})<CR>
+x  <Space>s    * <Lua 46: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Search / Replace
+x  <Space>sw   * <Lua 47: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:67> Spectre (current word)
+x  g           * <Cmd>lua require("which-key").show("g", {mode = "v", auto = true})<CR>
+```

docs/tmux-keybindings.md

@@ -0,0 +1,321 @@
+# tmux keybindings
+
+
+Leader: `<ctrl><space>`
+
+
+```
+bind-key    -T copy-mode    C-Space              send-keys -X begin-selection
+bind-key    -T copy-mode    C-a                  send-keys -X start-of-line
+bind-key    -T copy-mode    C-b                  send-keys -X cursor-left
+bind-key    -T copy-mode    C-c                  send-keys -X cancel
+bind-key    -T copy-mode    C-e                  send-keys -X end-of-line
+bind-key    -T copy-mode    C-f                  send-keys -X cursor-right
+bind-key    -T copy-mode    C-g                  send-keys -X clear-selection
+bind-key    -T copy-mode    C-k                  send-keys -X copy-pipe-end-of-line-and-cancel
+bind-key    -T copy-mode    C-n                  send-keys -X cursor-down
+bind-key    -T copy-mode    C-p                  send-keys -X cursor-up
+bind-key    -T copy-mode    C-r                  command-prompt -i -I "#{pane_search_string}" -T search -p "(search up)" { send-keys -X search-backward-incremental "%%" }
+bind-key    -T copy-mode    C-s                  command-prompt -i -I "#{pane_search_string}" -T search -p "(search down)" { send-keys -X search-forward-incremental "%%" }
+bind-key    -T copy-mode    C-v                  send-keys -X page-down
+bind-key    -T copy-mode    C-w                  send-keys -X copy-pipe-and-cancel
+bind-key    -T copy-mode    Escape               send-keys -X cancel
+bind-key    -T copy-mode    Space                send-keys -X page-down
+bind-key    -T copy-mode    !                    send-keys -X copy-pipe-and-cancel "tr -d '
+' | pbcopy"
+bind-key    -T copy-mode    ,                    send-keys -X jump-reverse
+bind-key    -T copy-mode    \;                   send-keys -X jump-again
+bind-key    -T copy-mode    F                    command-prompt -1 -p "(jump backward)" { send-keys -X jump-backward "%%" }
+bind-key    -T copy-mode    N                    send-keys -X search-reverse
+bind-key    -T copy-mode    P                    send-keys -X toggle-position
+bind-key    -T copy-mode    R                    send-keys -X rectangle-toggle
+bind-key    -T copy-mode    T                    command-prompt -1 -p "(jump to backward)" { send-keys -X jump-to-backward "%%" }
+bind-key    -T copy-mode    X                    send-keys -X set-mark
+bind-key    -T copy-mode    Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer -p"
+bind-key    -T copy-mode    f                    command-prompt -1 -p "(jump forward)" { send-keys -X jump-forward "%%" }
+bind-key    -T copy-mode    g                    command-prompt -p "(goto line)" { send-keys -X goto-line "%%" }
+bind-key    -T copy-mode    n                    send-keys -X search-again
+bind-key    -T copy-mode    q                    send-keys -X cancel
+bind-key    -T copy-mode    r                    send-keys -X refresh-from-pane
+bind-key    -T copy-mode    t                    command-prompt -1 -p "(jump to forward)" { send-keys -X jump-to-forward "%%" }
+bind-key    -T copy-mode    y                    send-keys -X copy-pipe-and-cancel pbcopy
+bind-key    -T copy-mode    MouseDown1Pane       select-pane
+bind-key    -T copy-mode    MouseDrag1Pane       select-pane \; send-keys -X begin-selection
+bind-key    -T copy-mode    MouseDragEnd1Pane    send-keys -X copy-pipe-and-cancel pbcopy
+bind-key    -T copy-mode    WheelUpPane          select-pane \; send-keys -X -N 5 scroll-up
+bind-key    -T copy-mode    WheelDownPane        select-pane \; send-keys -X -N 5 scroll-down
+bind-key    -T copy-mode    DoubleClick1Pane     select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
+bind-key    -T copy-mode    TripleClick1Pane     select-pane \; send-keys -X select-line \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
+bind-key    -T copy-mode    Home                 send-keys -X start-of-line
+bind-key    -T copy-mode    End                  send-keys -X end-of-line
+bind-key    -T copy-mode    NPage                send-keys -X page-down
+bind-key    -T copy-mode    PPage                send-keys -X page-up
+bind-key    -T copy-mode    Up                   send-keys -X cursor-up
+bind-key    -T copy-mode    Down                 send-keys -X cursor-down
+bind-key    -T copy-mode    Left                 send-keys -X cursor-left
+bind-key    -T copy-mode    Right                send-keys -X cursor-right
+bind-key    -T copy-mode    M-C-b                send-keys -X previous-matching-bracket
+bind-key    -T copy-mode    M-C-f                send-keys -X next-matching-bracket
+bind-key    -T copy-mode    M-1                  command-prompt -N -I 1 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode    M-2                  command-prompt -N -I 2 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode    M-3                  command-prompt -N -I 3 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode    M-4                  command-prompt -N -I 4 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode    M-5                  command-prompt -N -I 5 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode    M-6                  command-prompt -N -I 6 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode    M-7                  command-prompt -N -I 7 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode    M-8                  command-prompt -N -I 8 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode    M-9                  command-prompt -N -I 9 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode    M-<                  send-keys -X history-top
+bind-key    -T copy-mode    M->                  send-keys -X history-bottom
+bind-key    -T copy-mode    M-R                  send-keys -X top-line
+bind-key    -T copy-mode    M-b                  send-keys -X previous-word
+bind-key    -T copy-mode    M-f                  send-keys -X next-word-end
+bind-key    -T copy-mode    M-m                  send-keys -X back-to-indentation
+bind-key    -T copy-mode    M-r                  send-keys -X middle-line
+bind-key    -T copy-mode    M-v                  send-keys -X page-up
+bind-key    -T copy-mode    M-w                  send-keys -X copy-pipe-and-cancel
+bind-key    -T copy-mode    M-x                  send-keys -X jump-to-mark
+bind-key    -T copy-mode    M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer -p"
+bind-key    -T copy-mode    "M-{"                send-keys -X previous-paragraph
+bind-key    -T copy-mode    "M-}"                send-keys -X next-paragraph
+bind-key    -T copy-mode    M-Up                 send-keys -X halfpage-up
+bind-key    -T copy-mode    M-Down               send-keys -X halfpage-down
+bind-key    -T copy-mode    C-Up                 send-keys -X scroll-up
+bind-key    -T copy-mode    C-Down               send-keys -X scroll-down
+bind-key    -T copy-mode-vi C-b                  send-keys -X page-up
+bind-key    -T copy-mode-vi C-c                  send-keys -X cancel
+bind-key    -T copy-mode-vi C-d                  send-keys -X halfpage-down
+bind-key    -T copy-mode-vi C-e                  send-keys -X scroll-down
+bind-key    -T copy-mode-vi C-f                  send-keys -X page-down
+bind-key    -T copy-mode-vi C-h                  select-pane -L
+bind-key    -T copy-mode-vi C-j                  select-pane -D
+bind-key    -T copy-mode-vi C-k                  select-pane -U
+bind-key    -T copy-mode-vi C-l                  select-pane -R
+bind-key    -T copy-mode-vi Enter                send-keys -X copy-pipe-and-cancel
+bind-key    -T copy-mode-vi C-u                  send-keys -X halfpage-up
+bind-key    -T copy-mode-vi C-v                  send-keys -X rectangle-toggle
+bind-key    -T copy-mode-vi C-y                  send-keys -X scroll-up
+bind-key    -T copy-mode-vi Escape               send-keys -X clear-selection
+bind-key    -T copy-mode-vi C-\                 select-pane -l
+bind-key    -T copy-mode-vi Space                send-keys -X begin-selection
+bind-key    -T copy-mode-vi !                    send-keys -X copy-pipe-and-cancel "tr -d '
+' | pbcopy"
+bind-key    -T copy-mode-vi \#                   send-keys -FX search-backward "#{copy_cursor_word}"
+bind-key    -T copy-mode-vi \$                   send-keys -X end-of-line
+bind-key    -T copy-mode-vi \%                   send-keys -X next-matching-bracket
+bind-key    -T copy-mode-vi *                    send-keys -FX search-forward "#{copy_cursor_word}"
+bind-key    -T copy-mode-vi ,                    send-keys -X jump-reverse
+bind-key    -T copy-mode-vi /                    command-prompt -T search -p "(search down)" { send-keys -X search-forward "%%" }
+bind-key    -T copy-mode-vi 0                    send-keys -X start-of-line
+bind-key    -T copy-mode-vi 1                    command-prompt -N -I 1 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode-vi 2                    command-prompt -N -I 2 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode-vi 3                    command-prompt -N -I 3 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode-vi 4                    command-prompt -N -I 4 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode-vi 5                    command-prompt -N -I 5 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode-vi 6                    command-prompt -N -I 6 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode-vi 7                    command-prompt -N -I 7 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode-vi 8                    command-prompt -N -I 8 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode-vi 9                    command-prompt -N -I 9 -p (repeat) { send-keys -N "%%" }
+bind-key    -T copy-mode-vi :                    command-prompt -p "(goto line)" { send-keys -X goto-line "%%" }
+bind-key    -T copy-mode-vi \;                   send-keys -X jump-again
+bind-key    -T copy-mode-vi ?                    command-prompt -T search -p "(search up)" { send-keys -X search-backward "%%" }
+bind-key    -T copy-mode-vi A                    send-keys -X append-selection-and-cancel
+bind-key    -T copy-mode-vi B                    send-keys -X previous-space
+bind-key    -T copy-mode-vi D                    send-keys -X copy-pipe-end-of-line-and-cancel
+bind-key    -T copy-mode-vi E                    send-keys -X next-space-end
+bind-key    -T copy-mode-vi F                    command-prompt -1 -p "(jump backward)" { send-keys -X jump-backward "%%" }
+bind-key    -T copy-mode-vi G                    send-keys -X history-bottom
+bind-key    -T copy-mode-vi H                    send-keys -X top-line
+bind-key    -T copy-mode-vi J                    send-keys -X scroll-down
+bind-key    -T copy-mode-vi K                    send-keys -X scroll-up
+bind-key    -T copy-mode-vi L                    send-keys -X bottom-line
+bind-key    -T copy-mode-vi M                    send-keys -X middle-line
+bind-key    -T copy-mode-vi N                    send-keys -X search-reverse
+bind-key    -T copy-mode-vi P                    send-keys -X toggle-position
+bind-key    -T copy-mode-vi T                    command-prompt -1 -p "(jump to backward)" { send-keys -X jump-to-backward "%%" }
+bind-key    -T copy-mode-vi V                    send-keys -X select-line
+bind-key    -T copy-mode-vi W                    send-keys -X next-space
+bind-key    -T copy-mode-vi X                    send-keys -X set-mark
+bind-key    -T copy-mode-vi Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer -p"
+bind-key    -T copy-mode-vi ^                    send-keys -X back-to-indentation
+bind-key    -T copy-mode-vi b                    send-keys -X previous-word
+bind-key    -T copy-mode-vi e                    send-keys -X next-word-end
+bind-key    -T copy-mode-vi f                    command-prompt -1 -p "(jump forward)" { send-keys -X jump-forward "%%" }
+bind-key    -T copy-mode-vi g                    send-keys -X history-top
+bind-key    -T copy-mode-vi h                    send-keys -X cursor-left
+bind-key    -T copy-mode-vi j                    send-keys -X cursor-down
+bind-key    -T copy-mode-vi k                    send-keys -X cursor-up
+bind-key    -T copy-mode-vi l                    send-keys -X cursor-right
+bind-key    -T copy-mode-vi n                    send-keys -X search-again
+bind-key    -T copy-mode-vi o                    send-keys -X other-end
+bind-key    -T copy-mode-vi q                    send-keys -X cancel
+bind-key    -T copy-mode-vi r                    send-keys -X refresh-from-pane
+bind-key    -T copy-mode-vi t                    command-prompt -1 -p "(jump to forward)" { send-keys -X jump-to-forward "%%" }
+bind-key    -T copy-mode-vi v                    send-keys -X begin-selection
+bind-key    -T copy-mode-vi w                    send-keys -X next-word
+bind-key    -T copy-mode-vi y                    send-keys -X copy-pipe-and-cancel pbcopy
+bind-key    -T copy-mode-vi \{                   send-keys -X previous-paragraph
+bind-key    -T copy-mode-vi \}                   send-keys -X next-paragraph
+bind-key    -T copy-mode-vi MouseDown1Pane       select-pane
+bind-key    -T copy-mode-vi MouseDrag1Pane       select-pane \; send-keys -X begin-selection
+bind-key    -T copy-mode-vi MouseDragEnd1Pane    send-keys -X copy-pipe-and-cancel pbcopy
+bind-key    -T copy-mode-vi WheelUpPane          select-pane \; send-keys -X -N 5 scroll-up
+bind-key    -T copy-mode-vi WheelDownPane        select-pane \; send-keys -X -N 5 scroll-down
+bind-key    -T copy-mode-vi DoubleClick1Pane     select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
+bind-key    -T copy-mode-vi TripleClick1Pane     select-pane \; send-keys -X select-line \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
+bind-key    -T copy-mode-vi BSpace               send-keys -X cursor-left
+bind-key    -T copy-mode-vi NPage                send-keys -X page-down
+bind-key    -T copy-mode-vi PPage                send-keys -X page-up
+bind-key    -T copy-mode-vi Up                   send-keys -X cursor-up
+bind-key    -T copy-mode-vi Down                 send-keys -X cursor-down
+bind-key    -T copy-mode-vi Left                 send-keys -X cursor-left
+bind-key    -T copy-mode-vi Right                send-keys -X cursor-right
+bind-key    -T copy-mode-vi M-x                  send-keys -X jump-to-mark
+bind-key    -T copy-mode-vi M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer -p"
+bind-key    -T copy-mode-vi C-Up                 send-keys -X scroll-up
+bind-key    -T copy-mode-vi C-Down               send-keys -X scroll-down
+bind-key    -T join-pane    \"                   run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-v'"
+bind-key    -T join-pane    \%                   run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-h'"
+bind-key    -T join-pane    -                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-v'"
+bind-key    -T join-pane    @                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-b'"
+bind-key    -T join-pane    f                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-b'"
+bind-key    -T join-pane    h                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-h'"
+bind-key    -T join-pane    v                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-v'"
+bind-key    -T join-pane    |                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-h'"
+bind-key    -T prefix       C-Space              run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/promote_window.sh '#{session_name}' '#{window_id}' '#{window_name}' '#{pane_current_path}'"
+bind-key    -T prefix       Enter                run-shell -b "/Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/notify.sh false true"
+bind-key    -T prefix       C-n                  next-window
+bind-key    -T prefix       C-o                  rotate-window
+bind-key    -T prefix       C-p                  previous-window
+bind-key    -T prefix       C-r                  run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-resurrect/scripts/restore.sh
+bind-key    -T prefix       C-s                  run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-resurrect/scripts/save.sh
+bind-key    -T prefix       C-z                  suspend-client
+bind-key    -T prefix       Escape               copy-mode
+bind-key    -T prefix       Space                next-layout
+bind-key    -T prefix       !                    split-window -h -c "#{pane_current_path}"
+bind-key    -T prefix       \"                   split-window -v -c "#{pane_current_path}"
+bind-key    -T prefix       \#                   list-buffers
+bind-key    -T prefix       \$                   command-prompt -I "#S" { rename-session "%%" }
+bind-key    -T prefix       \%                   split-window -h -c "#{pane_current_path}"
+bind-key    -T prefix       &                    confirm-before -p "kill-window #W? (y/n)" kill-window
+bind-key    -T prefix       \'                   command-prompt -T window-target -p index { select-window -t ":%%" }
+bind-key    -T prefix       (                    switch-client -p
+bind-key    -T prefix       )                    switch-client -n
+bind-key    -T prefix       ,                    command-prompt -I "#W" { rename-window "%%" }
+bind-key    -T prefix       -                    delete-buffer
+bind-key    -T prefix       .                    command-prompt -T target { move-window -t "%%" }
+bind-key    -T prefix       /                    command-prompt -k -p key { list-keys -1N "%%" }
+bind-key    -T prefix       0                    select-window -t :=0
+bind-key    -T prefix       1                    select-window -t :=1
+bind-key    -T prefix       2                    select-window -t :=2
+bind-key    -T prefix       3                    select-window -t :=3
+bind-key    -T prefix       4                    select-window -t :=4
+bind-key    -T prefix       5                    select-window -t :=5
+bind-key    -T prefix       6                    select-window -t :=6
+bind-key    -T prefix       7                    select-window -t :=7
+bind-key    -T prefix       8                    select-window -t :=8
+bind-key    -T prefix       9                    select-window -t :=9
+bind-key    -T prefix       :                    command-prompt
+bind-key    -T prefix       \;                   last-pane
+bind-key    -T prefix       <                    display-menu -T "#[align=centre]#{window_index}:#{window_name}" -x W -y W "#{?#{>:#{session_windows},1},,-}Swap Left" l { swap-window -t :-1 } "#{?#{>:#{session_windows},1},,-}Swap Right" r { swap-window -t :+1 } "#{?pane_marked_set,,-}Swap Marked" s { swap-window } '' Kill X { kill-window } Respawn R { respawn-window -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } Rename n { command-prompt -F -I "#W" { rename-window -t "#{window_id}" "%%" } } '' "New After" w { new-window -a } "New At End" W { new-window }
+bind-key    -T prefix       =                    choose-buffer -Z
+bind-key    -T prefix       >                    display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -x P -y P "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z }
+bind-key    -T prefix       ?                    list-keys -N
+bind-key    -T prefix       @                    run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/promote_pane.sh '#{session_name}' '#{pane_id}' '#{pane_current_path}'"
+bind-key    -T prefix       C                    run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/new_session_prompt.sh
+bind-key    -T prefix       D                    choose-client -Z
+bind-key    -T prefix       E                    select-layout -E
+bind-key    -T prefix       I                    run-shell /Users/ivuorinen/.config/tmux/plugins/tpm/bindings/install_plugins
+bind-key    -T prefix       L                    switch-client -l
+bind-key    -T prefix       M                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/cancel.sh
+bind-key    -T prefix       N                    new-window
+bind-key    -T prefix       R                    run-shell " 			tmux source-file /Users/ivuorinen/.config/tmux/tmux.conf > /dev/null; 			tmux display-message 'Sourced /Users/ivuorinen/.config/tmux/tmux.conf!'"
+bind-key    -T prefix       S                    switch-client -l
+bind-key    -T prefix       U                    run-shell /Users/ivuorinen/.config/tmux/plugins/tpm/bindings/update_plugins
+bind-key    -T prefix       X                    run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/kill_session_prompt.sh '#{session_name}' '#{session_id}'"
+bind-key    -T prefix       Y                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-yank/scripts/copy_pane_pwd.sh
+bind-key    -T prefix       ]                    paste-buffer -p
+bind-key    -T prefix       c                    new-window
+bind-key    -T prefix       d                    detach-client
+bind-key    -T prefix       f                    command-prompt { find-window -Z "%%" }
+bind-key    -T prefix       g                    run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/goto_session.sh
+bind-key    -T prefix       h                    select-pane -L
+bind-key    -T prefix       i                    display-message
+bind-key    -T prefix       j                    select-pane -D
+bind-key    -T prefix       k                    select-pane -U
+bind-key    -T prefix       l                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-fzf/main.sh
+bind-key    -T prefix       m                    run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-menus/items/main.sh
+bind-key    -T prefix       n                    next-window
+bind-key    -T prefix       o                    select-pane -t :.+
+bind-key    -T prefix       p                    paste-buffer
+bind-key    -T prefix       q                    display-panes
+bind-key    -T prefix       r                    source-file /Users/ivuorinen/.dotfiles/config/tmux/tmux.conf \; display-message "tmux cfg reloaded!"
+bind-key    -T prefix       s                    choose-tree -Zs
+bind-key    -T prefix       t                    run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh 'join-pane' '-b'"
+bind-key    -T prefix       w                    choose-tree -Zw
+bind-key    -T prefix       x                    run-shell "tmux split-window -l 10 \"/Users/ivuorinen/.config/tmux/plugins/tmux-1password/scripts/main.sh '#{pane_id}'\""
+bind-key    -T prefix       y                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-yank/scripts/copy_line.sh
+bind-key    -T prefix       z                    resize-pane -Z
+bind-key    -T prefix       \{                   swap-pane -U
+bind-key    -T prefix       \}                   swap-pane -D
+bind-key    -T prefix       \~                   show-messages
+bind-key -r -T prefix       DC                   refresh-client -c
+bind-key    -T prefix       PPage                copy-mode -u
+bind-key -r -T prefix       Up                   select-pane -U
+bind-key -r -T prefix       Down                 select-pane -D
+bind-key -r -T prefix       Left                 select-pane -L
+bind-key -r -T prefix       Right                select-pane -R
+bind-key    -T prefix       M-Enter              run-shell -b "/Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/notify.sh true true"
+bind-key    -T prefix       M-1                  select-layout even-horizontal
+bind-key    -T prefix       M-2                  select-layout even-vertical
+bind-key    -T prefix       M-3                  select-layout main-horizontal
+bind-key    -T prefix       M-4                  select-layout main-vertical
+bind-key    -T prefix       M-5                  select-layout tiled
+bind-key    -T prefix       M-m                  run-shell -b "/Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/notify.sh true"
+bind-key    -T prefix       M-n                  next-window -a
+bind-key    -T prefix       M-o                  rotate-window -D
+bind-key    -T prefix       M-p                  previous-window -a
+bind-key    -T prefix       M-u                  run-shell /Users/ivuorinen/.config/tmux/plugins/tpm/bindings/clean_plugins
+bind-key -r -T prefix       M-Up                 resize-pane -U 5
+bind-key -r -T prefix       M-Down               resize-pane -D 5
+bind-key -r -T prefix       M-Left               resize-pane -L 5
+bind-key -r -T prefix       M-Right              resize-pane -R 5
+bind-key -r -T prefix       C-Up                 resize-pane -U
+bind-key -r -T prefix       C-Down               resize-pane -D
+bind-key -r -T prefix       C-Left               resize-pane -L
+bind-key -r -T prefix       C-Right              resize-pane -R
+bind-key -r -T prefix       S-Up                 refresh-client -U 10
+bind-key -r -T prefix       S-Down               refresh-client -D 10
+bind-key -r -T prefix       S-Left               refresh-client -L 10
+bind-key -r -T prefix       S-Right              refresh-client -R 10
+bind-key    -T root         C-h                  if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(\S+\/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-h" "select-pane -L"
+bind-key    -T root         C-j                  if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(\S+\/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-j" "select-pane -D"
+bind-key    -T root         C-k                  if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(\S+\/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-k" "select-pane -U"
+bind-key    -T root         C-l                  if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(\S+\/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-l" "select-pane -R"
+bind-key    -T root         C-\                 if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(S+/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-\\" "select-pane -l"
+bind-key    -T root         MouseDown1Pane       select-pane -t = \; send-keys -M
+bind-key    -T root         MouseDown1Status     select-window -t =
+bind-key    -T root         MouseDown2Pane       select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { paste-buffer -p }
+bind-key    -T root         MouseDown3Pane       if-shell -F -t = "#{||:#{mouse_any_flag},#{&&:#{pane_in_mode},#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}}}" { select-pane -t = ; send-keys -M } { display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -t = -x M -y M "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z } }
+bind-key    -T root         MouseDown3Status     display-menu -T "#[align=centre]#{window_index}:#{window_name}" -t = -x W -y W "#{?#{>:#{session_windows},1},,-}Swap Left" l { swap-window -t :-1 } "#{?#{>:#{session_windows},1},,-}Swap Right" r { swap-window -t :+1 } "#{?pane_marked_set,,-}Swap Marked" s { swap-window } '' Kill X { kill-window } Respawn R { respawn-window -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } Rename n { command-prompt -F -I "#W" { rename-window -t "#{window_id}" "%%" } } '' "New After" w { new-window -a } "New At End" W { new-window }
+bind-key    -T root         MouseDown3StatusLeft display-menu -T "#[align=centre]#{session_name}" -t = -x M -y W Next n { switch-client -n } Previous p { switch-client -p } '' Renumber N { move-window -r } Rename n { command-prompt -I "#S" { rename-session "%%" } } '' "New Session" s { new-session } "New Window" w { new-window }
+bind-key    -T root         MouseDrag1Pane       if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -M }
+bind-key    -T root         MouseDrag1Border     resize-pane -M
+bind-key    -T root         WheelUpPane          if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -e }
+bind-key    -T root         WheelUpStatus        previous-window
+bind-key    -T root         WheelDownStatus      next-window
+bind-key    -T root         DoubleClick1Pane     select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -H ; send-keys -X select-word ; run-shell -d 0.3 ; send-keys -X copy-pipe-and-cancel }
+bind-key    -T root         TripleClick1Pane     select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -H ; send-keys -X select-line ; run-shell -d 0.3 ; send-keys -X copy-pipe-and-cancel }
+bind-key    -T root         F12                  run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-suspend/scripts/suspend.sh \"\" \"   @mode_indicator_custom_prompt:: ---- ,   @mode_indicator_custom_mode_style::bg=brightblack\,fg=black, \""
+bind-key    -T root         M-H                  previous-window
+bind-key    -T root         M-L                  next-window
+bind-key    -T root         M-MouseDown3Pane     display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -t = -x M -y M "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z }
+bind-key    -T root         M-Up                 select-pane -U
+bind-key    -T root         M-Down               select-pane -D
+bind-key    -T root         M-Left               select-pane -L
+bind-key    -T root         M-Right              select-pane -R
+bind-key    -T root         S-Left               previous-window
+bind-key    -T root         S-Right              next-window
+bind-key    -T suspended    F12                  run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-suspend/scripts/resume.sh \"\""
+```
+

hosts/air/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: 'hosts/defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring air"
 - brewfile:

hosts/lakka/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: 'hosts/defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring lakka"
 - link:

hosts/tunkki/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: 'hosts/defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring tunkki"
 - link:

hosts/v/config/git/config

@@ -1,60 +1,14 @@
+[include]
+  path = ~/.dotfiles/config/git/shared
+
+[gpg]
+  format = ssh
+
 [user]
   name = Ismo Vuorinen
   email = ismo.vuorinen@vincit.fi
 	signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLyOvkr1nRqMVv3UAizmk6C+q40H4khvw7qIXXXyOyFmzjwYx/Cuxoi4uZVjX+q4qFYJ+c312uu6YXiEtfyoCao3wub8r1cLBQ3eIvuyWp2K8Ixcd9JmFmLmoeiENpJxqyr0WPZLDkrCWUZCsQQh8zzGFnfciUdUdTiZ7s21AEhhmFRSdFlVfQSlGMFxU321psg1YilcP80bDwFd1FsL4TssSkwlbgP/twqnpZ4436TTo7kp0UnH/RZkfRdDWScKHaWgncBG0CZeQxGWnRp8fvZn/7gDnthcZhvnDALVBE7QFuZ90GxqVw3IGpHryV0mFO6EGQ9Ke9YX7pKVZPUXZjeCN4SVKsqFdVJ6AjaSJ9K7nL98rYK7qNzndT3cKqPNgPteyXWRulH68A51ecQqHrjTttZcdN9hKt9uBHpzuXsby2QObT+VB4MNjZapa+YYF/WgwJCml4lzn2xMFg1vYZD78pfoJ9e5f2cL1MMlUSDb0TNxmEXfDQ77H/pRpKDz0=
 
-[core]
-  excludesfile = ~/.config/git/gitignore
-
-[alias]
-  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
-  nah = !git reset --hard && git clean -df
-  undo-commit = reset HEAD~ --soft
-  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
-  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\"
-  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]++'"
-
-[diff]
-  tool = difftastic
-
-[difftool]
-  prompt = false
-
-[difftool "difftastic"]
-  cmd = difft "$LOCAL" "$REMOTE"
-
-[filter "lfs"]
-  clean = git-lfs clean -- %f
-  smudge = git-lfs smudge -- %f
-  process = git-lfs filter-process
-  required = true
-
-[init]
-  defaultBranch = main
-
-[pull]
-  rebase = true
-
-[color]
-  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
-
-[gpg]
-	format = ssh
-
 [gpg "ssh"]
 	program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
 	allowedSignersFile = ~/.ssh/allowed_signers
@@ -69,7 +23,3 @@
 [credential "https://gist.github.com"]
 	helper =
 	helper = !/opt/homebrew/bin/gh auth git-credential
-
-[submodule]
-	recurse = true
-

hosts/v/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: 'hosts/defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring v"
 - brewfile:

install

@@ -3,12 +3,12 @@
 set -e
 
 CONFIG="install.conf.yaml"
-DOTBOT_DIR="dotbot"
+DOTBOT_DIR="tools/dotbot"
 
 DOTBOT_BIN="bin/dotbot"
 BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 DOTBOT_BIN_PATH="${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}"
-DOTBOT_HOST="$(hostname -s)" || ''
+DOTBOT_HOST="$(hostname -s)"
 
 cd "$BASEDIR"
 git submodule sync --quiet --recursive
@@ -16,8 +16,8 @@ git submodule update --init --recursive
 
 "${DOTBOT_BIN_PATH}" \
   -d "${BASEDIR}" \
-  --plugin-dir=dotbot-brew \
-  --plugin-dir=dotbot-include \
+  --plugin-dir=tools/dotbot-brew \
+  --plugin-dir=tools/dotbot-include \
   -c "${CONFIG}" \
   "${@}"
 
@@ -28,9 +28,8 @@ if [ "${DOTBOT_HOST}" != "" ]; then
     && echo "(!) Found $DOTBOT_HOST_CONFIG" \
     && "$DOTBOT_BIN_PATH" \
       -d "$BASEDIR" \
-      --plugin-dir=dotbot-brew \
-      --plugin-dir=dotbot-include \
+      --plugin-dir=tools/dotbot-brew \
+      --plugin-dir=tools/dotbot-include \
       -c "$DOTBOT_HOST_CONFIG" \
       "${@}"
 fi
-

install.conf.yaml

@@ -1,4 +1,4 @@
-- include: "hosts/defaults.yaml"
+- include: "tools/dotbot-defaults.yaml"
 - clean:
     ~/:
     ~/.config:
@@ -10,6 +10,8 @@
     ~/.cache/git:
     ~/.config:
     ~/.config/cheat/cheatsheets/personal:
+    ~/.config/cheat/cheatsheets/pure-bash-bible:
+    ~/.config/cheat/cheatsheets/tldr:
     ~/.local:
     ~/.local/run:
     ~/.local/share:

local/bin/dfm

@@ -11,7 +11,7 @@
 : "${DOTFILES:=$HOME/.dotfiles}"
 : "${SHARED_SCRIPT:=$DOTFILES/scripts/shared.sh}"
 : "${INSTALL_SCRIPT:=$DOTFILES/scripts/install-dotfiles.sh}"
-: "${BREWFILE:=$DOTFILES/Brewfile}"
+: "${BREWFILE:=$DOTFILES/config/homebrew/Brewfile}"
 : "${HOSTFILES:=$DOTFILES/hosts}"
 
 SCRIPT=$(basename "$0")
@@ -28,6 +28,7 @@ function section_install
   MENU=(
     "all:Installs everything in the correct order"
     "antigen:Updates the antigen.zsh file"
+    "cheat-databases:Install cheat external cheatsheet databases"
     "composer:Install composer"
     "dotenv:Install dotenv-linter"
     "gh:Install GitHub CLI Extensions"
@@ -46,13 +47,13 @@ function section_install
     all)
       $0 install macos
       $0 install antigen
-      $0 install starship
       $0 brew install
       $0 install composer
       $0 install dotenv
       $0 install fzf
       $0 install gh
       $0 install go
+      $0 install cheat-databases
       $0 install imagick
       $0 install neofetch
       $0 install nvm
@@ -64,6 +65,12 @@ function section_install
       curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
         && msg_yay "New antigen installed!"
       ;;
+    cheat-databases)
+      for database in "$DOTFILES"/scripts/install-cheat-*; do
+        bash "$database" \
+          && msg_yay "Cheat: $database run"
+      done
+      ;;
     composer)
       bash "$DOTFILES/scripts/install-composer.sh" \
         && msg_yay "composer installed!"
@@ -123,9 +130,7 @@ function section_install
       bash "$DOTFILES/scripts/install-z.sh" \
         && msg_yay "z has been installed!"
       ;;
-    *)
-      menu_usage "$USAGE_PREFIX" "${MENU[@]}"
-      ;;
+    *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
   esac
 }
 
@@ -143,7 +148,7 @@ function section_brew
   have brew && {
     case "$1" in
       install)
-        brew bundle install --file="$BREWFILE" && msg_yay "Done!"
+        brew bundle install --file="$BREWFILE" --force --quiet && msg_yay "Done!"
         ;;
       update)
         brew update && brew outdated && brew upgrade && brew cleanup
@@ -164,7 +169,39 @@ function section_brew
         menu_usage "$USAGE_PREFIX" "${MENU[@]}"
         ;;
     esac
-  } || menu_section "$USAGE_PREFIX" "brew not available on this system"
+  }
+
+  ! have brew && menu_section "$USAGE_PREFIX" "brew not available on this system"
+}
+
+function section_helpers
+{
+  USAGE_PREFIX="$SCRIPT helpers <command>"
+  MENU=(
+    "path:Show \$PATH dir by dir"
+  )
+
+  case "$1" in
+    path)
+      # shellcheck disable=2001
+      for i in $(echo "$PATH" | sed 's/:/ /g'); do echo "$i"; done;
+    ;;
+    *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
+  esac
+}
+
+function section_docs
+{
+  USAGE_PREFIX="$SCRIPT docs <command>"
+
+  MENU=(
+    "tmux:Update tmux keybindings documentation"
+  )
+
+  case "$1" in
+    tmux) bash "$DOTFILES/local/bin/x-dfm-docs-xterm-keybindings" ;;
+    *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
+  esac
 }
 
 function section_dotfiles
@@ -198,8 +235,8 @@ function section_dotfiles
         ~/.config/astronvim \
         ~/.config/nvim
       msg_ok "Deleted old nvim files"
-      ln -s $DOTFILES/config/astronvim ~/.config/astronvim
-      ln -s $DOTFILES/config/nvim ~/.config/nvim
+      ln -s "$DOTFILES/config/astronvim" ~/.config/astronvim
+      ln -s "$DOTFILES/config/nvim" ~/.config/nvim
       msg_ok "Linked nvim and astronvim"
       have npm && $0 install npm
       msg_ok "Installed packages"
@@ -207,7 +244,8 @@ function section_dotfiles
       ;;
     yamlfmt)
       # format yaml files
-      have yamlfmt && yamlfmt -conf "$DOTFILES/.yamlfmt" || msg_err "yamlfmt not found"
+      have yamlfmt && yamlfmt -conf "$DOTFILES/.yamlfmt"
+      ! have yamlfmt && msg_err "yamlfmt not found"
       ;;
     shfmt)
       # Format shell scripts according to following rules.
@@ -215,6 +253,7 @@ function section_dotfiles
         -type f -perm +111 \
         -not -path '*/.git/*' \
         -not -path '*dotbot*' \
+        -not -path '*tmux*' \
         -not -name '*.pl' \
         -not -name '*.py' \
         -not -name '*.php' \
@@ -226,9 +265,7 @@ function section_dotfiles
         --binary-next-line {} \;
       msg_yay "dotfiles have been shfmt formatted!"
       ;;
-    *)
-      menu_usage "$USAGE_PREFIX" "${MENU[@]}"
-      ;;
+    *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
   esac
 }
 
@@ -252,9 +289,7 @@ function section_check
       [[ "$2" = "" ]] && echo "$X_HOSTNAME" && exit 0
       [[ $X_HOSTNAME = "$2" ]] && exit 0 || exit 1
       ;;
-    *)
-      menu_usage "$USAGE_PREFIX" "${MENU[@]}"
-      ;;
+    *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
   esac
 }
 
@@ -284,9 +319,7 @@ function section_tests
       msg_yay "msg_yay"
       msg_yay_done "msg_yay_done"
       ;;
-    *)
-      menu_usage "$USAGE_PREFIX" "${MENU[@]}"
-      ;;
+    *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
   esac
 }
 
@@ -303,6 +336,10 @@ function usage
   section_check
   echo ""
   section_dotfiles
+  echo ""
+  section_docs
+  echo ""
+  section_helpers
 }
 
 # The main loop. first keyword after $0 triggers section, or help.
@@ -311,6 +348,8 @@ case "$1" in
   brew) section_brew "$2" ;;
   check) section_check "$2" ;;
   dotfiles) section_dotfiles "$2" ;;
+  helpers) section_helpers "$2" ;;
+  docs) section_docs "$2" ;;
   tests) section_tests "$2" ;;
   *) usage && exit 0 ;;
 esac

local/bin/git-dirty

@@ -46,7 +46,7 @@ gitdirty()
       if [[ "${d:0:2}" == "--" ]] || [[ "$d" == "vendor" ]] || [[ "$d" == "node_modules" ]]; then
         echo ""
       else
-        cd "$d" > /dev/null
+        cd "$d"
 
         # If we have `.git` folder, check it.
         if [[ -d ".git" ]]; then
@@ -58,7 +58,7 @@ gitdirty()
           printf " %s %s\n" "$ICON" "$(pwd)"
         else
           # If it wasn't git repository, check subdirectories.
-          gitdirtyrepos -- *
+          gitdirtyrepos ./*
         fi
       fi
       cd .. > /dev/null

local/bin/pushover

@@ -0,0 +1,150 @@
+#!/usr/bin/env sh
+#
+# Send Pushover messages from cli
+# Based on https://github.com/mrusme/dotfiles/blob/master/usr/local/bin/pushover
+#
+# Modified by Ismo Vuorinen <https://github.com/ivuorinen> 2023
+
+__pushover_usage()
+{
+  printf "pushover <options> <message>\n"
+  printf " -c <callback>\n"
+  printf " -d <device>\n"
+  printf " -D <timestamp>\n"
+  printf " -e <expire>\n"
+  printf " -p <priority>\n"
+  printf " -r <retry>\n"
+  printf " -t <title>\n"
+  printf " -T <TOKEN> (required if not in 'PUSHOVER_TOKEN' env)\n"
+  printf " -s <sound>\n"
+  printf " -u <url>\n"
+  printf " -U <USER> (required if not in 'PUSHOVER_USER' env)\n"
+  printf " -a <url_title>\n"
+  return 1
+}
+
+__pushover_opt_field()
+{
+  field=$1
+  shift
+  value="${*}"
+  if [ -n "${value}" ]; then
+    printf "%s \"%s=%s\"\n" "-F" "$field" "$value"
+  fi
+}
+
+__pushover_send_message()
+{
+  device="${1:-}"
+
+  curl_cmd="\"${CURL}\" -s -S \
+    ${CURL_OPTS} \
+    -F \"token=${TOKEN}\" \
+    -F \"user=${USER}\" \
+    -F \"message=${message}\" \
+    $(__pushover_opt_field device "${device}") \
+    $(__pushover_opt_field callback "${callback}") \
+    $(__pushover_opt_field timestamp "${timestamp}") \
+    $(__pushover_opt_field priority "${priority}") \
+    $(__pushover_opt_field retry "${retry}") \
+    $(__pushover_opt_field expire "${expire}") \
+    $(__pushover_opt_field title "${title}") \
+    $(__pushover_opt_field sound "${sound}") \
+    $(__pushover_opt_field url "${url}") \
+    $(__pushover_opt_field url_title "${url_title}") \
+    \"${PUSHOVER_URL}\""
+
+  response="$(eval "${curl_cmd}")"
+  printf "%s\n" "$response"
+  # TODO: Parse response
+  r="${?}"
+  if [ "${r}" -ne 0 ]; then
+    printf "%s: Failed to send message\n" "${0}" >&2
+  fi
+
+  return "${r}"
+}
+
+CURL="$(which curl)"
+PUSHOVER_URL="https://api.pushover.net/1/messages.json"
+TOKEN=$PUSHOVER_TOKEN
+USER=$PUSHOVER_USER
+CURL_OPTS=""
+devices="${devices} ${device}"
+optstring="c:d:D:e:f:p:r:t:T:s:u:U:a:h"
+
+OPTIND=1
+while getopts ${optstring} c; do
+  case ${c} in
+    c)
+      callback="${OPTARG}"
+      ;;
+    d)
+      devices="${devices} ${OPTARG}"
+      ;;
+    D)
+      timestamp="${OPTARG}"
+      ;;
+    e)
+      expire="${OPTARG}"
+      ;;
+    p)
+      priority="${OPTARG}"
+      ;;
+    r)
+      retry="${OPTARG}"
+      ;;
+    t)
+      title="${OPTARG}"
+      ;;
+    k)
+      TOKEN="${OPTARG}"
+      ;;
+    s)
+      sound="${OPTARG}"
+      ;;
+    u)
+      url="${OPTARG}"
+      ;;
+    U)
+      USER="${OPTARG}"
+      ;;
+    a)
+      url_title="${OPTARG}"
+      ;;
+
+    [h\?])
+      __pushover_usage
+      exit 1
+      ;;
+  esac
+done
+shift $((OPTIND - 1))
+
+if [ "$#" -lt 1 ]; then
+  __pushover_usage
+  exit 1
+fi
+message="$*"
+
+if [ ! -x "${CURL}" ]; then
+  printf "CURL is unset, empty, or does not point to curl executable.\n \
+    This script requires curl!\n" >&2
+  exit 1
+fi
+
+devices="$(printf "${devices}" | xargs -n1 | sort -u | uniq)\n"
+
+if [ -z "${devices}" ]; then
+  __pushover_send_message
+  r=${?}
+else
+  for device in ${devices}; do
+    __pushover_send_message "${device}"
+    r=${?}
+    if [ "${r}" -ne 0 ]; then
+      break
+    fi
+  done
+fi
+exit "${r}"

local/bin/python

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# work around https://github.com/Microsoft/vscode/issues/3941
+# and anyone else who expects to see a 'python' executable
+
+exec python3 "$@"
+

local/bin/x-backup-folder.sh

@@ -13,11 +13,13 @@ if [ -z "${FILENAME}" ]; then
   FILENAME=$DIRECTORY
 fi
 
-FILENAME=${FILENAME} \
-  | tr '/' _ \
-  | iconv -t ascii//TRANSLIT \
-  | sed -r s/[^a-zA-Z0-9]+/_/g \
-  | sed -r s/^_+\|-+$//g
+FILENAME=$(
+  ${FILENAME} \
+    | tr '/' _ \
+    | iconv -t ascii//TRANSLIT \
+    | sed -r s/[^a-zA-Z0-9]+/_/g \
+    | sed -r s/^_+\|-+$//g
+)
 
 TIMESTAMP=$(date "+%Y%m%d_%H%M%S")
 FILENAME_TIMESTAMP="${FILENAME}_${TIMESTAMP}"

local/bin/x-dfm-docs-xterm-keybindings

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# x-xterm-update-keybindings
+# Updates $HOME/.dotfiles/docs/tmux.md with my keybindings.
+
+# shellcheck source=./../../scripts/shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+have tmux || {
+  msg_err "tmux not found" && exit 0
+}
+
+TMUX_KEYBINDINGS_DOCS="$DOTFILES/docs/tmux-keybindings.md"
+
+CB="\n\`\`\`\n"
+KB=$(tmux list-keys)
+H="# tmux keybindings\n"
+L="\n\nLeader: \`<ctrl><space>\`\n\n"
+
+msg "Outputting tmux keybindings to $TMUX_KEYBINDINGS_DOCS"
+echo -e "${H}${L}${CB}${KB}${CB}" > "$TMUX_KEYBINDINGS_DOCS"
+msg_done "Done!"

local/bin/x-quota-usage.php

@@ -8,24 +8,24 @@ $quota = '';
 $output = [];
 $fsCharLenght = 0;
 
-if ($debug) {
-    $quota = "Disk quotas for user viir (uid 2913):
-         Filesystem  blocks   quota   limit   grace   files   quota   limit   grace
-    10.0.0.89:/www/webroots/2 8277615  52428800 52428800               0       0       0
-    10.0.0.179:/users1/users/2 1999431  52428800 52428800               0       0       0
-    10.0.0.90:/siilo/2 24835106  524288000 524288000               0       0       0";
-} else {
-    // $quota = system("quota -w");
-    $quota = shell_exec("quota -w");
-}
+$quota = shell_exec("quota -w");
 
-function pad($i, $n = 3, $p = ' ') {
+/**
+ * Pad string
+ *
+ * @param string $i Input string
+ * @param int    $n Length
+ * @param string $p Padding string
+ * @return string
+ */
+function pad($i, $n = 3, $p = ' ')
+{
     return str_pad($i, $n, $p, STR_PAD_LEFT);
 }
 
 if (empty($quota)) {
-   var_dump($quota);
-   die("quota was empty\n");
+    var_dump($quota);
+    die("quota was empty\n");
 }
 
 $quota = explode("\n", $quota);
@@ -41,34 +41,34 @@ foreach ($quota as $lineNum => $line) {
     if (count($values) != 4) {
         continue;
     }
-    
+
     $result = array_combine(['fs', 'used', 'quota', 'limit'], $values);
-    
+
     $result['used_percentage'] = round($result['used'] / $result['quota'] * 100, 3);
     $result['used_gb'] = round($result['used'] / 1024 / 1024, 2);
     $result['quota_gb'] = round($result['quota'] / 1024 / 1024, 2);
-    
+
     $char = strlen($result['fs']);
     if ($char > $fsCharLenght) {
         $fsCharLenght = $char;
     }
-    
+
     $output[] = $result;
 }
 
 if (!empty($output)) {
-    
-    $header = sprintf("%s | %s | %s | %s",
+    $header = sprintf(
+        "%s | %s | %s | %s",
         str_pad("Mount", $fsCharLenght),
         'Usage%',
         'Used/Total',
         'Bar'
     );
     $headerWidth = strlen($header);
-    
+
     echo "\n" . $header . "\n";
     echo str_repeat('-', $headerWidth + 24) . "\n";
-    
+
     foreach ($output as $i) {
         $barUsed = round($i['used_percentage']) / 4;
         echo sprintf(
@@ -82,4 +82,3 @@ if (!empty($output)) {
 
     echo "\n\n";
 }
-

local/bin/x-sha256sum-matcher

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# x-sha256sum-matcher
+#
+# Check if two files are the same
+#
+# Ismo Vuorinen <https://github.com/ivuorinen> 2023
+# MIT License
+
+# ENV Variables
+: "${VERBOSE:=0}" # VERBOSE=1 x-sha256sum-matcher file1 file2
+
+file_1="$1"
+file_2="$2"
+
+# return sha256sum for file
+# $1 - filename (string)
+get_sha256sum()
+{
+  sha256sum "$1" | head -c 64
+}
+
+[ $# -eq 0 ] && {
+  echo "Usage: $0 file1.sh file2.sh" && exit 1
+}
+
+msg()
+{
+  [[ "$VERBOSE" -eq 1 ]] && echo "$1"
+}
+
+error()
+{
+  msg "(!) ERROR: $1" && exit 1
+}
+
+if [ ! -f "$file_1" ]; then
+  error "File 1 does not exist: $file_1"
+fi
+
+if [ ! -f "$file_2" ]; then
+  error "File 2 does not exist: $file_2"
+fi
+
+file_1_hash=$(get_sha256sum "$file_1")
+file_2_hash=$(get_sha256sum "$file_2")
+
+if [ "$file_1_hash" != "$file_2_hash" ]; then
+  error "Files do not match"
+else
+  msg "(*) Success: Files do match"
+  exit 0
+fi

local/bin/x-welcome-banner

@@ -18,7 +18,7 @@ RESET='\033[0m'
 # Print time-based personalized message, using figlet & lolcat if availible
 function welcome_greeting () {
   h=$(date +%H)
-  if [ "$h" -lt 04 ] || [[ $h -gt 22 ]];
+  if [ "$h" -lt 04 ] || [ "$h" -gt 22 ];
     then greeting="Good Night"
   elif [ "$h" -lt 12 ];
     then greeting="Good morning"
@@ -41,7 +41,7 @@ function welcome_greeting () {
 function welcome_sysinfo () {
   if hash neofetch 2>/dev/null; then
     neofetch --shell_version off \
-      --disable kernel distro shell resolution de wm wm_theme theme icons terminal \
+      --disable kernel distro shell resolution cpu gpu de wm wm_theme theme icons terminal \
       --backend off \
       --colors 4 8 4 4 8 6 \
       --color_blocks off \

phpcs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset name="PHP_CodeSniffer">
+  <description>PHP_CodeSniffer configuration</description>
+  <rule ref="PSR12">
+    <exclude name="PSR12.Operators.OperatorSpacing"/>
+    <exclude name="PSR1.Files.SideEffects.FoundWithSymbols"/>
+  </rule>
+</ruleset>

scripts/install-cheat-purebashbible.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2231,SC2034,SC2181,SC2068
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+PBB_REQUIRED_TOOLS=(basename git mkdir cheat ls grep head awk cp echo rm)
+for t in ${PBB_REQUIRED_TOOLS[@]}; do
+  ! have "$t" && echo "(!) $t is missing, can't continue..." && exit 1
+done
+
+PBB_GIT="https://github.com/dylanaraps/pure-bash-bible.git"
+PBB_SOURCE="source: $PBB_GIT"
+PBB_SYNTAX="syntax: bash"
+PBB_TAGS="tags: [bash]"
+
+PBB_TEMP_PREFIX=$(basename "$0")
+PBB_TEMP_DIR="/tmp/pbb-$(rnd)"
+
+# If there's no .git, clone the folder
+if [ ! -d "$PBB_TEMP_DIR/.git" ]; then
+  msg_run "Starting to clone $PBB_GIT"
+  git clone --depth 1 --single-branch -q "$PBB_GIT" "$PBB_TEMP_DIR" \
+    && msg_yay "Cloned $PBB_GIT"
+fi
+
+PBB_CHAPTERS=$(ls -1v "$PBB_TEMP_DIR"/manuscript/chapter*)
+CHEAT_DEST="$(cheat -d | grep pure-bash-bible | head -1 | awk '{print $2}')"
+
+if [ ! -d "$CHEAT_DEST" ]; then
+  mkdir -p "$CHEAT_DEST"
+fi
+
+for f in ${PBB_CHAPTERS[@]}; do
+  # get all headers, take the first one, strip the # and return the first word in lowercase
+  HEADER=$(grep -e '^[#] ' "$f" | head -1 | awk '{print tolower($2)}')
+  CHEAT_FILE="$CHEAT_DEST/${HEADER}"
+
+  replacable "$f" "$CHEAT_FILE"
+  override=$?
+  if [ "$override" -ne 1 ]; then
+    cp "$f" "$CHEAT_FILE" && msg_run "Updated: $CHEAT_FILE"
+  fi
+
+  LC_ALL=C perl -pi.bak -e 's/\<\!-- CHAPTER END --\>//' "$CHEAT_FILE"
+  rm "$CHEAT_FILE.bak"
+
+  # add tags if the file doesn't have them
+  if [ '---' != "$(head -1 < "$CHEAT_FILE")" ]; then
+    T="$PBB_SYNTAX\n$PBB_TAGS\n$PBB_SOURCE\n"
+    echo -e "---\n$T---\n$(cat "$CHEAT_FILE")" > "$CHEAT_FILE"
+  fi
+done
+
+# Cleanup
+if [ -d "$PBB_TEMP_DIR" ]; then
+  rm -rf "$PBB_TEMP_DIR"
+fi