chore(deps): updated nvim packages

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

.actrc

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

.editorconfig

@@ -15,7 +15,11 @@ indent_size = 4
 indent_style = tab
 indent_size = 1
 
-[local/bin/*]
+[*.plist]
+indent_size = 1
+indent_style = tab
+
+[{local/bin/*,**/*.sh,**/zshrc}]
 shell_variant      = bash # --language-variant
 binary_next_line   = true
 switch_case_indent = true # --case-indent

.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

@@ -1,6 +1,5 @@
 version: 2
 updates:
-
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"

.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@v4
+      - 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/linters.yml

@@ -5,7 +5,7 @@ jobs:
     name: Linters
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: GitHub Actions
         uses: reviewdog/action-actionlint@v1
         with:

.github/workflows/new-release.yml

@@ -1,14 +1,10 @@
----
 name: Release Daily State # Workflow name displayed on GitHub
-
 on:
   workflow_dispatch: # Trigger manually
   schedule:
-    - cron: "59 23 * * *"
-
+    - cron: "30 20 * * *" # UTC is 2-3 hours behind Europe/Helsinki, my timezone
 permissions:
   contents: write
-
 jobs:
   new-daily-release:
     runs-on: ubuntu-latest
@@ -16,36 +12,23 @@ jobs:
       created: ${{ steps.daily-version.outputs.created }}
       version: ${{ steps.daily-version.outputs.version }}
     steps:
-      - uses: actions/checkout@v3 # Checkout our working repository
-
-      - uses: fregante/daily-version-action@v2
-        name: Create tag if necessary
+      - uses: actions/checkout@v4 # Checkout our working repository
+      - name: Create tag if necessary
+        uses: fregante/daily-version-action@v2
         id: daily-version
-
-      - name: Conventional Changelog Action
+      - name: Create changelog text
         if: steps.daily-version.outputs.created
         id: changelog
-        uses: TriPSs/conventional-changelog-action@v3
+        uses: loopwerk/tag-changelog@v1
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          skip-git-pull: "true"
-          output-file: "false"
-          fallback-version: "${{ steps.daily-version.outputs.version }}"
-          skip-version-file: "true"
-          git-message: "chore(release): {version}"
-          git-user-name: "${{ github.actor }}"
-          git-user-email: "${{ github.actor }}@users.noreply.github.com"
-
+          token: ${{ secrets.GITHUB_TOKEN }}
+          config_file: .github/tag-changelog-config.js
       - name: Create release
-        if: env.DAILY_VERSION_CREATED
-        uses: actions/github-script@v5.2.0
+        if: steps.daily-version.outputs.created
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            await github.request(
-              `POST /repos/${{ github.repository }}/releases`,
-              {
-                tag_name: "${{ steps.daily-version.outputs.version }}",
-                body: "${{ steps.daily-version.outputs.clean_changelog }}"
-              }
-            );
+          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

@@ -1,32 +1,28 @@
 name: Update submodules
 on:
-  schedule: [cron: 0 6 * * 0]
+  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
+        uses: actions/checkout@v4
         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"Update submodules (automated)
+          if git commit -am"chore(git): Update submodules (automated)
 
           $(git submodule --quiet foreach \
             'tag="$(git describe --tags --abbrev=0 origin/HEAD)"

.gitignore

@@ -4,8 +4,13 @@ Brewfile.lock.json
 *cache
 .idea
 .vscode
-config/fzf
 config/cheat/cheatsheets/pure-bash-bible/*
 config/cheat/cheatsheets/tldr/*
+config/git/credentials
+config/npm/npmrc
+config/zsh/.zcompdump
+ssh/local.d/*
+!ssh/local.d/.gitkeep
 !.gitkeep
+.env
 

.gitmodules

@@ -14,12 +14,6 @@
 	url = https://gitlab.com/gnfzdz/dotbot-include.git
 	ignore = dirty
 
-[submodule "config/nvim"]
-	path = config/nvim
-	url = https://github.com/AstroNvim/AstroNvim.git
-	ignore = dirty
-	shallow = true
-
 [submodule "cheat-community"]
 	path = config/cheat/cheatsheets/community
 	url = https://github.com/cheat/cheatsheets.git
@@ -29,3 +23,24 @@
 	path = config/tmux/plugins/tpm
 	url = https://github.com/tmux-plugins/tpm.git
 	ignore = dirty
+[submodule "tmux/catppuccin"]
+	path = config/tmux/plugins/tmux
+	url = https://github.com/catppuccin/tmux.git
+[submodule "tmux/tmux-continuum"]
+	path = config/tmux/plugins/tmux-continuum
+	url = https://github.com/tmux-plugins/tmux-continuum
+[submodule "tmux/tmux-menus"]
+	path = config/tmux/plugins/tmux-menus
+	url = https://github.com/jaclu/tmux-menus.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-yank"]
+	path = config/tmux/plugins/tmux-yank
+	url = https://github.com/tmux-plugins/tmux-yank.git

.ignore

@@ -0,0 +1,6 @@
+.git/**
+config/cheat/cheatsheets/community/**
+tools/dotbot/**
+tools/dotbot-brew/**
+tools/dotbot-include/**
+

.markdownlintignore

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

.python-version

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

.shellcheckrc

@@ -5,3 +5,22 @@
 external-sources=true
 includeAllWorkspaceSymbols=true
 
+# SC2039: In POSIX sh, 'local' is undefined.
+# https://github.com/koalaman/shellcheck/wiki/SC2039
+disable=SC2039
+
+# SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined.
+# https://github.com/koalaman/shellcheck/wiki/SC2166
+disable=SC2166
+
+# SC2154: Variable is referenced but not assigned
+# https://github.com/koalaman/shellcheck/wiki/SC2154
+disable=SC2154
+
+# SC1091: Not following <file>
+# https://github.com/koalaman/shellcheck/wiki/SC1091
+disable=SC1091
+
+# SC2174: When used with -p, -m only applies to the deepest directory.
+# https://github.com/koalaman/shellcheck/wiki/SC2174
+disable=SC2174

.stylua.toml

@@ -3,5 +3,8 @@ line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
 quote_style = "AutoPreferDouble"
-call_parentheses = "None"
+call_parentheses = "Always"
 collapse_simple_statement = "Always"
+
+[sort_requires]
+enabled = true

.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

@@ -4,5 +4,21 @@ git submodule add --name dotbot -f https://github.com/anishathalye/dotbot.git to
 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/tmux
+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-menus \
+  -f https://github.com/jaclu/tmux-menus.git config/tmux/plugins/tmux-menus
+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-yank \
+  -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank

base/angular-config.json

@@ -1,6 +0,0 @@
-{
-  "version": 1,
-  "cli": {
-    "analytics": false
-  }
-}

base/bashrc

@@ -7,12 +7,13 @@ export DOTFILES="$HOME/.dotfiles"
 # Run x-load-configs in your terminal to reload the files.
 function x-load-configs()
 {
+    HOST="$(hostname -s)"
     # 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-$HOST" ] && source "$file-$HOST"
+        [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
     done
 }
 x-load-configs
@@ -20,4 +21,6 @@ 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
+# shellcheck source=../config/fzf/fzf.bash
+[ -f "${DOTFILES}/config/fzf/fzf.bash" ] \
+  && source "${DOTFILES}/config/fzf/fzf.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/huskyrc

@@ -4,5 +4,3 @@ export NVM_DIR="$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
 
-alias php="php -d error_reporting=22527"
-

base/vuerc

@@ -1,24 +0,0 @@
-{
-  "useTaobaoRegistry": false,
-  "presets": {
-    "v2-router-vuex-scss-prettier": {
-      "useConfigFiles": false,
-      "plugins": {
-        "@vue/cli-plugin-babel": {},
-        "@vue/cli-plugin-router": {
-          "historyMode": false
-        },
-        "@vue/cli-plugin-vuex": {},
-        "@vue/cli-plugin-eslint": {
-          "config": "prettier",
-          "lintOn": [
-            "save"
-          ]
-        }
-      },
-      "vueVersion": "2",
-      "cssPreprocessor": "dart-sass"
-    }
-  }
-}
-

base/zshrc

@@ -1,37 +1,57 @@
 # 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
-
-# Add completion scripts to zsh path
-fpath=(~/.config/zsh/completion $fpath)
-autoload -Uz compinit && compinit -i
-
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
-# shellcheck source=shared.sh
+# shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
 
+export COMPLETION_WAITING_DOTS=true
+
 # 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"
+    HOST="$(hostname -s)"
+    # global (exports|alias|functions) file for all hosts
+    # shellcheck source=../config/exports
+    [ -r "$file" ] && source "$file"
+    # global secret file, git ignored
+    # shellcheck source=../config/exports-secret
+    [ -r "$file-secret" ] && source "$file-secret"
+    # host specific (exports|alias|functions) file
+    # shellcheck source=../config/exports
+    [ -r "$file-$HOST" ] && source "$file-$HOST"
+    # host specific (exports|alias|functions) file, git ignored
+    # shellcheck source=../config/exports
+    [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
   done
 }
 x-load-configs
 
-# Import ssh keys in keychain
-ssh-add -A 2>/dev/null;
+export HISTFILE="$XDG_STATE_HOME"/zsh/history
+
+autoload -U colors zsh/terminfo
+colors
+
+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
+
+if type brew &>/dev/null
+then
+  FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
+fi
+
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
 
 # Try to load antigen, if present
 ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
+# shellcheck source=../../.local/bin/antigen.zsh
 [[ -f "$ANTIGEN_ZSH_PATH" ]] && source "$ANTIGEN_ZSH_PATH"
 
 # antigen is present
@@ -44,9 +64,10 @@ have antigen && {
   antigen apply
 }
 
-# starship is present
-have starship && eval "$(starship init zsh)"
+# shellcheck source=../config/fzf/fzf.zsh
+[ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
+  && source "${DOTFILES}/config/fzf/fzf.zsh"
 
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
-  && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
+# Start starship
+eval "$(starship init 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/alacritty/alacritty.yml

@@ -0,0 +1,310 @@
+# Configuration for Alacritty, the GPU enhanced terminal emulator
+
+# Any items in the `env` entry below will be added as
+# environment variables. Some entries may override variables
+# set by alacritty it self.
+env:
+  # TERM env customization.
+  #
+  # If this property is not set, alacritty will set it to xterm-256color.
+  #
+  # Note that some xterm terminfo databases don't declare support for italics.
+  # You can verify this by checking for the presence of `smso` and `sitm` in
+  # `infocmp xterm-256color`.
+  TERM: xterm-256color
+
+# Window dimensions in character columns and lines
+# (changes require restart)
+window:
+  dimensions:
+    columns: 130
+    lines: 40
+
+  # Adds this many blank pixels of padding around the window
+  # Units are physical pixels; this is not DPI aware.
+  # (change requires restart)
+  padding:
+    x: 5
+    y: 5
+
+  decorations: buttonless
+
+  opacity: 0.85
+
+# When true, bold text is drawn using the bright variant of colors.
+draw_bold_text_with_bright_colors: true
+
+# Font configuration (changes require restart)
+font:
+  # The normal (roman) font face to use.
+  normal:
+    family: JetBrainsMono Nerd Font
+    # Style can be specified to pick a specific face.
+    # style: Regular
+
+    # The bold font face
+  bold:
+    family: JetBrainsMono Nerd Font
+    # Style can be specified to pick a specific face.
+    style: Bold
+
+  # The italic font face
+  italic:
+    family: JetBrainsMono Nerd Font
+    # Style can be specified to pick a specific face.
+    style: Italic
+
+  # Point size of the font
+  size: 14.0
+
+  # Offset is the extra space around each character. offset.y can be thought of
+  # as modifying the linespacing, and offset.x as modifying the letter spacing.
+  offset:
+    x: 0
+    y: 0
+
+  # Glyph offset determines the locations of the glyphs within their cells with
+  # the default being at the bottom. Increase the x offset to move the glyph to
+  # the right, increase the y offset to move the glyph upward.
+  glyph_offset:
+    x: 0
+    y: 0
+
+# Should display the render timer
+debug.render_timer: false
+
+# https://github.com/catppuccin/alacritty
+colors:
+  primary:
+    background: "#1E1E2E" # base
+    foreground: "#CDD6F4" # text
+    # Bright and dim foreground colors
+    dim_foreground: "#CDD6F4" # text
+    bright_foreground: "#CDD6F4" # text
+
+  # Cursor colors
+  cursor:
+    text: "#1E1E2E" # base
+    cursor: "#F5E0DC" # rosewater
+  vi_mode_cursor:
+    text: "#1E1E2E" # base
+    cursor: "#B4BEFE" # lavender
+
+  # Search colors
+  search:
+    matches:
+      foreground: "#1E1E2E" # base
+      background: "#A6ADC8" # subtext0
+    focused_match:
+      foreground: "#1E1E2E" # base
+      background: "#A6E3A1" # green
+    footer_bar:
+      foreground: "#1E1E2E" # base
+      background: "#A6ADC8" # subtext0
+
+  # Keyboard regex hints
+  hints:
+    start:
+      foreground: "#1E1E2E" # base
+      background: "#F9E2AF" # yellow
+    end:
+      foreground: "#1E1E2E" # base
+      background: "#A6ADC8" # subtext0
+
+  # Selection colors
+  selection:
+    text: "#1E1E2E" # base
+    background: "#F5E0DC" # rosewater
+
+  # Normal colors
+  normal:
+    black: "#45475A" # surface1
+    red: "#F38BA8" # red
+    green: "#A6E3A1" # green
+    yellow: "#F9E2AF" # yellow
+    blue: "#89B4FA" # blue
+    magenta: "#F5C2E7" # pink
+    cyan: "#94E2D5" # teal
+    white: "#BAC2DE" # subtext1
+
+  # Bright colors
+  bright:
+    black: "#585B70" # surface2
+    red: "#F38BA8" # red
+    green: "#A6E3A1" # green
+    yellow: "#F9E2AF" # yellow
+    blue: "#89B4FA" # blue
+    magenta: "#F5C2E7" # pink
+    cyan: "#94E2D5" # teal
+    white: "#A6ADC8" # subtext0
+
+  # Dim colors
+  dim:
+    black: "#45475A" # surface1
+    red: "#F38BA8" # red
+    green: "#A6E3A1" # green
+    yellow: "#F9E2AF" # yellow
+    blue: "#89B4FA" # blue
+    magenta: "#F5C2E7" # pink
+    cyan: "#94E2D5" # teal
+    white: "#BAC2DE" # subtext1
+
+  indexed_colors:
+    - { index: 16, color: "#FAB387" }
+    - { index: 17, color: "#F5E0DC" }
+
+# Visual Bell
+#
+# Any time the BEL code is received, Alacritty "rings" the visual bell. Once
+# rung, the terminal background will be set to white and transition back to the
+# default background color. You can control the rate of this transition by
+# setting the `duration` property (represented in milliseconds). You can also
+# configure the transition function by setting the `animation` property.
+#
+# Possible values for `animation`
+# `Ease`
+# `EaseOut`
+# `EaseOutSine`
+# `EaseOutQuad`
+# `EaseOutCubic`
+# `EaseOutQuart`
+# `EaseOutQuint`
+# `EaseOutExpo`
+# `EaseOutCirc`
+# `Linear`
+#
+# To completely disable the visual bell, set its duration to 0.
+#
+# visual_bell:
+#   animation: EaseOutExpo
+#   duration: 0
+
+# Key bindings
+#
+# Each binding is defined as an object with some properties. Most of the
+# properties are optional. All of the alphabetical keys should have a letter for
+# the `key` value such as `V`. Function keys are probably what you would expect
+# as well (F1, F2, ..). The number keys above the main keyboard are encoded as
+# `Key1`, `Key2`, etc. Keys on the number pad are encoded `Number1`, `Number2`,
+# etc.  These all match the glutin::VirtualKeyCode variants.
+#
+# Possible values for `mods`
+# `Command`, `Super` refer to the super/command/windows key
+# `Control` for the control key
+# `Shift` for the Shift key
+# `Alt` and `Option` refer to alt/option
+#
+# mods may be combined with a `|`. For example, requiring control and shift
+# looks like:
+#
+# mods: Control|Shift
+#
+# The parser is currently quite sensitive to whitespace and capitalization -
+# capitalization must match exactly, and piped items must not have whitespace
+# around them.
+#
+# Either an `action`, `chars`, or `command` field must be present.
+#   `action` must be one of `Paste`, `PasteSelection`, `Copy`, or `Quit`.
+#   `chars` writes the specified string every time that binding is activated.
+#     These should generally be escape sequences, but they can be configured to
+#     send arbitrary strings of bytes.
+#   `command` must be a map containing a `program` string, and `args` array of
+#     strings. For example:
+#     - { ... , command: { program: "alacritty", args: ["-e", "vttest"] } }
+key_bindings:
+  - { key: V, mods: Command, action: Paste }
+  - { key: C, mods: Command, action: Copy }
+  - { key: Q, mods: Command, action: Quit }
+  - { key: W, mods: Command, action: Quit }
+  - { key: N, mods: Command, action: SpawnNewInstance }
+  - { key: Home, chars: "\eOH", mode: AppCursor }
+  - { key: Home, chars: "\e[1~", mode: ~AppCursor }
+  - { key: End, chars: "\eOF", mode: AppCursor }
+  - { key: End, chars: "\e[4~", mode: ~AppCursor }
+  - { key: PageUp, mods: Shift, chars: "\e[5;2~" }
+  - { key: PageUp, mods: Control, chars: "\e[5;5~" }
+  - { key: PageUp, chars: "\e[5~" }
+  - { key: PageDown, mods: Shift, chars: "\e[6;2~" }
+  - { key: PageDown, mods: Control, chars: "\e[6;5~" }
+  - { key: PageDown, chars: "\e[6~" }
+  - { key: Left, mods: Shift, chars: "\e[1;2D" }
+  - { key: Left, mods: Control, chars: "\e[1;5D" }
+  - { key: Left, mods: Alt, chars: "\e[1;3D" }
+  - { key: Left, chars: "\e[D", mode: ~AppCursor }
+  - { key: Left, chars: "\eOD", mode: AppCursor }
+  - { key: Right, mods: Shift, chars: "\e[1;2C" }
+  - { key: Right, mods: Control, chars: "\e[1;5C" }
+  - { key: Right, mods: Alt, chars: "\e[1;3C" }
+  - { key: Right, chars: "\e[C", mode: ~AppCursor }
+  - { key: Right, chars: "\eOC", mode: AppCursor }
+  - { key: Up, mods: Shift, chars: "\e[1;2A" }
+  - { key: Up, mods: Control, chars: "\e[1;5A" }
+  - { key: Up, mods: Alt, chars: "\e[1;3A" }
+  - { key: Up, chars: "\e[A", mode: ~AppCursor }
+  - { key: Up, chars: "\eOA", mode: AppCursor }
+  - { key: Down, mods: Shift, chars: "\e[1;2B" }
+  - { key: Down, mods: Control, chars: "\e[1;5B" }
+  - { key: Down, mods: Alt, chars: "\e[1;3B" }
+  - { key: Down, chars: "\e[B", mode: ~AppCursor }
+  - { key: Down, chars: "\eOB", mode: AppCursor }
+  - { key: Tab, mods: Shift, chars: "\e[Z" }
+  - { key: F1, chars: "\eOP" }
+  - { key: F2, chars: "\eOQ" }
+  - { key: F3, chars: "\eOR" }
+  - { key: F4, chars: "\eOS" }
+  - { key: F5, chars: "\e[15~" }
+  - { key: F6, chars: "\e[17~" }
+  - { key: F7, chars: "\e[18~" }
+  - { key: F8, chars: "\e[19~" }
+  - { key: F9, chars: "\e[20~" }
+  - { key: F10, chars: "\e[21~" }
+  - { key: F11, chars: "\e[23~" }
+  - { key: F12, chars: "\e[24~" }
+  - { key: Back, chars: "" }
+  - { key: Back, mods: Alt, chars: "\e" }
+  - { key: Insert, chars: "\e[2~" }
+  - { key: Delete, chars: "\e[3~" }
+
+  # shortcuts for tmux. the leader key is control-b (0x02)
+  - { key: W, mods: Command, chars: "\x02&" } # close tab (kill)
+  - { key: T, mods: Command, chars: "\x02c" } # new tab
+  - { key: RBracket, mods: Command|Shift, chars: "\x02n" } # select next tab
+  - { key: LBracket, mods: Command|Shift, chars: "\x02p" } # select previous tab
+  - { key: RBracket, mods: Command, chars: "\x02o" } # select next pane
+  - { key: LBracket, mods: Command, chars: "\x02;" } # select last (previously used) pane
+  - { key: F, mods: Command, chars: "\x02/" } # search (upwards) (see tmux.conf)
+
+# Mouse bindings
+#
+# Currently doesn't support modifiers. Both the `mouse` and `action` fields must
+# be specified.
+#
+# Values for `mouse`:
+# - Middle
+# - Left
+# - Right
+# - Numeric identifier such as `5`
+#
+# Values for `action`:
+# - Paste
+# - PasteSelection
+# - Copy (TODO)
+mouse_bindings:
+  - { mouse: Middle, action: PasteSelection }
+
+mouse:
+  double_click: { threshold: 300 }
+  triple_click: { threshold: 300 }
+
+selection:
+  semantic_escape_chars: ',│`|:"'' ()[]{}<>'
+
+# Shell
+#
+# You can set shell.program to the path of your favorite shell, e.g. /bin/fish.
+# Entries in shell.args are passed unmodified as arguments to the shell.
+#
+#shell:
+#  program: /bin/bash
+#  args:
+#    - --login

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/alias-tunkki

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Setting aliases for tunkki
+
+alias nvim="/snap/nvim/current/usr/bin/nvim"

config/astronvim/lua/user/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

config/astronvim/lua/user/highlights/duskfox.lua

@@ -1,3 +0,0 @@
-return { -- a table of overrides/changes to the duskfox theme
-  Normal = { bg = "#000000" },
-}

config/astronvim/lua/user/highlights/init.lua

@@ -1,3 +0,0 @@
-return { -- this table overrides highlights in all themes
-  -- Normal = { bg = "#000000" },
-}

config/astronvim/lua/user/init.lua

@@ -1,94 +0,0 @@
-return {
-  -- Configure AstroNvim updates
-  updater = {
-    remote = "origin", -- remote to use
-    channel = "stable", -- "stable" or "nightly"
-    version = "latest", -- "latest", tag name, or regex search like "v1.*" to only do updates before v2 (STABLE ONLY)
-    branch = "nightly", -- branch name (NIGHTLY ONLY)
-    commit = nil, -- commit hash (NIGHTLY ONLY)
-    pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only)
-    skip_prompts = false, -- skip prompts about breaking changes
-    show_changelog = true, -- show the changelog after performing an update
-    auto_quit = true, -- automatically quit the current session after a successful update
-    remotes = { -- easily add new remotes to track
-      --   ["remote_name"] = "https://remote_url.come/repo.git", -- full remote url
-      --   ["remote2"] = "github_user/repo", -- GitHub user/repo shortcut,
-      --   ["remote3"] = "github_user", -- GitHub user assume AstroNvim fork
-    },
-  },
-  -- Set colorscheme to use
-  colorscheme = "catppuccin", -- or astrondark
-  -- Diagnostics configuration (for vim.diagnostics.config({...}))
-  -- when diagnostics are on
-  diagnostics = {
-    virtual_text = false,
-    underline = true,
-  },
-  lsp = {
-    -- customize lsp formatting options
-    formatting = {
-      -- control auto formatting on save
-      format_on_save = {
-        -- enable or disable format on save globally
-        enabled = true,
-        -- enable format on save for specified filetypes only
-        allow_filetypes = {
-          -- "go",
-        },
-        -- disable format on save for specified filetypes
-        ignore_filetypes = {
-          -- "python",
-        },
-      },
-      -- disable formatting capabilities for the listed language servers
-      disabled = {
-        -- "sumneko_lua",
-      },
-      -- default format timeout
-      timeout_ms = 1000,
-      -- -- fully override the default formatting function
-      -- filter = function(client) -- fully override the default formatting function
-      --   return true
-      -- end
-    },
-    -- enable servers that you already have installed without mason
-    servers = {
-      -- "pyright"
-    },
-  },
-  -- Configure require("lazy").setup() options
-  lazy = {
-    defaults = { lazy = true },
-    performance = {
-      rtp = {
-        -- customize default disabled vim plugins
-        disabled_plugins = {
-          "tohtml",
-          "gzip",
-          "matchit",
-          "zipPlugin",
-          "netrwPlugin",
-          "tarPlugin",
-          "matchparen",
-        },
-      },
-    },
-  },
-  -- This function is run last and is a good place to configuring
-  -- 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()
-    -- Set up custom filetypes
-    -- vim.filetype.add {
-    --   extension = {
-    --     foo = "fooscript",
-    --   },
-    --   filename = {
-    --     ["Foofile"] = "fooscript",
-    --   },
-    --   pattern = {
-    --     ["~/%.config/foo/.*"] = "fooscript",
-    --   },
-    -- }
-  end,
-}

config/astronvim/lua/user/mappings.lua

@@ -1,30 +0,0 @@
--- Mapping data with "desc" stored directly by vim.keymap.set().
---
--- Please use this mappings table to set keyboard mapping since this is the
--- lower level configuration and more robust one. (which-key will
--- automatically pick-up stored data by this setting.)
-return {
-  -- first key is the mode
-  n = {
-    -- second key is the lefthand side of the map
-    -- mappings seen under group name "Buffer"
-    ["<leader>bn"] = { "<cmd>tabnew<cr>", desc = "New tab" },
-    ["<leader>bD"] = {
-      function()
-        require("astronvim.utils.status").heirline.buffer_picker(
-          function(bufnr) require("astronvim.utils.buffer").close(bufnr) end
-        )
-      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
-    ["<leader>b"] = { name = "Buffers" },
-    -- quick save
-    -- ["<C-s>"] = { ":w!<cr>", desc = "Save File" },  -- change description but the same command
-  },
-  t = {
-    -- setting a mapping to false will disable it
-    -- ["<esc>"] = false,
-  },
-}

config/astronvim/lua/user/options.lua

@@ -1,38 +0,0 @@
--- set vim options here (vim.<first_key>.<second_key> = value)
-return {
-  opt = {
-    -- set to true or false etc.
-    relativenumber = true, -- sets vim.opt.relativenumber
-    number = true, -- sets vim.opt.number
-    spell = false, -- sets vim.opt.spell
-    signcolumn = "auto", -- sets vim.opt.signcolumn to auto
-    wrap = true, -- sets vim.opt.wrap
-  },
-  g = {
-    -- sets vim.g.mapleader
-    mapleader = " ",
-    -- enable or disable auto formatting at start (lsp.formatting.format_on_save must be enabled)
-    autoformat_enabled = true,
-    -- enable completion at start
-    cmp_enabled = true,
-    -- enable autopairs at start
-    autopairs_enabled = true,
-    -- set the visibility of diagnostics in the UI
-    -- (0=off, 1=only show in status line, 2=virtual text off, 3=all on)
-    diagnostics_mode = 3,
-    -- disable icons in the UI (disable if no nerd font is available,
-    -- requires :PackerSync after changing)
-    icons_enabled = true,
-    -- disable notifications when toggling UI elements
-    ui_notifications_enabled = true,
-  },
-}
--- If you need more control, you can use the function()...end notation
--- return function(local_vim)
---   local_vim.opt.relativenumber = true
---   local_vim.g.mapleader = " "
---   local_vim.opt.whichwrap = vim.opt.whichwrap - { 'b', 's' } -- removing option from list
---   local_vim.opt.shortmess = vim.opt.shortmess + { I = true } -- add to option list
---
---   return local_vim
--- end

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

@@ -1,49 +0,0 @@
-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 = true,
-      dim_inactive = {
-        enabled = true,
-        shade = "dark",
-        percentage = 0.15,
-      },
-    }
-  },
-  -- { import = "astrocommunity.completion.copilot-lua-cmp" },
-  { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" },
-  {
-    "m4xshen/smartcolumn.nvim",
-    opts = {
-      colorcolumn = { "80", "100", "120" },
-      disabled_filetypes = { "help", "text", "markdown", "json" },
-    },
-  },
-  { import = "astrocommunity.diagnostics.trouble-nvim" },
-  {
-    "folke/trouble.nvim",
-    opts = {
-      auto_open = false,
-      position = "right"
-    }
-  },
-  { 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.motion.harpoon" },
-  { import = "astrocommunity.pack.php" },
-  { import = "astrocommunity.project.neoconf-nvim" },
-  { 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

@@ -1,107 +0,0 @@
-return {
-  -- customize alpha options
-  {
-    "goolord/alpha-nvim",
-    opts = function(_, opts)
-      -- customize the dashboard header
-      opts.section.header.val = {
-        "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░",
-        "░░░░░░░░░░▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄░░░░░░░░░",
-        "░░░░░░░░▄▀░░░░░░░░░░░░▄░░░░░░░▀▄░░░░░░░",
-        "░░░░░░░░█░░▄░░░░▄░░░░░░░░░░░░░░█░░░░░░░",
-        "░░░░░░░░█░░░░░░░░░░░░▄█▄▄░░▄░░░█░▄▄▄░░░",
-        "░▄▄▄▄▄░░█░░░░░░▀░░░░▀█░░▀▄░░░░░█▀▀░██░░",
-        "░██▄▀██▄█░░░▄░░░░░░░██░░░░▀▀▀▀▀░░░░██░░",
-        "░░▀██▄▀██░░░░░░░░▀░██▀░░░░░░░░░░░░░▀██░",
-        "░░░░▀████░▀░░░░▄░░░██░░░▄█░░░░▄░▄█░░██░",
-        "░░░░░░░▀█░░░░▄░░░░░██░░░░▄░░░▄░░▄░░░██░",
-        "░░░░░░░▄█▄░░░░░░░░░░░▀▄░░▀▀▀▀▀▀▀▀░░▄▀░░",
-        "░░░░░░█▀▀█████████▀▀▀▀████████████▀░░░░",
-        "░░░░░░████▀░░███▀░░░░░░▀███░░▀██▀░░░░░░",
-        "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░"
-      }
-      return opts
-    end,
-  },
-  -- You can disable default plugins as follows:
-  -- { "max397574/better-escape.nvim", enabled = false },
-  --
-  -- You can also easily customize additional setup of plugins
-  -- that is outside of the plugin's setup call
-  {
-    "L3MON4D3/LuaSnip",
-    config = function(plugin, opts)
-      -- include the default astronvim config that calls the setup call
-      require "plugins.configs.luasnip" (plugin, opts)
-      -- add more custom luasnip configuration such
-      -- as filetype extend or custom snippets
-      local luasnip = require "luasnip"
-      luasnip.filetype_extend("javascript", { "javascriptreact" })
-    end,
-  },
-  {
-    "nvim-neo-tree/neo-tree.nvim",
-    opts = function(_, opts)
-      require "plugins.neo-tree"
-      opts.filesystem.filtered_items = {
-        visible = false,
-        show_hidden_count = true,
-        hide_dotfiles = false,
-        hide_gitignored = true,
-        hide_by_name = {
-        },
-        never_show = {
-          '.git',
-          '.DS_Store',
-          'thumbs.db'
-        },
-      }
-
-      return opts
-    end,
-  },
-  -- {
-  --   "windwp/nvim-autopairs",
-  --   config = function(plugin, opts)
-  --     -- include the default astronvim config that calls the setup call
-  --     require "plugins.configs.nvim-autopairs"(plugin, opts)
-  --     -- add more custom autopairs configuration such as custom rules
-  --     local npairs = require "nvim-autopairs"
-  --     local Rule = require "nvim-autopairs.rule"
-  --     local cond = require "nvim-autopairs.conds"
-  --     npairs.add_rules(
-  --       {
-  --         Rule("$", "$", { "tex", "latex" })
-  --           -- don't add a pair if the next character is %
-  --           :with_pair(cond.not_after_regex "%%")
-  --           -- don't add a pair if  the previous character is xxx
-  --           :with_pair(
-  --             cond.not_before_regex("xxx", 3)
-  --           )
-  --           -- don't move right when repeat character
-  --           :with_move(cond.none())
-  --           -- don't delete if the next character is xx
-  --           :with_del(cond.not_after_regex "xx")
-  --           -- disable adding a newline when you press <cr>
-  --           :with_cr(cond.none()),
-  --       },
-  --       -- disable for .vim files, but it work for another filetypes
-  --       Rule("a", "a", "-vim")
-  --     )
-  --   end,
-  -- },
-  -- By adding to the which-key config and using our helper
-  -- function you can add more which-key registered bindings
-  {
-    "folke/which-key.nvim",
-    config = function(plugin, opts)
-      -- include the default astronvim config that calls the setup call
-      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>" })
-    end,
-  },
-}

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

@@ -1,45 +0,0 @@
--- customize mason plugins
-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",
-        "eslint",
-        "graphql",
-        "html",
-        "intelephense",
-        "jsonls",
-        "psalm",
-        "stylelint_lsp",
-        "tailwindcss",
-        "tsserver",
-        "vuels",
-        "yamlls",
-      },
-    },
-  }, -- 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,
-    },
-  },
-  {
-    "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" },
-    },
-  },
-}

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

@@ -1,53 +0,0 @@
-return {
-  "jose-elias-alvarez/null-ls.nvim",
-  opts = function(_, config)
-    -- config variable is the default configuration table for the setup function call
-    local null_ls = require "null-ls"
-
-    -- Check supported formatters and linters
-    -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting
-    -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
-    config.sources = {
-      -- Set a formatter
-      null_ls.builtins.code_actions.eslint,
-      null_ls.builtins.code_actions.refactoring,
-      null_ls.builtins.code_actions.shellcheck,
-      null_ls.builtins.diagnostics.actionlint,
-      null_ls.builtins.diagnostics.alex,
-      null_ls.builtins.diagnostics.ansiblelint,
-      null_ls.builtins.diagnostics.dotenv_linter,
-      null_ls.builtins.diagnostics.editorconfig_checker,
-      null_ls.builtins.diagnostics.eslint,
-      null_ls.builtins.diagnostics.jsonlint,
-      null_ls.builtins.diagnostics.luacheck,
-      null_ls.builtins.diagnostics.php,
-      null_ls.builtins.diagnostics.phpcs,
-      null_ls.builtins.diagnostics.phpstan,
-      null_ls.builtins.diagnostics.psalm,
-      null_ls.builtins.diagnostics.semgrep,
-      null_ls.builtins.diagnostics.shellcheck,
-      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.yamllint,
-      null_ls.builtins.diagnostics.zsh,
-      null_ls.builtins.formatting.blade_formatter,
-      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.phpcsfixer,
-      null_ls.builtins.formatting.prettierd,
-      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,33 +0,0 @@
-return {
-  "nvim-treesitter/nvim-treesitter",
-  opts = {
-    ensure_installed = {
-      "bash",
-      "c",
-      "cmake",
-      "comment",
-      "diff",
-      "dockerfile",
-      "gitignore",
-      "graphql",
-      "html",
-      "javascript",
-      "json",
-      "json5",
-      "latex",
-      "lua",
-      "markdown",
-      "php",
-      "phpdoc",
-      "python",
-      "scss",
-      "terraform",
-      "todotxt",
-      "toml",
-      "typescript",
-      "vim",
-      "vue",
-      "yaml",
-    },
-  },
-}

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

@@ -1,15 +0,0 @@
-return {
-  -- You can also add new plugins here as well:
-  -- Add plugins, the lazy syntax
-  "andweeb/presence.nvim",
-  {
-    "ray-x/lsp_signature.nvim",
-    event = "BufRead",
-    config = function() require("lsp_signature").setup() end,
-  },
-  {
-    "wakatime/vim-wakatime",
-    lazy = false,
-    enabled = true,
-  },
-}

config/cheat/conf.yml

@@ -1,24 +1,19 @@
----
 # The editor to use with 'cheat -e <sheet>'. Defaults to $EDITOR or $VISUAL.
 # 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"
-
 # 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.
 #
@@ -63,21 +58,21 @@ cheatpaths:
   #   'readonly': shall user-created ('cheat -e') cheatsheets be saved here?
   - name: community
     path: ~/.config/cheat/cheatsheets/community
-    tags: [ community ]
+    tags: [community]
     readonly: true
   # If you have personalized cheatsheets, list them last. They will take
   # precedence over the more global cheatsheets.
   - name: personal
     path: ~/.dotfiles/config/cheat/cheatsheets/personal
-    tags: [ personal ]
+    tags: [personal]
     readonly: false
   - name: pure-bash-bible
     path: ~/.dotfiles/config/cheat/cheatsheets/pure-bash-bible
-    tags: [ pure-bash-bible ]
+    tags: [pure-bash-bible]
     readonly: true
   - name: tldr
     path: ~/.dotfiles/config/cheat/cheatsheets/tldr
-    tags: [ tldr ]
+    tags: [tldr]
     readonly: true
 
 # While it requires no configuration here, it's also worth noting that

config/exports

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# shellcheck shell=zsh
+# shellcheck shell=bash
 # vim: filetype=zsh
 
 export DOTFILES="$HOME/.dotfiles"
@@ -17,24 +17,15 @@ 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
+path_append "/opt/homebrew/bin"
+have brew && eval "$(brew shellenv)"
 
 path_append "/usr/local/bin"
-path_append "$HOMEBREW_SBIN"
-path_append "$HOMEBREW_BIN"
 path_append "$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,8 +1,9 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # shellcheck enable=external-sources
-# shellcheck disable=1091
+# shellcheck disable=1091,2139
 # vim: filetype=zsh
+export DOTFILES="$HOME/.dotfiles"
 source "$DOTFILES/scripts/shared.sh"
 
 # Antigen configuration
@@ -13,34 +14,36 @@ 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"
+
+export HOMEBREW_NO_ENV_HINTS=true
+
 # 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 +52,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 && {
@@ -73,10 +68,8 @@ have irssi && {
 }
 
 # nb, https://xwmx.github.io/nb/
-have nb && {
-  export NB_DIR="$XDG_STATE_HOME/nb"
-  x-dc "$NB_DIR"
-}
+export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
+export NB_DIR="$XDG_STATE_HOME/nb"
 
 # nvm, the node version manager
 export NVM_LAZY_LOAD=true
@@ -86,6 +79,8 @@ 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
 
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+
 # Add npm packages to path
 have node && {
   NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
@@ -93,22 +88,52 @@ have node && {
 }
 
 # 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_DATA_HOME/cargo"
+path_append "$CARGO_HOME/bin"
+
+# screen
+export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
+
+# sonarlint
+export SONARLINT_USER_HOME="$XDG_DATA_HOME/sonarlint"
+
+# tldr / tealdeer
+export TEALDEER_CONFIG_DIR="$XDG_CONFIG_HOME/tealdeer/"
+
+# 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"
@@ -118,10 +143,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 TMUX_CONF="$DOTFILES/config/tmux/tmux.conf"
 export BAT_THEME="ansi"
 export CHEAT_USE_FZF=true
-
+export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history

config/exports-shell

@@ -2,9 +2,10 @@
 # shellcheck shell=bash
 # shellcheck disable=1091,2046
 # vim: filetype=zsh
+export DOTFILES="$HOME/.dotfiles"
 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

@@ -3,6 +3,7 @@
 # shell functions
 #
 # shellcheck source="../scripts/shared.sh"
+export DOTFILES="$HOME/.dotfiles"
 source "$DOTFILES/scripts/shared.sh"
 
 # Weather in Tampere, or other city
@@ -19,22 +20,16 @@ ssh-docker()
   docker exec -it "$@" bash
 }
 
-# Create a new directory and enter it
-mkd()
-{
-  mkdir -p "$@" && cd "$@" || exit
-}
-
 # All the dig info
 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}" \
@@ -63,33 +58,24 @@ scheduler()
   done
 }
 
-silent()
-{
-  "$@" >&/dev/null
-}
-
-ask()
-{
-  while true; do
-    read -p "$1 ([y]/n) " -r
-    REPLY=${REPLY:-"y"}
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-      return 1
-    elif [[ $REPLY =~ ^[Nn]$ ]]; then
-      return 0
-    fi
-  done
-}
-
 # Defines default antigen bundles
 x-default-antigen-bundles()
 {
+  export ZSH_TMUX_AUTOSTART=false
+  export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
+  export ZSH_TMUX_UNICODE=true
+  export ZSH_TMUX_AUTOQUIT=false
+  export ZSH_TMUX_DEFAULT_SESSION_NAME=main
+
+  # Add keychain to ssh-agent args when on macOS
+  have brew && zstyle :omz:plugins:ssh-agent ssh-add-args --apple-load-keychain
+
   # these should be always available
+  antigen bundle tmux
   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 MichaelAquilina/zsh-you-should-use
   antigen bundle jreese/zsh-titles
   antigen bundle unixorn/autoupdate-antigen.zshplugin
   antigen bundle zsh-users/zsh-completions
@@ -97,10 +83,8 @@ x-default-antigen-bundles()
 
   # these should be available if there's need
   have brew && antigen bundle brew
-  have docker && antigen bundle docker
-  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 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/fzf/completion.bash

@@ -0,0 +1,382 @@
+#     ____      ____
+#    / __/___  / __/
+#   / /_/_  / / /_
+#  / __/ / /_/ __/
+# /_/   /___/_/ completion.bash
+#
+# - $FZF_TMUX               (default: 0)
+# - $FZF_TMUX_OPTS          (default: empty)
+# - $FZF_COMPLETION_TRIGGER (default: '**')
+# - $FZF_COMPLETION_OPTS    (default: empty)
+
+if [[ $- =~ i ]]; then
+
+# To use custom commands instead of find, override _fzf_compgen_{path,dir}
+if ! declare -f _fzf_compgen_path > /dev/null; then
+  _fzf_compgen_path() {
+    echo "$1"
+    command find -L "$1" \
+      -name .git -prune -o -name .hg -prune -o -name .svn -prune -o \( -type d -o -type f -o -type l \) \
+      -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
+  }
+fi
+
+if ! declare -f _fzf_compgen_dir > /dev/null; then
+  _fzf_compgen_dir() {
+    command find -L "$1" \
+      -name .git -prune -o -name .hg -prune -o -name .svn -prune -o -type d \
+      -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
+  }
+fi
+
+###########################################################
+
+# To redraw line after fzf closes (printf '\e[5n')
+bind '"\e[0n": redraw-current-line' 2> /dev/null
+
+__fzf_comprun() {
+  if [[ "$(type -t _fzf_comprun 2>&1)" = function ]]; then
+    _fzf_comprun "$@"
+  elif [[ -n "${TMUX_PANE-}" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]; }; then
+    shift
+    fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- "$@"
+  else
+    shift
+    fzf "$@"
+  fi
+}
+
+__fzf_orig_completion() {
+  local l comp f cmd
+  while read -r l; do
+    if [[ "$l" =~ ^(.*\ -F)\ *([^ ]*).*\ ([^ ]*)$ ]]; then
+      comp="${BASH_REMATCH[1]}"
+      f="${BASH_REMATCH[2]}"
+      cmd="${BASH_REMATCH[3]}"
+      [[ "$f" = _fzf_* ]] && continue
+      printf -v "_fzf_orig_completion_${cmd//[^A-Za-z0-9_]/_}" "%s" "${comp} %s ${cmd} #${f}"
+      if [[ "$l" = *" -o nospace "* ]] && [[ ! "${__fzf_nospace_commands-}" = *" $cmd "* ]]; then
+        __fzf_nospace_commands="${__fzf_nospace_commands-} $cmd "
+      fi
+    fi
+  done
+}
+
+_fzf_opts_completion() {
+  local cur prev opts
+  COMPREPLY=()
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  prev="${COMP_WORDS[COMP_CWORD-1]}"
+  opts="
+    -x --extended
+    -e --exact
+    --algo
+    -i +i
+    -n --nth
+    --with-nth
+    -d --delimiter
+    +s --no-sort
+    --tac
+    --tiebreak
+    -m --multi
+    --no-mouse
+    --bind
+    --cycle
+    --no-hscroll
+    --jump-labels
+    --height
+    --literal
+    --reverse
+    --margin
+    --inline-info
+    --prompt
+    --pointer
+    --marker
+    --header
+    --header-lines
+    --ansi
+    --tabstop
+    --color
+    --no-bold
+    --history
+    --history-size
+    --preview
+    --preview-window
+    -q --query
+    -1 --select-1
+    -0 --exit-0
+    -f --filter
+    --print-query
+    --expect
+    --sync"
+
+  case "${prev}" in
+  --tiebreak)
+    COMPREPLY=( $(compgen -W "length begin end index" -- "$cur") )
+    return 0
+    ;;
+  --color)
+    COMPREPLY=( $(compgen -W "dark light 16 bw" -- "$cur") )
+    return 0
+    ;;
+  --history)
+    COMPREPLY=()
+    return 0
+    ;;
+  esac
+
+  if [[ "$cur" =~ ^-|\+ ]]; then
+    COMPREPLY=( $(compgen -W "${opts}" -- "$cur") )
+    return 0
+  fi
+
+  return 0
+}
+
+_fzf_handle_dynamic_completion() {
+  local cmd orig_var orig ret orig_cmd orig_complete
+  cmd="$1"
+  shift
+  orig_cmd="$1"
+  orig_var="_fzf_orig_completion_$cmd"
+  orig="${!orig_var-}"
+  orig="${orig##*#}"
+  if [[ -n "$orig" ]] && type "$orig" > /dev/null 2>&1; then
+    $orig "$@"
+  elif [[ -n "${_fzf_completion_loader-}" ]]; then
+    orig_complete=$(complete -p "$orig_cmd" 2> /dev/null)
+    _completion_loader "$@"
+    ret=$?
+    # _completion_loader may not have updated completion for the command
+    if [[ "$(complete -p "$orig_cmd" 2> /dev/null)" != "$orig_complete" ]]; then
+      __fzf_orig_completion < <(complete -p "$orig_cmd" 2> /dev/null)
+      if [[ "${__fzf_nospace_commands-}" = *" $orig_cmd "* ]]; then
+        eval "${orig_complete/ -F / -o nospace -F }"
+      else
+        eval "$orig_complete"
+      fi
+    fi
+    return $ret
+  fi
+}
+
+__fzf_generic_path_completion() {
+  local cur base dir leftover matches trigger cmd
+  cmd="${COMP_WORDS[0]}"
+  if [[ $cmd == \\* ]]; then
+    cmd="${cmd:1}"
+  fi
+  cmd="${cmd//[^A-Za-z0-9_=]/_}"
+  COMPREPLY=()
+  trigger=${FZF_COMPLETION_TRIGGER-'**'}
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  if [[ "$cur" == *"$trigger" ]]; then
+    base=${cur:0:${#cur}-${#trigger}}
+    eval "base=$base"
+
+    dir=
+    [[ $base = *"/"* ]] && dir="$base"
+    while true; do
+      if [[ -z "$dir" ]] || [[ -d "$dir" ]]; then
+        leftover=${base/#"$dir"}
+        leftover=${leftover/#\/}
+        [[ -z "$dir" ]] && dir='.'
+        [[ "$dir" != "/" ]] && dir="${dir/%\//}"
+        matches=$(eval "$1 $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $2" __fzf_comprun "$4" -q "$leftover" | while read -r item; do
+          printf "%q " "${item%$3}$3"
+        done)
+        matches=${matches% }
+        [[ -z "$3" ]] && [[ "${__fzf_nospace_commands-}" = *" ${COMP_WORDS[0]} "* ]] && matches="$matches "
+        if [[ -n "$matches" ]]; then
+          COMPREPLY=( "$matches" )
+        else
+          COMPREPLY=( "$cur" )
+        fi
+        printf '\e[5n'
+        return 0
+      fi
+      dir=$(dirname "$dir")
+      [[ "$dir" =~ /$ ]] || dir="$dir"/
+    done
+  else
+    shift
+    shift
+    shift
+    _fzf_handle_dynamic_completion "$cmd" "$@"
+  fi
+}
+
+_fzf_complete() {
+  # Split arguments around --
+  local args rest str_arg i sep
+  args=("$@")
+  sep=
+  for i in "${!args[@]}"; do
+    if [[ "${args[$i]}" = -- ]]; then
+      sep=$i
+      break
+    fi
+  done
+  if [[ -n "$sep" ]]; then
+    str_arg=
+    rest=("${args[@]:$((sep + 1)):${#args[@]}}")
+    args=("${args[@]:0:$sep}")
+  else
+    str_arg=$1
+    args=()
+    shift
+    rest=("$@")
+  fi
+
+  local cur selected trigger cmd post
+  post="$(caller 0 | awk '{print $2}')_post"
+  type -t "$post" > /dev/null 2>&1 || post=cat
+
+  cmd="${COMP_WORDS[0]//[^A-Za-z0-9_=]/_}"
+  trigger=${FZF_COMPLETION_TRIGGER-'**'}
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  if [[ "$cur" == *"$trigger" ]]; then
+    cur=${cur:0:${#cur}-${#trigger}}
+
+    selected=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $str_arg" __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | $post | tr '\n' ' ')
+    selected=${selected% } # Strip trailing space not to repeat "-o nospace"
+    if [[ -n "$selected" ]]; then
+      COMPREPLY=("$selected")
+    else
+      COMPREPLY=("$cur")
+    fi
+    printf '\e[5n'
+    return 0
+  else
+    _fzf_handle_dynamic_completion "$cmd" "${rest[@]}"
+  fi
+}
+
+_fzf_path_completion() {
+  __fzf_generic_path_completion _fzf_compgen_path "-m" "" "$@"
+}
+
+# Deprecated. No file only completion.
+_fzf_file_completion() {
+  _fzf_path_completion "$@"
+}
+
+_fzf_dir_completion() {
+  __fzf_generic_path_completion _fzf_compgen_dir "" "/" "$@"
+}
+
+_fzf_complete_kill() {
+  _fzf_proc_completion "$@"
+}
+
+_fzf_proc_completion() {
+  _fzf_complete -m --header-lines=1 --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <(
+    command ps -eo user,pid,ppid,start,time,command 2> /dev/null ||
+      command ps -eo user,pid,ppid,time,args # For BusyBox
+  )
+}
+
+_fzf_proc_completion_post() {
+  awk '{print $2}'
+}
+
+_fzf_host_completion() {
+  _fzf_complete +m -- "$@" < <(
+    command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \
+        <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \
+        <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') |
+        awk '{if (length($2) > 0) {print $2}}' | sort -u
+  )
+}
+
+_fzf_var_completion() {
+  _fzf_complete -m -- "$@" < <(
+    declare -xp | sed -En 's|^declare [^ ]+ ([^=]+).*|\1|p'
+  )
+}
+
+_fzf_alias_completion() {
+  _fzf_complete -m -- "$@" < <(
+    alias | sed -En 's|^alias ([^=]+).*|\1|p'
+  )
+}
+
+# fzf options
+complete -o default -F _fzf_opts_completion fzf
+# fzf-tmux is a thin fzf wrapper that has only a few more options than fzf
+# itself. As a quick improvement we take fzf's completion. Adding the few extra
+# fzf-tmux specific options (like `-w WIDTH`) are left as a future patch.
+complete -o default -F _fzf_opts_completion fzf-tmux
+
+d_cmds="${FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir}"
+a_cmds="
+  awk bat cat diff diff3
+  emacs emacsclient ex file ftp g++ gcc gvim head hg hx java
+  javac ld less more mvim nvim patch perl python ruby
+  sed sftp sort source tail tee uniq vi view vim wc xdg-open
+  basename bunzip2 bzip2 chmod chown curl cp dirname du
+  find git grep gunzip gzip hg jar
+  ln ls mv open rm rsync scp
+  svn tar unzip zip"
+
+# Preserve existing completion
+__fzf_orig_completion < <(complete -p $d_cmds $a_cmds 2> /dev/null)
+
+if type _completion_loader > /dev/null 2>&1; then
+  _fzf_completion_loader=1
+fi
+
+__fzf_defc() {
+  local cmd func opts orig_var orig def
+  cmd="$1"
+  func="$2"
+  opts="$3"
+  orig_var="_fzf_orig_completion_${cmd//[^A-Za-z0-9_]/_}"
+  orig="${!orig_var-}"
+  if [[ -n "$orig" ]]; then
+    printf -v def "$orig" "$func"
+    eval "$def"
+  else
+    complete -F "$func" $opts "$cmd"
+  fi
+}
+
+# Anything
+for cmd in $a_cmds; do
+  __fzf_defc "$cmd" _fzf_path_completion "-o default -o bashdefault"
+done
+
+# Directory
+for cmd in $d_cmds; do
+  __fzf_defc "$cmd" _fzf_dir_completion "-o nospace -o dirnames"
+done
+
+unset cmd d_cmds a_cmds
+
+_fzf_setup_completion() {
+  local kind fn cmd
+  kind=$1
+  fn=_fzf_${1}_completion
+  if [[ $# -lt 2 ]] || ! type -t "$fn" > /dev/null; then
+    echo "usage: ${FUNCNAME[0]} path|dir|var|alias|host|proc COMMANDS..."
+    return 1
+  fi
+  shift
+  __fzf_orig_completion < <(complete -p "$@" 2> /dev/null)
+  for cmd in "$@"; do
+    case "$kind" in
+      dir)   __fzf_defc "$cmd" "$fn" "-o nospace -o dirnames" ;;
+      var)   __fzf_defc "$cmd" "$fn" "-o default -o nospace -v" ;;
+      alias) __fzf_defc "$cmd" "$fn" "-a" ;;
+      *)     __fzf_defc "$cmd" "$fn" "-o default -o bashdefault" ;;
+    esac
+  done
+}
+
+# Environment variables / Aliases / Hosts / Process
+_fzf_setup_completion 'var'   export unset printenv
+_fzf_setup_completion 'alias' unalias
+_fzf_setup_completion 'host'  ssh telnet
+_fzf_setup_completion 'proc'  kill
+
+fi

config/fzf/completion.zsh

@@ -0,0 +1,325 @@
+#     ____      ____
+#    / __/___  / __/
+#   / /_/_  / / /_
+#  / __/ / /_/ __/
+# /_/   /___/_/ completion.zsh
+#
+# - $FZF_TMUX               (default: 0)
+# - $FZF_TMUX_OPTS          (default: '-d 40%')
+# - $FZF_COMPLETION_TRIGGER (default: '**')
+# - $FZF_COMPLETION_OPTS    (default: empty)
+
+# Both branches of the following `if` do the same thing -- define
+# __fzf_completion_options such that `eval $__fzf_completion_options` sets
+# all options to the same values they currently have. We'll do just that at
+# the bottom of the file after changing options to what we prefer.
+#
+# IMPORTANT: Until we get to the `emulate` line, all words that *can* be quoted
+# *must* be quoted in order to prevent alias expansion. In addition, code must
+# be written in a way works with any set of zsh options. This is very tricky, so
+# careful when you change it.
+#
+# Start by loading the builtin zsh/parameter module. It provides `options`
+# associative array that stores current shell options.
+if 'zmodload' 'zsh/parameter' 2>'/dev/null' && (( ${+options} )); then
+  # This is the fast branch and it gets taken on virtually all Zsh installations.
+  #
+  # ${(kv)options[@]} expands to array of keys (option names) and values ("on"
+  # or "off"). The subsequent expansion# with (j: :) flag joins all elements
+  # together separated by spaces. __fzf_completion_options ends up with a value
+  # like this: "options=(shwordsplit off aliases on ...)".
+  __fzf_completion_options="options=(${(j: :)${(kv)options[@]}})"
+else
+  # This branch is much slower because it forks to get the names of all
+  # zsh options. It's possible to eliminate this fork but it's not worth the
+  # trouble because this branch gets taken only on very ancient or broken
+  # zsh installations.
+  () {
+    # That `()` above defines an anonymous function. This is essentially a scope
+    # for local parameters. We use it to avoid polluting global scope.
+    'local' '__fzf_opt'
+    __fzf_completion_options="setopt"
+    # `set -o` prints one line for every zsh option. Each line contains option
+    # name, some spaces, and then either "on" or "off". We just want option names.
+    # Expansion with (@f) flag splits a string into lines. The outer expansion
+    # removes spaces and everything that follow them on every line. __fzf_opt
+    # ends up iterating over option names: shwordsplit, aliases, etc.
+    for __fzf_opt in "${(@)${(@f)$(set -o)}%% *}"; do
+      if [[ -o "$__fzf_opt" ]]; then
+        # Option $__fzf_opt is currently on, so remember to set it back on.
+        __fzf_completion_options+=" -o $__fzf_opt"
+      else
+        # Option $__fzf_opt is currently off, so remember to set it back off.
+        __fzf_completion_options+=" +o $__fzf_opt"
+      fi
+    done
+    # The value of __fzf_completion_options here looks like this:
+    # "setopt +o shwordsplit -o aliases ..."
+  }
+fi
+
+# Enable the default zsh options (those marked with <Z> in `man zshoptions`)
+# but without `aliases`. Aliases in functions are expanded when functions are
+# defined, so if we disable aliases here, we'll be sure to have no pesky
+# aliases in any of our functions. This way we won't need prefix every
+# command with `command` or to quote every word to defend against global
+# aliases. Note that `aliases` is not the only option that's important to
+# control. There are several others that could wreck havoc if they are set
+# to values we don't expect. With the following `emulate` command we
+# sidestep this issue entirely.
+'emulate' 'zsh' '-o' 'no_aliases'
+
+# This brace is the start of try-always block. The `always` part is like
+# `finally` in lesser languages. We use it to *always* restore user options.
+{
+
+# Bail out if not interactive shell.
+[[ -o interactive ]] || return 0
+
+# To use custom commands instead of find, override _fzf_compgen_{path,dir}
+if ! declare -f _fzf_compgen_path > /dev/null; then
+  _fzf_compgen_path() {
+    echo "$1"
+    command find -L "$1" \
+      -name .git -prune -o -name .hg -prune -o -name .svn -prune -o \( -type d -o -type f -o -type l \) \
+      -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
+  }
+fi
+
+if ! declare -f _fzf_compgen_dir > /dev/null; then
+  _fzf_compgen_dir() {
+    command find -L "$1" \
+      -name .git -prune -o -name .hg -prune -o -name .svn -prune -o -type d \
+      -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@'
+  }
+fi
+
+###########################################################
+
+__fzf_comprun() {
+  if [[ "$(type _fzf_comprun 2>&1)" =~ function ]]; then
+    _fzf_comprun "$@"
+  elif [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; }; then
+    shift
+    if [ -n "${FZF_TMUX_OPTS-}" ]; then
+      fzf-tmux ${(Q)${(Z+n+)FZF_TMUX_OPTS}} -- "$@"
+    else
+      fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%} -- "$@"
+    fi
+  else
+    shift
+    fzf "$@"
+  fi
+}
+
+# Extract the name of the command. e.g. foo=1 bar baz**<tab>
+__fzf_extract_command() {
+  local token tokens
+  tokens=(${(z)1})
+  for token in $tokens; do
+    token=${(Q)token}
+    if [[ "$token" =~ [[:alnum:]] && ! "$token" =~ "=" ]]; then
+      echo "$token"
+      return
+    fi
+  done
+  echo "${tokens[1]}"
+}
+
+__fzf_generic_path_completion() {
+  local base lbuf cmd compgen fzf_opts suffix tail dir leftover matches
+  base=$1
+  lbuf=$2
+  cmd=$(__fzf_extract_command "$lbuf")
+  compgen=$3
+  fzf_opts=$4
+  suffix=$5
+  tail=$6
+
+  setopt localoptions nonomatch
+  eval "base=$base"
+  [[ $base = *"/"* ]] && dir="$base"
+  while [ 1 ]; do
+    if [[ -z "$dir" || -d ${dir} ]]; then
+      leftover=${base/#"$dir"}
+      leftover=${leftover/#\/}
+      [ -z "$dir" ] && dir='.'
+      [ "$dir" != "/" ] && dir="${dir/%\//}"
+      matches=$(eval "$compgen $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-}" __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" | while read item; do
+        item="${item%$suffix}$suffix"
+        echo -n "${(q)item} "
+      done)
+      matches=${matches% }
+      if [ -n "$matches" ]; then
+        LBUFFER="$lbuf$matches$tail"
+      fi
+      zle reset-prompt
+      break
+    fi
+    dir=$(dirname "$dir")
+    dir=${dir%/}/
+  done
+}
+
+_fzf_path_completion() {
+  __fzf_generic_path_completion "$1" "$2" _fzf_compgen_path \
+    "-m" "" " "
+}
+
+_fzf_dir_completion() {
+  __fzf_generic_path_completion "$1" "$2" _fzf_compgen_dir \
+    "" "/" ""
+}
+
+_fzf_feed_fifo() (
+  command rm -f "$1"
+  mkfifo "$1"
+  cat <&0 > "$1" &
+)
+
+_fzf_complete() {
+  setopt localoptions ksh_arrays
+  # Split arguments around --
+  local args rest str_arg i sep
+  args=("$@")
+  sep=
+  for i in {0..${#args[@]}}; do
+    if [[ "${args[$i]-}" = -- ]]; then
+      sep=$i
+      break
+    fi
+  done
+  if [[ -n "$sep" ]]; then
+    str_arg=
+    rest=("${args[@]:$((sep + 1)):${#args[@]}}")
+    args=("${args[@]:0:$sep}")
+  else
+    str_arg=$1
+    args=()
+    shift
+    rest=("$@")
+  fi
+
+  local fifo lbuf cmd matches post
+  fifo="${TMPDIR:-/tmp}/fzf-complete-fifo-$$"
+  lbuf=${rest[0]}
+  cmd=$(__fzf_extract_command "$lbuf")
+  post="${funcstack[1]}_post"
+  type $post > /dev/null 2>&1 || post=cat
+
+  _fzf_feed_fifo "$fifo"
+  matches=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $str_arg" __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ')
+  if [ -n "$matches" ]; then
+    LBUFFER="$lbuf$matches"
+  fi
+  command rm -f "$fifo"
+}
+
+_fzf_complete_telnet() {
+  _fzf_complete +m -- "$@" < <(
+    command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0' |
+        awk '{if (length($2) > 0) {print $2}}' | sort -u
+  )
+}
+
+_fzf_complete_ssh() {
+  _fzf_complete +m -- "$@" < <(
+    setopt localoptions nonomatch
+    command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \
+        <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \
+        <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') |
+        awk '{if (length($2) > 0) {print $2}}' | sort -u
+  )
+}
+
+_fzf_complete_export() {
+  _fzf_complete -m -- "$@" < <(
+    declare -xp | sed 's/=.*//' | sed 's/.* //'
+  )
+}
+
+_fzf_complete_unset() {
+  _fzf_complete -m -- "$@" < <(
+    declare -xp | sed 's/=.*//' | sed 's/.* //'
+  )
+}
+
+_fzf_complete_unalias() {
+  _fzf_complete +m -- "$@" < <(
+    alias | sed 's/=.*//'
+  )
+}
+
+_fzf_complete_kill() {
+  _fzf_complete -m --header-lines=1 --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <(
+    command ps -eo user,pid,ppid,start,time,command 2> /dev/null ||
+      command ps -eo user,pid,ppid,time,args # For BusyBox
+  )
+}
+
+_fzf_complete_kill_post() {
+  awk '{print $2}'
+}
+
+fzf-completion() {
+  local tokens cmd prefix trigger tail matches lbuf d_cmds
+  setopt localoptions noshwordsplit noksh_arrays noposixbuiltins
+
+  # http://zsh.sourceforge.net/FAQ/zshfaq03.html
+  # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
+  tokens=(${(z)LBUFFER})
+  if [ ${#tokens} -lt 1 ]; then
+    zle ${fzf_default_completion:-expand-or-complete}
+    return
+  fi
+
+  cmd=$(__fzf_extract_command "$LBUFFER")
+
+  # Explicitly allow for empty trigger.
+  trigger=${FZF_COMPLETION_TRIGGER-'**'}
+  [ -z "$trigger" -a ${LBUFFER[-1]} = ' ' ] && tokens+=("")
+
+  # When the trigger starts with ';', it becomes a separate token
+  if [[ ${LBUFFER} = *"${tokens[-2]-}${tokens[-1]}" ]]; then
+    tokens[-2]="${tokens[-2]-}${tokens[-1]}"
+    tokens=(${tokens[0,-2]})
+  fi
+
+  lbuf=$LBUFFER
+  tail=${LBUFFER:$(( ${#LBUFFER} - ${#trigger} ))}
+
+  # Trigger sequence given
+  if [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then
+    d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir})
+
+    [ -z "$trigger"      ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}}
+    [ -n "${tokens[-1]}" ] && lbuf=${lbuf:0:-${#tokens[-1]}}
+
+    if eval "type _fzf_complete_${cmd} > /dev/null"; then
+      prefix="$prefix" eval _fzf_complete_${cmd} ${(q)lbuf}
+      zle reset-prompt
+    elif [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then
+      _fzf_dir_completion "$prefix" "$lbuf"
+    else
+      _fzf_path_completion "$prefix" "$lbuf"
+    fi
+  # Fall back to default completion
+  else
+    zle ${fzf_default_completion:-expand-or-complete}
+  fi
+}
+
+[ -z "$fzf_default_completion" ] && {
+  binding=$(bindkey '^I')
+  [[ $binding =~ 'undefined-key' ]] || fzf_default_completion=$binding[(s: :w)2]
+  unset binding
+}
+
+zle     -N   fzf-completion
+bindkey '^I' fzf-completion
+
+} always {
+  # Restore the original options.
+  eval $__fzf_completion_options
+  'unset' '__fzf_completion_options'
+}

config/fzf/fzf.bash

@@ -1,13 +1,12 @@
 # Setup fzf
 # ---------
-if [[ ! "$PATH" == */Users/ivuorinen/.config/fzf/bin* ]]; then
-  PATH="${PATH:+${PATH}:}/Users/ivuorinen/.config/fzf/bin"
-fi
 
 # Auto-completion
 # ---------------
-[[ $- == *i* ]] && source "/Users/ivuorinen/.config/fzf/shell/completion.bash" 2> /dev/null
+# shellcheck source=completion.bash
+[[ $- == *i* ]] && source "$HOME/.dotfiles/config/fzf/completion.bash" 2> /dev/null
 
 # Key bindings
 # ------------
-source "/Users/ivuorinen/.config/fzf/shell/key-bindings.bash"
+# shellcheck source=key-bindings.bash
+source "$HOME/.dotfiles/config/fzf/key-bindings.bash"

config/fzf/fzf.zsh

@@ -1,13 +1,12 @@
 # Setup fzf
 # ---------
-if [[ ! "$PATH" == */Users/ivuorinen/.config/fzf/bin* ]]; then
-  PATH="${PATH:+${PATH}:}/Users/ivuorinen/.config/fzf/bin"
-fi
 
 # Auto-completion
 # ---------------
-[[ $- == *i* ]] && source "/Users/ivuorinen/.config/fzf/shell/completion.zsh" 2> /dev/null
+# shellcheck source=completion.zsh
+[[ $- == *i* ]] && source "$HOME/.dotfiles/config/fzf/completion.zsh" 2> /dev/null
 
 # Key bindings
 # ------------
-source "/Users/ivuorinen/.config/fzf/shell/key-bindings.zsh"
+# shellcheck source=key-bindings.zsh
+source "$HOME/.dotfiles/config/fzf/key-bindings.zsh"

config/fzf/key-bindings.bash

@@ -0,0 +1,103 @@
+#     ____      ____
+#    / __/___  / __/
+#   / /_/_  / / /_
+#  / __/ / /_/ __/
+# /_/   /___/_/ key-bindings.bash
+#
+# - $FZF_TMUX_OPTS
+# - $FZF_CTRL_T_COMMAND
+# - $FZF_CTRL_T_OPTS
+# - $FZF_CTRL_R_OPTS
+# - $FZF_ALT_C_COMMAND
+# - $FZF_ALT_C_OPTS
+
+# Key bindings
+# ------------
+__fzf_select__() {
+  local cmd opts
+  cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
+    -o -type f -print \
+    -o -type d -print \
+    -o -type l -print 2> /dev/null | cut -b3-"}"
+  opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-} -m"
+  eval "$cmd" |
+    FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) "$@" |
+    while read -r item; do
+      printf '%q ' "$item"  # escape special chars
+    done
+}
+
+if [[ $- =~ i ]]; then
+
+__fzfcmd() {
+  [[ -n "${TMUX_PANE-}" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]; } &&
+    echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf"
+}
+
+fzf-file-widget() {
+  local selected="$(__fzf_select__ "$@")"
+  READLINE_LINE="${READLINE_LINE:0:$READLINE_POINT}$selected${READLINE_LINE:$READLINE_POINT}"
+  READLINE_POINT=$(( READLINE_POINT + ${#selected} ))
+}
+
+__fzf_cd__() {
+  local cmd opts dir
+  cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
+    -o -type d -print 2> /dev/null | cut -b3-"}"
+  opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-} +m"
+  dir=$(set +o pipefail; eval "$cmd" | FZF_DEFAULT_OPTS="$opts" $(__fzfcmd)) && printf 'builtin cd -- %q' "$dir"
+}
+
+__fzf_history__() {
+  local output opts script
+  opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} +m --read0"
+  script='BEGIN { getc; $/ = "\n\t"; $HISTCOUNT = $ENV{last_hist} + 1 } s/^[ *]//; print $HISTCOUNT - $. . "\t$_" if !$seen{$_}++'
+  output=$(
+    set +o pipefail
+    builtin fc -lnr -2147483648 |
+      last_hist=$(HISTTIMEFORMAT='' builtin history 1) perl -n -l0 -e "$script" |
+      FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) --query "$READLINE_LINE"
+  ) || return
+  READLINE_LINE=${output#*$'\t'}
+  if [[ -z "$READLINE_POINT" ]]; then
+    echo "$READLINE_LINE"
+  else
+    READLINE_POINT=0x7fffffff
+  fi
+}
+
+# Required to refresh the prompt after fzf
+bind -m emacs-standard '"\er": redraw-current-line'
+
+bind -m vi-command '"\C-z": emacs-editing-mode'
+bind -m vi-insert '"\C-z": emacs-editing-mode'
+bind -m emacs-standard '"\C-z": vi-editing-mode'
+
+if (( BASH_VERSINFO[0] < 4 )); then
+  # CTRL-T - Paste the selected file path into the command line
+  bind -m emacs-standard '"\C-t": " \C-b\C-k \C-u`__fzf_select__`\e\C-e\er\C-a\C-y\C-h\C-e\e \C-y\ey\C-x\C-x\C-f"'
+  bind -m vi-command '"\C-t": "\C-z\C-t\C-z"'
+  bind -m vi-insert '"\C-t": "\C-z\C-t\C-z"'
+
+  # CTRL-R - Paste the selected command from history into the command line
+  bind -m emacs-standard '"\C-r": "\C-e \C-u\C-y\ey\C-u"$(__fzf_history__)"\e\C-e\er"'
+  bind -m vi-command '"\C-r": "\C-z\C-r\C-z"'
+  bind -m vi-insert '"\C-r": "\C-z\C-r\C-z"'
+else
+  # CTRL-T - Paste the selected file path into the command line
+  bind -m emacs-standard -x '"\C-t": fzf-file-widget'
+  bind -m vi-command -x '"\C-t": fzf-file-widget'
+  bind -m vi-insert -x '"\C-t": fzf-file-widget'
+
+  # CTRL-R - Paste the selected command from history into the command line
+  bind -m emacs-standard -x '"\C-r": __fzf_history__'
+  bind -m vi-command -x '"\C-r": __fzf_history__'
+  bind -m vi-insert -x '"\C-r": __fzf_history__'
+fi
+
+# ALT-C - cd into the selected directory
+bind -m emacs-standard '"\ec": " \C-b\C-k \C-u`__fzf_cd__`\e\C-e\er\C-m\C-y\C-h\e \C-y\ey\C-x\C-x\C-d"'
+bind -m vi-command '"\ec": "\C-z\ec\C-z"'
+bind -m vi-insert '"\ec": "\C-z\ec\C-z"'
+
+fi

config/fzf/key-bindings.fish

@@ -0,0 +1,172 @@
+#     ____      ____
+#    / __/___  / __/
+#   / /_/_  / / /_
+#  / __/ / /_/ __/
+# /_/   /___/_/ key-bindings.fish
+#
+# - $FZF_TMUX_OPTS
+# - $FZF_CTRL_T_COMMAND
+# - $FZF_CTRL_T_OPTS
+# - $FZF_CTRL_R_OPTS
+# - $FZF_ALT_C_COMMAND
+# - $FZF_ALT_C_OPTS
+
+# Key bindings
+# ------------
+function fzf_key_bindings
+
+  # Store current token in $dir as root for the 'find' command
+  function fzf-file-widget -d "List files and folders"
+    set -l commandline (__fzf_parse_commandline)
+    set -l dir $commandline[1]
+    set -l fzf_query $commandline[2]
+    set -l prefix $commandline[3]
+
+    # "-path \$dir'*/\\.*'" matches hidden files/folders inside $dir but not
+    # $dir itself, even if hidden.
+    test -n "$FZF_CTRL_T_COMMAND"; or set -l FZF_CTRL_T_COMMAND "
+    command find -L \$dir -mindepth 1 \\( -path \$dir'*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' \\) -prune \
+    -o -type f -print \
+    -o -type d -print \
+    -o -type l -print 2> /dev/null | sed 's@^\./@@'"
+
+    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+    begin
+      set -lx FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_CTRL_T_OPTS"
+      eval "$FZF_CTRL_T_COMMAND | "(__fzfcmd)' -m --query "'$fzf_query'"' | while read -l r; set result $result $r; end
+    end
+    if [ -z "$result" ]
+      commandline -f repaint
+      return
+    else
+      # Remove last token from commandline.
+      commandline -t ""
+    end
+    for i in $result
+      commandline -it -- $prefix
+      commandline -it -- (string escape $i)
+      commandline -it -- ' '
+    end
+    commandline -f repaint
+  end
+
+  function fzf-history-widget -d "Show command history"
+    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+    begin
+      set -lx FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT $FZF_DEFAULT_OPTS --scheme=history --bind=ctrl-r:toggle-sort,ctrl-z:ignore $FZF_CTRL_R_OPTS +m"
+
+      set -l FISH_MAJOR (echo $version | cut -f1 -d.)
+      set -l FISH_MINOR (echo $version | cut -f2 -d.)
+
+      # history's -z flag is needed for multi-line support.
+      # history's -z flag was added in fish 2.4.0, so don't use it for versions
+      # before 2.4.0.
+      if [ "$FISH_MAJOR" -gt 2 -o \( "$FISH_MAJOR" -eq 2 -a "$FISH_MINOR" -ge 4 \) ];
+        history -z | eval (__fzfcmd) --read0 --print0 -q '(commandline)' | read -lz result
+        and commandline -- $result
+      else
+        history | eval (__fzfcmd) -q '(commandline)' | read -l result
+        and commandline -- $result
+      end
+    end
+    commandline -f repaint
+  end
+
+  function fzf-cd-widget -d "Change directory"
+    set -l commandline (__fzf_parse_commandline)
+    set -l dir $commandline[1]
+    set -l fzf_query $commandline[2]
+    set -l prefix $commandline[3]
+
+    test -n "$FZF_ALT_C_COMMAND"; or set -l FZF_ALT_C_COMMAND "
+    command find -L \$dir -mindepth 1 \\( -path \$dir'*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' \\) -prune \
+    -o -type d -print 2> /dev/null | sed 's@^\./@@'"
+    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+    begin
+      set -lx FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_ALT_C_OPTS"
+      eval "$FZF_ALT_C_COMMAND | "(__fzfcmd)' +m --query "'$fzf_query'"' | read -l result
+
+      if [ -n "$result" ]
+        cd -- $result
+
+        # Remove last token from commandline.
+        commandline -t ""
+        commandline -it -- $prefix
+      end
+    end
+
+    commandline -f repaint
+  end
+
+  function __fzfcmd
+    test -n "$FZF_TMUX"; or set FZF_TMUX 0
+    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+    if [ -n "$FZF_TMUX_OPTS" ]
+      echo "fzf-tmux $FZF_TMUX_OPTS -- "
+    else if [ $FZF_TMUX -eq 1 ]
+      echo "fzf-tmux -d$FZF_TMUX_HEIGHT -- "
+    else
+      echo "fzf"
+    end
+  end
+
+  bind \ct fzf-file-widget
+  bind \cr fzf-history-widget
+  bind \ec fzf-cd-widget
+
+  if bind -M insert > /dev/null 2>&1
+    bind -M insert \ct fzf-file-widget
+    bind -M insert \cr fzf-history-widget
+    bind -M insert \ec fzf-cd-widget
+  end
+
+  function __fzf_parse_commandline -d 'Parse the current command line token and return split of existing filepath, fzf query, and optional -option= prefix'
+    set -l commandline (commandline -t)
+
+    # strip -option= from token if present
+    set -l prefix (string match -r -- '^-[^\s=]+=' $commandline)
+    set commandline (string replace -- "$prefix" '' $commandline)
+
+    # eval is used to do shell expansion on paths
+    eval set commandline $commandline
+
+    if [ -z $commandline ]
+      # Default to current directory with no --query
+      set dir '.'
+      set fzf_query ''
+    else
+      set dir (__fzf_get_dir $commandline)
+
+      if [ "$dir" = "." -a (string sub -l 1 -- $commandline) != '.' ]
+        # if $dir is "." but commandline is not a relative path, this means no file path found
+        set fzf_query $commandline
+      else
+        # Also remove trailing slash after dir, to "split" input properly
+        set fzf_query (string replace -r "^$dir/?" -- '' "$commandline")
+      end
+    end
+
+    echo $dir
+    echo $fzf_query
+    echo $prefix
+  end
+
+  function __fzf_get_dir -d 'Find the longest existing filepath from input string'
+    set dir $argv
+
+    # Strip all trailing slashes. Ignore if $dir is root dir (/)
+    if [ (string length -- $dir) -gt 1 ]
+      set dir (string replace -r '/*$' -- '' $dir)
+    end
+
+    # Iteratively check if dir exists and strip tail end of path
+    while [ ! -d "$dir" ]
+      # If path is absolute, this can keep going until ends up at /
+      # If path is relative, this can keep going until entire input is consumed, dirname returns "."
+      set dir (dirname -- "$dir")
+    end
+
+    echo $dir
+  end
+
+end

config/fzf/key-bindings.zsh

@@ -0,0 +1,120 @@
+#     ____      ____
+#    / __/___  / __/
+#   / /_/_  / / /_
+#  / __/ / /_/ __/
+# /_/   /___/_/ key-bindings.zsh
+#
+# - $FZF_TMUX_OPTS
+# - $FZF_CTRL_T_COMMAND
+# - $FZF_CTRL_T_OPTS
+# - $FZF_CTRL_R_OPTS
+# - $FZF_ALT_C_COMMAND
+# - $FZF_ALT_C_OPTS
+
+# Key bindings
+# ------------
+
+# The code at the top and the bottom of this file is the same as in completion.zsh.
+# Refer to that file for explanation.
+if 'zmodload' 'zsh/parameter' 2>'/dev/null' && (( ${+options} )); then
+  __fzf_key_bindings_options="options=(${(j: :)${(kv)options[@]}})"
+else
+  () {
+    __fzf_key_bindings_options="setopt"
+    'local' '__fzf_opt'
+    for __fzf_opt in "${(@)${(@f)$(set -o)}%% *}"; do
+      if [[ -o "$__fzf_opt" ]]; then
+        __fzf_key_bindings_options+=" -o $__fzf_opt"
+      else
+        __fzf_key_bindings_options+=" +o $__fzf_opt"
+      fi
+    done
+  }
+fi
+
+'emulate' 'zsh' '-o' 'no_aliases'
+
+{
+
+[[ -o interactive ]] || return 0
+
+# CTRL-T - Paste the selected file path(s) into the command line
+__fsel() {
+  local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
+    -o -type f -print \
+    -o -type d -print \
+    -o -type l -print 2> /dev/null | cut -b3-"}"
+  setopt localoptions pipefail no_aliases 2> /dev/null
+  local item
+  eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-}" $(__fzfcmd) -m "$@" | while read item; do
+    echo -n "${(q)item} "
+  done
+  local ret=$?
+  echo
+  return $ret
+}
+
+__fzfcmd() {
+  [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; } &&
+    echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf"
+}
+
+fzf-file-widget() {
+  LBUFFER="${LBUFFER}$(__fsel)"
+  local ret=$?
+  zle reset-prompt
+  return $ret
+}
+zle     -N            fzf-file-widget
+bindkey -M emacs '^T' fzf-file-widget
+bindkey -M vicmd '^T' fzf-file-widget
+bindkey -M viins '^T' fzf-file-widget
+
+# ALT-C - cd into the selected directory
+fzf-cd-widget() {
+  local cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
+    -o -type d -print 2> /dev/null | cut -b3-"}"
+  setopt localoptions pipefail no_aliases 2> /dev/null
+  local dir="$(eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-}" $(__fzfcmd) +m)"
+  if [[ -z "$dir" ]]; then
+    zle redisplay
+    return 0
+  fi
+  zle push-line # Clear buffer. Auto-restored on next prompt.
+  BUFFER="builtin cd -- ${(q)dir}"
+  zle accept-line
+  local ret=$?
+  unset dir # ensure this doesn't end up appearing in prompt expansion
+  zle reset-prompt
+  return $ret
+}
+zle     -N             fzf-cd-widget
+bindkey -M emacs '\ec' fzf-cd-widget
+bindkey -M vicmd '\ec' fzf-cd-widget
+bindkey -M viins '\ec' fzf-cd-widget
+
+# CTRL-R - Paste the selected command from history into the command line
+fzf-history-widget() {
+  local selected num
+  setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases 2> /dev/null
+  selected=( $(fc -rl 1 | awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' |
+    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,ctrl-z:ignore ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
+  local ret=$?
+  if [ -n "$selected" ]; then
+    num=$selected[1]
+    if [ -n "$num" ]; then
+      zle vi-fetch-history -n $num
+    fi
+  fi
+  zle reset-prompt
+  return $ret
+}
+zle     -N            fzf-history-widget
+bindkey -M emacs '^R' fzf-history-widget
+bindkey -M vicmd '^R' fzf-history-widget
+bindkey -M viins '^R' fzf-history-widget
+
+} always {
+  eval $__fzf_key_bindings_options
+  'unset' '__fzf_key_bindings_options'
+}

config/git/shared

@@ -11,9 +11,6 @@
 [pull]
   rebase = true
 
-[gpg]
-	format = ssh
-
 [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]++'"
@@ -22,6 +19,7 @@
   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
@@ -59,4 +57,5 @@
 
 # dotfiles special config
 [includeIf "hasconfig:remote.*.url:https://github.com/ivuorinen/dotfiles.git"]
-	path = ~/.dotfiles/config/git/special/dotfiles ;
+  path = ~/.dotfiles/config/git/special/dotfiles ;
+

config/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,56 @@ 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"
+# Cryptography and SSL/TLS Toolkit
+brew "openssl@3"
 # 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 +64,20 @@ brew "asdf"
 brew "aspell"
 # Official Amazon AWS command-line interface
 brew "awscli"
-# Terminal bandwidth utilization tool
-brew "bandwhich"
+# Bourne-Again SHell, a UNIX command interpreter
+brew "bash"
 # 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,16 +96,18 @@ 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
 brew "dotenv-linter"
-# Tool to verify that your files are in harmony with your .editorconfig
-brew "editorconfig-checker"
 # Useful examples at the command-line
 brew "eg-examples"
-# CLI for templating and/or deploying FaaS functions
-brew "faas-cli"
+# 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 +118,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
 # 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 +146,18 @@ 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,10 +172,16 @@ 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
@@ -145,18 +196,22 @@ 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"
+# Development kit for the Java programming language
+brew "openjdk"
 # Swiss-army knife of markup format conversion
 brew "pandoc"
 # Highly capable, feature-rich programming language
@@ -175,24 +230,30 @@ 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"
+# Very fast implementation of tldr in Rust
+brew "tealdeer"
 # 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
@@ -203,8 +264,6 @@ brew "tfenv"
 brew "tfsec"
 # Programmatically correct mistyped console commands
 brew "thefuck"
-# Simplified and community-driven man pages
-brew "tldr"
 # Terminal multiplexer
 brew "tmux"
 # Display directories as trees (with optional color/HTML output)
@@ -224,7 +283,9 @@ brew "wget"
 # Personal information dashboard for your terminal
 brew "wtfutil"
 # Check your $HOME for unwanted files and directories
-brew "xdg-ninja"
+brew "xdg-ninja", args: ["HEAD"]
+# Hackable, minimal, fast TUI file explorer
+brew "xplr"
 # JavaScript package manager
 brew "yarn"
 # A vulnerability scanner for container images and filesystems
@@ -237,6 +298,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 +316,18 @@ 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 +356,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 +382,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 +406,83 @@ 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 "LastPass", id: 926036361
+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 "octref.vetur"
+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 "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,14 +2,8 @@
 <!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>
-	<true/>
 	<key>AutoHideTmuxClientSession</key>
 	<true/>
 	<key>Custom Color Presets</key>
@@ -344,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>
@@ -370,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>
@@ -377,208 +377,208 @@
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.35294117647058826</real>
+				<real>0.11764705926179886</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.27843137254901962</real>
+				<real>0.098039217293262482</real>
 				<key>Red Component</key>
-				<real>0.27058823529411763</real>
+				<real>0.078431375324726105</real>
 			</dict>
 			<key>Ansi 1 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.6588235294117647</real>
+				<real>0.16300037503242493</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.54509803921568623</real>
+				<real>0.23660069704055786</real>
 				<key>Red Component</key>
-				<real>0.95294117647058818</real>
+				<real>0.7074432373046875</real>
 			</dict>
 			<key>Ansi 10 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.63137254901960782</real>
+				<real>0.56541937589645386</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.8901960784313725</real>
+				<real>0.9042816162109375</real>
 				<key>Red Component</key>
-				<real>0.65098039215686276</real>
+				<real>0.3450070321559906</real>
 			</dict>
 			<key>Ansi 11 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.68627450980392157</real>
+				<real>0.0</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.88627450980392153</real>
+				<real>0.8833775520324707</real>
 				<key>Red Component</key>
-				<real>0.97647058823529409</real>
+				<real>0.9259033203125</real>
 			</dict>
 			<key>Ansi 12 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.98039215686274506</real>
+				<real>0.9485321044921875</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.70588235294117652</real>
+				<real>0.67044717073440552</real>
 				<key>Red Component</key>
-				<real>0.53725490196078429</real>
+				<real>0.65349078178405762</real>
 			</dict>
 			<key>Ansi 13 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.90588235294117647</real>
+				<real>0.8821563720703125</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.76078431372549016</real>
+				<real>0.4927266538143158</real>
 				<key>Red Component</key>
-				<real>0.96078431372549022</real>
+				<real>0.8821563720703125</real>
 			</dict>
 			<key>Ansi 14 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.83529411764705885</real>
+				<real>1</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.88627450980392153</real>
+				<real>0.99263292551040649</real>
 				<key>Red Component</key>
-				<real>0.58039215686274515</real>
+				<real>0.37597531080245972</real>
 			</dict>
 			<key>Ansi 15 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.78431372549019607</real>
+				<real>1</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.67843137254901964</real>
+				<real>1</real>
 				<key>Red Component</key>
-				<real>0.65098039215686276</real>
+				<real>0.99999600648880005</real>
 			</dict>
 			<key>Ansi 2 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.63137254901960782</real>
+				<real>0.0</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.8901960784313725</real>
+				<real>0.7607843279838562</real>
 				<key>Red Component</key>
-				<real>0.65098039215686276</real>
+				<real>0.0</real>
 			</dict>
 			<key>Ansi 3 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.68627450980392157</real>
+				<real>0.0</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.88627450980392153</real>
+				<real>0.76959484815597534</real>
 				<key>Red Component</key>
-				<real>0.97647058823529409</real>
+				<real>0.78058648109436035</real>
 			</dict>
 			<key>Ansi 4 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.98039215686274506</real>
+				<real>0.78216177225112915</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.70588235294117652</real>
+				<real>0.26474356651306152</real>
 				<key>Red Component</key>
-				<real>0.53725490196078429</real>
+				<real>0.15404300391674042</real>
 			</dict>
 			<key>Ansi 5 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.90588235294117647</real>
+				<real>0.74494361877441406</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.76078431372549016</real>
+				<real>0.24931684136390686</real>
 				<key>Red Component</key>
-				<real>0.96078431372549022</real>
+				<real>0.752197265625</real>
 			</dict>
 			<key>Ansi 6 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.83529411764705885</real>
+				<real>0.78166204690933228</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.88627450980392153</real>
+				<real>0.77425903081893921</real>
 				<key>Red Component</key>
-				<real>0.58039215686274515</real>
+				<real>0.0</real>
 			</dict>
 			<key>Ansi 7 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.87058823529411766</real>
+				<real>0.78104829788208008</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.76078431372549016</real>
+				<real>0.78105825185775757</real>
 				<key>Red Component</key>
-				<real>0.72941176470588232</real>
+				<real>0.7810397744178772</real>
 			</dict>
 			<key>Ansi 8 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.4392156862745098</real>
+				<real>0.4078223705291748</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.35686274509803922</real>
+				<real>0.40782788395881653</real>
 				<key>Red Component</key>
-				<real>0.34509803921568627</real>
+				<real>0.40781760215759277</real>
 			</dict>
 			<key>Ansi 9 Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.6588235294117647</real>
+				<real>0.45833224058151245</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.54509803921568623</real>
+				<real>0.47524076700210571</real>
 				<key>Red Component</key>
-				<real>0.95294117647058818</real>
+				<real>0.8659515380859375</real>
 			</dict>
 			<key>BM Growl</key>
 			<true/>
@@ -587,13 +587,13 @@
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.1803921568627451</real>
+				<real>0.12103271484375</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.11764705882352941</real>
+				<real>0.099111050367355347</real>
 				<key>Red Component</key>
-				<real>0.11764705882352941</real>
+				<real>0.0806884765625</real>
 			</dict>
 			<key>Background Image Location</key>
 			<string></string>
@@ -602,96 +602,84 @@
 				<key>Alpha Component</key>
 				<real>0.5</real>
 				<key>Blue Component</key>
-				<real>0.0</real>
+				<real>1</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.14910030364990234</real>
+				<real>1</real>
 				<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>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.95686274509803926</real>
+				<real>1</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.83921568627450982</real>
+				<real>1</real>
 				<key>Red Component</key>
-				<real>0.80392156862745101</real>
+				<real>0.99999600648880005</real>
 			</dict>
 			<key>Character Encoding</key>
 			<integer>4</integer>
 			<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>
+			<real>0.19958333333333333</real>
 			<key>Cursor Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.86274509803921573</real>
+				<real>0.99998724460601807</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.8784313725490196</real>
+				<real>1</real>
 				<key>Red Component</key>
-				<real>0.96078431372549022</real>
+				<real>0.99997633695602417</real>
 			</dict>
 			<key>Cursor Guide Color</key>
 			<dict>
 				<key>Alpha Component</key>
-				<real>0.070000000000000007</real>
+				<real>0.25</real>
 				<key>Blue Component</key>
-				<real>0.95686274509803926</real>
+				<real>1</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.83921568627450982</real>
+				<real>0.9268307089805603</real>
 				<key>Red Component</key>
-				<real>0.80392156862745101</real>
+				<real>0.70213186740875244</real>
 			</dict>
 			<key>Cursor Text Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.95686274509803926</real>
+				<real>0.0</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.83921568627450982</real>
+				<real>0.0</real>
 				<key>Red Component</key>
-				<real>0.80392156862745101</real>
+				<real>0.0</real>
 			</dict>
+			<key>Cursor Type</key>
+			<integer>1</integer>
 			<key>Custom Command</key>
 			<string>No</string>
 			<key>Custom Directory</key>
@@ -711,16 +699,16 @@
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.95686274509803926</real>
+				<real>0.86198854446411133</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.83921568627450982</real>
+				<real>0.86199951171875</real>
 				<key>Red Component</key>
-				<real>0.80392156862745101</real>
+				<real>0.86197912693023682</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>
@@ -1022,16 +1010,16 @@
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.92156862745098034</real>
+				<real>0.9337158203125</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.86274509803921573</real>
+				<real>0.55789834260940552</real>
 				<key>Red Component</key>
-				<real>0.53725490196078429</real>
+				<real>0.19802422821521759</real>
 			</dict>
 			<key>Minimum Contrast</key>
-			<real>0.14973958333333334</real>
+			<real>0.49644531250000001</real>
 			<key>Mouse Reporting</key>
 			<true/>
 			<key>Name</key>
@@ -1055,9 +1043,9 @@
 			<key>Right Option Key Sends</key>
 			<integer>0</integer>
 			<key>Rows</key>
-			<integer>25</integer>
+			<integer>40</integer>
 			<key>Screen</key>
-			<integer>-2</integer>
+			<integer>-1</integer>
 			<key>Scrollback Lines</key>
 			<integer>0</integer>
 			<key>Selected Text Color</key>
@@ -1065,40 +1053,40 @@
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.95686274509803926</real>
+				<real>0.0</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.83921568627450982</real>
+				<real>0.0</real>
 				<key>Red Component</key>
-				<real>0.80392156862745101</real>
+				<real>0.0</real>
 			</dict>
 			<key>Selection Color</key>
 			<dict>
 				<key>Alpha Component</key>
 				<real>1</real>
 				<key>Blue Component</key>
-				<real>0.4392156862745098</real>
+				<real>1</real>
 				<key>Color Space</key>
 				<string>sRGB</string>
 				<key>Green Component</key>
-				<real>0.35686274509803922</real>
+				<real>0.84313726425170898</real>
 				<key>Red Component</key>
-				<real>0.34509803921568627</real>
+				<real>0.70196080207824707</real>
 			</dict>
 			<key>Send Code When Idle</key>
 			<false/>
 			<key>Set Local Environment Vars</key>
 			<false/>
 			<key>Shortcut</key>
-			<string>T</string>
+			<string></string>
+			<key>Show Mark Indicators</key>
+			<false/>
 			<key>Show Status Bar</key>
-			<true/>
+			<false/>
 			<key>Show Timestamps</key>
 			<integer>2</integer>
 			<key>Silence Bell</key>
-			<false/>
-			<key>Smart Cursor Color</key>
 			<true/>
 			<key>Status Bar Layout</key>
 			<dict>
@@ -1107,17 +1095,17 @@
 					<key>algorithm</key>
 					<integer>0</integer>
 					<key>auto-rainbow style</key>
-					<integer>3</integer>
+					<integer>0</integer>
 					<key>font</key>
 					<string>.AppleSystemUIFont 12</string>
 					<key>remove empty components</key>
-					<false/>
+					<true/>
 				</dict>
 				<key>components</key>
 				<array>
 					<dict>
 						<key>class</key>
-						<string>iTermStatusBarJobComponent</string>
+						<string>iTermStatusBarClockComponent</string>
 						<key>configuration</key>
 						<dict>
 							<key>knobs</key>
@@ -1126,22 +1114,55 @@
 								<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>
-								<integer>0</integer>
+								<string>0</string>
 								<key>shared text color</key>
 								<dict>
 									<key>Alpha Component</key>
 									<real>1</real>
 									<key>Blue Component</key>
-									<real>0.63</real>
+									<real>0.43218994140625</real>
 									<key>Color Space</key>
 									<string>sRGB</string>
 									<key>Green Component</key>
-									<real>0.63</real>
+									<real>0.34513998031616211</real>
 									<key>Red Component</key>
-									<real>0.90000000000000002</real>
+									<real>0.0</real>
 								</dict>
 							</dict>
 							<key>layout advanced configuration dictionary value</key>
@@ -1149,10 +1170,66 @@
 								<key>algorithm</key>
 								<integer>0</integer>
 								<key>auto-rainbow style</key>
-								<integer>3</integer>
+								<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>
@@ -1165,10 +1242,8 @@
 			<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>
@@ -1191,12 +1266,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>
@@ -1230,16 +1299,30 @@
 			<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>kCPKSelectionViewPreferredModeKey</key>

config/nvim/.gitignore

@@ -0,0 +1 @@
+session.vim

config/nvim/.stylua.toml

@@ -0,0 +1,10 @@
+column_width = 160
+line_endings = "Unix"
+indent_type = "Spaces"
+indent_width = 2
+quote_style = "AutoPreferDouble"
+call_parentheses = "Always"
+collapse_simple_statement = "Always"
+
+[sort_requires]
+enabled = true

config/nvim/after/ftplugin/lua.lua

@@ -0,0 +1 @@
+vim.api.nvim_command("set formatoptions-=cro")

config/nvim/init.lua

@@ -0,0 +1,31 @@
+-- luacheck: globals vim
+local key = vim.api.nvim_set_keymap
+local remap = { noremap = true, silent = true }
+
+-- Set with normal Vim opts, 'Space' as mapleader
+vim.g.mapleader = " "
+vim.g.maplocalleader = " "
+
+-- Set 'Space' as <NOP> key to leadermap key
+key("n", "<Space>", "<NOP>", remap)
+
+-- Global, windows options of neovim:
+require("options")
+
+-- Filetype specialties.
+require("filetype")
+
+-- To adminstrate packages:
+require("plugin-manager")
+
+-- LSP for editing.
+require("lsp")
+
+-- Autocmd commands from Vimscript
+require("autocmd")
+
+-- Personal Keymaps of neovim:
+require("keymappings")
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et

config/nvim/lazy-lock.json

@@ -0,0 +1,52 @@
+{
+  "barbecue.nvim": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
+  "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" },
+  "catppuccin": { "branch": "main", "commit": "a937d546f4783a1ff67f84043d2d7871ad4ecd83" },
+  "close-buffers.nvim": { "branch": "master", "commit": "3acbcad1211572342632a6c0151f839e7dead27f" },
+  "comment-box.nvim": { "branch": "main", "commit": "dd1a48f8d06102e9b87ae1e0069bc365c006979b" },
+  "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "gitsigns.nvim": { "branch": "main", "commit": "983f1a216cca1a079399ba050bc4b9ce130de83a" },
+  "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
+  "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
+  "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" },
+  "mason.nvim": { "branch": "main", "commit": "ee6a7f179ebf8aa9da9d53b1cf1b57d292ea0182" },
+  "mini.nvim": { "branch": "main", "commit": "707dca4f4152c2d9c9b4c5e02635f78dfd33db50" },
+  "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
+  "neodev.nvim": { "branch": "main", "commit": "dcd34653b0f1d3e7ea9aeb3e37dc7c8da445c4fe" },
+  "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" },
+  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
+  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
+  "nvim-dap": { "branch": "master", "commit": "0e6b7c47dd70e80793ed39271b2aa712d9366dbc" },
+  "nvim-dap-go": { "branch": "main", "commit": "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0" },
+  "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0517d8522dcec286b1dba47aa3ee1ed8f523aed6" },
+  "nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" },
+  "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
+  "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" },
+  "nvim-treesitter": { "branch": "master", "commit": "dfcfdb0e7bcb362c4de1ed7d0015c21957c91ba7" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" },
+  "nvim-web-devicons": { "branch": "master", "commit": "bc11ee2498de2310de5776477dd9dce65d03b464" },
+  "nvim-window-picker": { "branch": "main", "commit": "1b1bb834b0acb9eebb11a61664efc665757f1ba2" },
+  "plenary.nvim": { "branch": "master", "commit": "a56bf0071bf63d35274fdc4738bb1e8821cfd2ea" },
+  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
+  "refactoring.nvim": { "branch": "master", "commit": "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554" },
+  "restoreview": { "branch": "main", "commit": "03d00d59a9ba640db6b44192ed0fcc9d7261dcd2" },
+  "schemastore.nvim": { "branch": "main", "commit": "b6e498b2e34af832311472a07d4d5e349e2e7c62" },
+  "smartcolumn.nvim": { "branch": "main", "commit": "d01b99355c7fab13233f48d0f28dc097e68a03f7" },
+  "stickybuf.nvim": { "branch": "master", "commit": "4c667bc837e5e3fec5a8857ee99f1a229fc76df9" },
+  "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
+  "tabnine": { "branch": "master", "commit": "dcca6d2f9e8bbcde36aab87b9b87890810e4056d" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
+  "telescope.nvim": { "branch": "master", "commit": "18f10f28007cb8b4d50324217349c3f568684be2" },
+  "toggleterm.nvim": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" },
+  "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
+  "twilight.nvim": { "branch": "main", "commit": "a4843e6e67092a1e6fa9666f02bf0ab59174c1df" },
+  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
+  "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" },
+  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
+  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }
+}

config/nvim/lua/autocmd.lua

@@ -0,0 +1,146 @@
+local vim = vim
+local api = vim.api
+local M = {}
+
+--- function to create a list of commands and convert them to autocommands
+--- This function is taken from https://github.com/norcalli/nvim_utils
+function M.nvim_create_augroups(definitions)
+  for group_name, definition in pairs(definitions) do
+    api.nvim_command("augroup " .. group_name)
+    api.nvim_command("autocmd!")
+    for _, def in ipairs(definition) do
+      local command = table.concat(vim.tbl_flatten({ "autocmd", def }), " ")
+      api.nvim_command(command)
+    end
+    api.nvim_command("augroup END")
+  end
+end
+
+local autoCommands = {
+  -- To save the current session (may be restored later).
+  -- autocmd! VimLeavePre * :mks! ~/.config/nvim/session.vim
+  save_session = {
+    { "VimLeavePre", "*", ":mks! ~/.local/state/nvim/session.vim" },
+  },
+  -- other autocommands
+  open_folds = {
+    { "BufReadPost,FileReadPost", "*", "normal zR<cr>" },
+  },
+}
+
+M.nvim_create_augroups(autoCommands)
+
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = {
+    "help",
+    "alpha",
+    "dashboard",
+    "neo-tree",
+    "Trouble",
+    "lazy",
+    "mason",
+    "notify",
+    "toggleterm",
+    "lazyterm",
+  },
+  callback = function(event)
+    vim.b[event.buf].miniindentscope_disable = true
+  end,
+})
+
+
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ taken from LazyVim repository                            │
+--  ╭─────────────────────────────────────────────────────────────────────────────╮
+--  │ https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua│
+--  ╰─────────────────────────────────────────────────────────────────────────────╯
+
+local function augroup(name)
+  return vim.api.nvim_create_augroup("ivuorinen_" .. name, { clear = true })
+end
+-- Check if we need to reload the file when it changed
+vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, {
+  group = augroup("checktime"),
+  command = "checktime",
+})
+
+-- Highlight on yank
+vim.api.nvim_create_autocmd("TextYankPost", {
+  group = augroup("highlight_yank"),
+  callback = function()
+    vim.highlight.on_yank()
+  end,
+})
+
+-- resize splits if window got resized
+vim.api.nvim_create_autocmd({ "VimResized" }, {
+  group = augroup("resize_splits"),
+  callback = function()
+    local current_tab = vim.fn.tabpagenr()
+    vim.cmd("tabdo wincmd =")
+    vim.cmd("tabnext " .. current_tab)
+  end,
+})
+
+-- go to last loc when opening a buffer
+vim.api.nvim_create_autocmd("BufReadPost", {
+  group = augroup("last_loc"),
+  callback = function()
+    local exclude = { "gitcommit" }
+    local buf = vim.api.nvim_get_current_buf()
+    if vim.tbl_contains(exclude, vim.bo[buf].filetype) then
+      return
+    end
+    local mark = vim.api.nvim_buf_get_mark(buf, '"')
+    local lcount = vim.api.nvim_buf_line_count(buf)
+    if mark[1] > 0 and mark[1] <= lcount then
+      pcall(vim.api.nvim_win_set_cursor, 0, mark)
+    end
+  end,
+})
+
+-- close some filetypes with <q>
+vim.api.nvim_create_autocmd("FileType", {
+  group = augroup("close_with_q"),
+  pattern = {
+    "PlenaryTestPopup",
+    "help",
+    "lspinfo",
+    "man",
+    "notify",
+    "qf",
+    "spectre_panel",
+    "startuptime",
+    "tsplayground",
+    "neotest-output",
+    "checkhealth",
+    "neotest-summary",
+    "neotest-output-panel",
+  },
+  callback = function(event)
+    vim.bo[event.buf].buflisted = false
+    vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = event.buf, silent = true })
+  end,
+})
+
+-- wrap and check for spell in text filetypes
+vim.api.nvim_create_autocmd("FileType", {
+  group = augroup("wrap_spell"),
+  pattern = { "gitcommit", "markdown" },
+  callback = function()
+    vim.opt_local.wrap = true
+    vim.opt_local.spell = true
+  end,
+})
+
+-- Auto create dir when saving a file, in case some intermediate directory does not exist
+vim.api.nvim_create_autocmd({ "BufWritePre" }, {
+  group = augroup("auto_create_dir"),
+  callback = function(event)
+    if event.match:match("^%w%w+://") then
+      return
+    end
+    local file = vim.loop.fs_realpath(event.match) or event.match
+    vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
+  end,
+})

config/nvim/lua/filetype.lua

@@ -0,0 +1,77 @@
+-- To be used anywhere.
+local function job(command) vim.api.nvim_command("call jobstart('" .. command .. "')") end
+
+local function format()
+  vim.api.nvim_create_autocmd("BufWritePost", {
+    pattern = "<buffer>",
+    callback = function() vim.lsp.buf.format() end,
+  })
+end
+
+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
+
+-- In init.lua or filetype.nvim's config file
+vim.filetype.add({
+  extension = {
+
+    h = function()
+      -- Use a lazy heuristic that #including a C++ header means it's a
+      -- C++ header
+      if vim.fn.search("\\C^#include <[^>.]\\+>$", "nw") == 1 then return "cpp" end
+      return "c"
+    end,
+
+    -- Spelling fix.
+    md = function() vim.api.nvim_command("setlocal spell!") end,
+
+    yml = yaml_ft,
+    yaml = yaml_ft,
+
+    --
+    csv = "csv",
+    cl = "opencl",
+    env = "env",
+    sh = "zsh",
+    --
+  },
+  pattern = {
+
+    -- Go to root configuration of some projects.
+    -- [".*config/nvim/.*"] = function() vim.api.nvim_command "cd ~/.config/nvim/" end,
+
+    ---- Typescript Projects
+    [".*/src/.*ts"] = function() format() end,
+    [".*/src/.*json"] = function() format() end,
+    [".*/src/.*scss"] = function() format() end,
+    [".*/src/.*html"] = function() format() end,
+
+    --[".*Code/ivuorinen/[project]/src/.*ts"] = function()
+    --  vim.api.nvim_command('cd ~/Code/ivuorinen/[project]/')
+    --  build('ts index')
+    --end,
+  },
+
+  filename = {
+    -- For eslint_d configuration file.
+    [".eslintrc"] = "jsonc",
+
+    -- For Typescript projects.
+    ["tsconfig.json"] = "json5",
+
+    [".ignore"] = "gitignore",
+  },
+})

config/nvim/lua/keymappings.lua

@@ -0,0 +1,222 @@
+--[[
+  Keymappings for nvim experience.
+
+  I use combination of both nvim default vim.api.nvim_set_keymap
+  and WhichKey register. Slowly migrating to the WhichKey system,
+  and tweaking the groupings as I go.
+--]]
+-- luacheck: globals vim CAPABILITIES
+
+local wk = require("which-key")
+
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ Register keybindings                                     │
+--  ╰──────────────────────────────────────────────────────────╯
+
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ Register in all modes, prefix <leader>                   │
+--  ╰──────────────────────────────────────────────────────────╯
+wk.register({
+  b = {
+    name = "+buffer",
+    n = { "<cmd>tabnew<cr>", "[n]ew tab" },
+    a = {
+      name = "+annotate"
+      -- defined in plugins/neogen.lua
+    },
+    c = {
+      name = "+comments",
+      b = {
+        "<cmd>lua require('comment-box').lbox()<cr>",
+        "Left aligned fixed size box with left aligned text",
+      },
+      c = {
+        "<cmd>lua require('comment-box').ccbox()<cr>",
+        desc = "Centered adapted box with centered text",
+      },
+      l = {
+        "<cmd>lua require('comment-box').cline()<cr>",
+        desc = "Centered line",
+      },
+    },
+    d = {
+      name = "+delete buffers",
+      h = {
+        "<CMD>lua require('close_buffers').delete({type = 'hidden'})<CR>",
+        "Delete hidden buffers",
+      },
+    },
+    t = { ":TabnineToggle<cr>", "Toggle TabNine" },
+  },
+  D = {
+    name = "+Diagnostics (Trouble)",
+    t = { ":TroubleToggle<CR>", "[D]iagnostics [t]oggle" },
+    -- Quick navigation between diagonostics.
+    f = { ":lua vim.diagnostic.open_float()<CR>", "[D]iagnostics: Open [f]loat" },
+    n = { ":lua vim.diagnostic.goto_next()<CR>", "[D]iagnostics: [n]ext" },
+    p = { ":lua vim.diagnostic.goto_prev()<CR>", "[D]iagnostics: [p]rev" },
+    ---
+    x = { function() require("trouble").open() end, "Open Trouble" },
+    w = { function() require("trouble").open("workspace_diagnostics") end, "Workspace diagnostics" },
+    d = { function() require("trouble").open("document_diagnostics") end, "Document diagnostics" },
+    q = { function() require("trouble").open("quickfix") end, "Quickfix" },
+    l = { function() require("trouble").open("loclist") end, "Loclist" },
+    r = { function() require("trouble").open("lsp_references") end, "LSP References" },
+  },
+  e = {
+    function() vim.cmd("Neotree focus source=filesystem position=left") end,
+    "Toggle the sidebar tree",
+  },
+  f = {
+    name = "+find",
+    -- Find recursively files across the root folder subfiles.
+    f = { ':lua require("telescope.builtin").find_files()<cr>', "[f]ind [f]iles" },
+    -- Find recursively a text across the root folder subfiles.
+    g = { ':lua require("telescope.builtin").live_grep()<cr>', "[f]ind text with [g]rep" },
+  },
+  h = {
+    name = "+harpoon",
+    a = { "<cmd>lua require('harpoon.mark').add_file()<cr>", "[h]arpoon: [A]dd file" },
+    r = { "<cmd>lua require('harpoon.mark').rm_file()<cr>", "[h]arpoon: [r]emove file" },
+    m = { "<cmd>lua require('harpoon.ui').toggle_quick_menu()<cr>", "[h]arpoon: harpoon [m]enu" },
+    n = { "<cmd>lua require('harpoon.ui').nav_next()<cr>", "[h]arpoon: [n]ext file" },
+    p = { "<cmd>lua require('harpoon.ui').nav_prev()<cr>", "[h]arpoon: [p]revious file" },
+    ["1"] = { "<cmd> lua require('harpoon.ui').nav_file(1)<cr>", "[h]arpoon: file 1" },
+    ["2"] = { "<cmd> lua require('harpoon.ui').nav_file(2)<cr>", "[h]arpoon: file 2" },
+    ["3"] = { "<cmd> lua require('harpoon.ui').nav_file(3)<cr>", "[h]arpoon: file 3" },
+  },
+  --- Remap debugging to "H" from LV default of "h"
+  H = {
+    name = "+help/Conceal/Treesitter",
+    c = {
+      name = "+conceal",
+      h = { ":set conceallevel=1<cr>", "hide/conceal" },
+      s = { ":set conceallevel=0<cr>", "show/unconceal" },
+    },
+    t = {
+      name = "+treesitter",
+      t = { vim.treesitter.inspect_tree, "show tree" },
+      c = { ":=vim.treesitter.get_captures_at_cursor()<cr>", "show capture" },
+      n = { ":=vim.treesitter.get_node():type()<cr>", "show node" },
+    },
+  },
+  o = {
+    g = {
+      -- defined in plugins/gitsigns.lua
+      name = "+git",
+      b = {
+        name = "+blame",
+      },
+    },
+  },
+  p = {
+    name = "+plugins",
+    i = { function() require("lazy").install() end, "plugins [i]nstall" },
+    s = { function() require("lazy").home() end, "plugins [s]tatus" },
+    S = { function() require("lazy").sync() end, "plugins [S]ync" },
+    u = { function() require("lazy").check() end, "plugins Check [u]pdates" },
+    U = { function() require("lazy").update() end, "plugins [U]pdate" },
+  },
+  q = {
+    name = "+quit",
+    q = { ":qa<cr>", "quit: [q]uit all" },
+    f = { ":qa!<cr>", "quit: all with [f]orce" },
+  },
+  r = {
+    -- defined in plugins/refactoring-nvim.lua
+    name = "+refactor",
+  },
+  t = {
+    name = "+telescope",
+    -- Find recursively TODOs, NOTEs, FIXITs, ... across the root folder subfiles.
+    t = { ":TodoTelescope<cr>", "[t]elescope: [t]odo" },
+  },
+  x = { ":Bdelete<CR>", "Close current buffer" },
+}, { prefix = "<leader>" })
+
+--
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ Normal mode, prefix <leader>                             │
+--  ╰──────────────────────────────────────────────────────────╯
+wk.register({
+  b = { name = "Buffer" },
+}, { mode = "n", prefix = "<leader>" })
+
+--
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ Insert mode, prefix <leader>                             │
+--  ╰──────────────────────────────────────────────────────────╯
+wk.register({
+  b = { name = "Buffer" },
+}, { mode = "i", prefix = "<leader>" })
+
+--
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ Insert mode, no prefix                                   │
+--  ╰──────────────────────────────────────────────────────────╯
+wk.register({
+  ["<C-s>"] = { "<cmd>w<cr>", "Save file" },
+  ["<C-Home>"] = { "<Home>", "Do just Home on CTRL + Home" },
+}, { mode = "i", prefix = "" })
+
+--
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ All modes, no prefix                                     │
+--  ╰──────────────────────────────────────────────────────────╯
+wk.register({
+  ["<C-s>"] = { "<cmd>w<cr>", "Save file" },
+  ["<C-End>"] = { "<End>", "Do just End on CTRL + End" },
+}, { prefix = "" })
+
+--
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ Other keymappings, still to move                         │
+--  ╰──────────────────────────────────────────────────────────╯
+
+local key = vim.api.nvim_set_keymap
+local remap = { noremap = true, silent = true }
+
+-- Go to the next block.
+--key('n', '<C-Down>', 'g%', remap )
+
+-- Loop through brackets blocks.
+--key('n', '<C-Up>', 'z%', remap )
+
+-- Move lines normally like an IDE when line wraps
+key("i", "<Down>", [[v:count ? 'j' : '<c-o>gj']], { expr = true, noremap = true, silent = true })
+key("i", "<Up>", [[v:count ? 'k' : '<c-o>gk']], { expr = true, noremap = true, silent = true })
+key("n", "<Down>", [[v:count ? 'j' : 'gj']], { expr = true, noremap = true, silent = true })
+key("n", "<Up>", [[v:count ? 'k' : 'gk']], { expr = true, noremap = true, silent = true })
+
+-- Move normaly bottom and up with C+Up and C+Down.
+key("i", "<C-Up>", "<C-o>gk", remap)
+key("i", "<C-Down>", "<C-o>gj", remap)
+key("n", "<C-Up>", "gk", remap)
+key("n", "<C-Down>", "gj", remap)
+
+-- Set 'CTRL + z' as 'undo'
+key("i", "<C-z>", "<Esc>ui", remap)
+
+-- Set 'CTRL + y' as 'redo'
+key("i", "<C-y>", "<Esc><C-r>", remap)
+
+-- Set 'SHIFT + arrows' as 'select' like modern text-editor.
+key("n", "<S-Up>", "v<Up>", remap)
+key("n", "<S-Down>", "v<Down>", remap)
+key("n", "<S-Left>", "v<Left>", remap)
+key("n", "<S-Right>", "v<Right>", remap)
+key("v", "<S-Up>", "<Up>", remap)
+key("v", "<S-Down>", "<Down>", remap)
+key("v", "<S-Left>", "<Left>", remap)
+key("v", "<S-Right>", "<Right>", remap)
+key("i", "<S-Up>", "<Esc>v<Up>", remap)
+key("i", "<S-Down>", "<C-o>v<Down>", remap)
+key("i", "<S-Left>", "<Esc>v<Left>", remap)
+key("i", "<S-Right>", "<C-o>v<Right>", remap)
+
+-- Indent the current visual selection.
+key("v", "<", "<gv", remap)
+key("v", ">", ">gv", remap)
+
+-- Set 'Backspace' as 'delete selection' for the visual selection.
+key("v", "<BS>", '"_di', remap)

config/nvim/lua/lsp.lua

@@ -0,0 +1,199 @@
+-- Completion for snippets.
+-- luacheck: globals vim CAPABILITIES
+local vim = vim
+CAPABILITIES = vim.lsp.protocol.make_client_capabilities()
+CAPABILITIES.textDocument.completion.completionItem.snippetSupport = true
+
+-- [[ Configure LSP ]]
+--  This function gets run when an LSP connects to a particular buffer.
+local on_attach = function(_, bufnr)
+  local nmap = function(keys, func, desc)
+    if desc then desc = "LSP: " .. desc end
+
+    vim.keymap.set("n", keys, func, { buffer = bufnr, desc = desc })
+  end
+
+  local wk = require("which-key")
+
+  wk.register({
+    l = {
+      name = "LSP",
+      n = { vim.lsp.buf.rename, "Rename" },
+      c = { vim.lsp.buf.code_action, "Code Action" },
+      f = { "<cmd>Format", "Format current buffer with LSP" },
+      D = { vim.lsp.buf.declaration, "[G]oto [D]eclaration" },
+      w = {
+        name = "[w]orkspace",
+        a = { vim.lsp.buf.add_workspace_folder, "[w]orkspace: [a]dd folder" },
+        r = { vim.lsp.buf.remove_workspace_folder, "[w]orkspace: [r]emove folder" },
+        l = {
+          function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end,
+          "[w]orkspace [l]ist folders",
+        },
+      },
+    },
+    g = {
+      name = "Goto",
+      d = { vim.lsp.buf.definition, "[G]oto [D]efinition" },
+      r = { require("telescope.builtin").lsp_references, "[G]oto [R]eferences" },
+      I = { vim.lsp.buf.implementation, "[G]oto [I]mplementation" },
+      D = { vim.lsp.buf.type_definition, "Type [D]efinition" },
+      s = { require("telescope.builtin").lsp_document_symbols, "[D]ocument [S]ymbols" },
+      w = { require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace [S]ymbols" },
+    },
+  }, { prefix = "<leader>" })
+
+  -- See `:help K` for why this keymap
+  nmap("K", vim.lsp.buf.hover, "Hover Documentation")
+  nmap("<C-k>", vim.lsp.buf.signature_help, "Signature Documentation")
+
+  -- Create a command `:Format` local to the LSP buffer
+  vim.api.nvim_buf_create_user_command(
+    bufnr,
+    "Format",
+    function(_) vim.lsp.buf.format() end,
+    { desc = "Format current buffer with LSP" }
+  )
+end
+
+-- Enable the following language servers
+--  Feel free to add/remove any LSPs that you want here.
+--  They will automatically be installed.
+--
+--  Add any additional override configuration in the following
+--  tables. They will be passed to the `settings` field of the
+--  server config. You must look up that documentation yourself.
+--
+--  If you want to override the default filetypes that your
+--  language server will attach to you can define the property
+--  'filetypes' to the map in question.
+local servers = {
+  ansiblels = {},
+  bashls = {},
+  clangd = {},
+  docker_compose_language_service = {},
+  dockerls = {},
+  eslint = {},
+  gopls = {},
+  html = { filetypes = { "html", "twig", "hbs" } },
+  intelephense = {},
+  jsonls = {},
+  lua_ls = {
+    Lua = {
+      diagnostics = { globals = { "vim" } },
+      workspace = { checkThirdParty = false },
+      telemetry = { enable = false },
+    },
+  },
+  marksman = {},
+  pyright = {},
+  rust_analyzer = {},
+  terraformls = {},
+  tsserver = {},
+  vuels = {},
+  yamlls = {},
+}
+
+-- Setup neovim lua configuration
+require("neodev").setup()
+
+-- nvim-cmp supports additional completion capabilities,
+-- so broadcast that to servers
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+
+-- Ensure the servers above are installed
+local mason_lspconfig = require("mason-lspconfig")
+
+mason_lspconfig.setup({
+  ensure_installed = vim.tbl_keys(servers),
+  automatic_installation = true,
+})
+
+mason_lspconfig.setup_handlers({
+  function(server_name)
+    require("lspconfig")[server_name].setup({
+      capabilities = capabilities,
+      on_attach = on_attach,
+      settings = servers[server_name],
+      filetypes = (servers[server_name] or {}).filetypes,
+    })
+  end,
+})
+
+
+-- Configure language servers for specific languages
+local lspconfig = require("lspconfig")
+
+-- Bash Language Server
+lspconfig.bashls.setup({
+  cmd = {
+    "bash-language-server",
+    "start",
+  },
+  filetypes = { "sh", "zsh" },
+  capabilities = CAPABILITIES,
+})
+
+-- HTML
+lspconfig.html.setup({ capabilities = CAPABILITIES })
+
+-- JSON
+lspconfig.jsonls.setup({
+  settings = {
+    json = {
+      schemas = require("schemastore").json.schemas(),
+      validate = { enable = true },
+    },
+  },
+  capabilities = CAPABILITIES,
+})
+
+-- Python
+lspconfig.pylsp.setup({})
+
+-- CSS + Less + SCSS
+lspconfig.cssls.setup({
+  cmd = { "vscode-css-language-server", "--stdio" },
+  filetypes = { "css", "scss", "less" },
+  -- root_dir  = root_pattern("package.json", ".git") or bufdir,
+  settings = {
+    css = {
+      validate = true,
+    },
+    less = {
+      validate = true,
+    },
+    scss = {
+      validate = true,
+    },
+  },
+  single_file_support = true,
+  capabilities = CAPABILITIES,
+  on_attach = function(client, bufnr)
+    if client.server_capabilities.documentSymbolProvider then require("nvim-navic").attach(client, bufnr) end
+  end,
+})
+
+
+-- rome
+local util = require("lspconfig.util")
+lspconfig.rome.setup({
+  root_dir = util.root_pattern("rome.json"),
+  single_file_support = true,
+  on_attach = function(client, bufnr)
+    if client.server_capabilities.documentSymbolProvider then require("nvim-navic").attach(client, bufnr) end
+  end,
+  capabilities = CAPABILITIES,
+})
+
+
+-- Typescript + Javascript
+lspconfig.tsserver.setup({
+  capabilities = CAPABILITIES,
+  on_attach = function(client, bufnr)
+    if client.server_capabilities.documentSymbolProvider then require("nvim-navic").attach(client, bufnr) end
+  end,
+})
+
+lspconfig.lua_ls.setup({})
+lspconfig.yamlls.setup({})

config/nvim/lua/lsp_signature.lua

@@ -0,0 +1,59 @@
+-- Signature for LSP
+
+return {
+  "ray-x/lsp_signature.nvim",
+  config = {
+    debug = false, -- set to true to enable debug logging
+    verbose = false, -- show debug line number
+
+    bind = true, -- This is mandatory, otherwise border config won't get registered.
+    -- If you want to hook lspsaga or other signature handler, pls set to false
+    doc_lines = 10, -- will show two lines of comment/doc(if there are more than two lines in doc, will be truncated);
+    -- set to 0 if you DO NOT want any API comments be shown
+    -- This setting only take effect in insert mode, it does not affect signature help in normal
+    -- mode, 10 by default
+
+    floating_window = true, -- show hint in a floating window, set to false for virtual text only mode
+
+    floating_window_above_cur_line = true, -- try to place the floating above the current line when possible Note:
+    -- will set to true when fully tested, set to false will use whichever side has more space
+    -- this setting will be helpful if you do not want the PUM and floating win overlap
+    close_timeout = 4000, -- close floating window after ms when laster parameter is entered
+    hint_enable = true, -- virtual hint enable
+    hint_prefix = "🐼", -- Panda for parameter
+    hint_scheme = "String",
+    use_lspsaga = false, -- set to true if you want to use lspsaga popup
+
+    hi_parameter = "LspSignatureActiveParameter", -- how your parameter will be highlight
+
+    max_height = 12, -- max height of signature floating_window, if content is more than max_height, you can scroll down
+    -- to view the hiding contents
+    max_width = 90, -- max_width of signature floating_window, line will be wrapped if exceed max_width
+    wrap = true,
+    handler_opts = {
+      border = "shadow", -- double, rounded, single, shadow, none
+    },
+
+    always_trigger = false, -- sometime show signature on new line or in middle of parameter can be confusing, set it to false for #58
+
+    floating_window_off_x = 0, -- adjust float windows x position.
+    -- can be either a number or function
+    floating_window_off_y = 2, -- adjust float windows y position. e.g -2 move window up 2 lines; 2 move down 2 lines
+    -- can be either number or function, see examples
+
+    auto_close_after = nil, -- autoclose signature float win after x sec, disabled if nil.
+    extra_trigger_chars = { "(", ",", ";", ")", "{", "}" }, -- Array of extra characters that will trigger signature completion, e.g., {"(", ","}
+    zindex = 200, -- by default it will be on top of all floating windows, set to <= 50 send it to bottom
+
+    padding = "", -- character to pad on left and right of signature can be ' ', or '|'  etc
+
+    transparency = 20, -- disabled by default, allow floating win transparent value 1~100
+    shadow_blend = 36, -- if you using shadow as border use this set the opacity
+    shadow_guibg = "Black", -- if you using shadow as border use this set the color e.g. 'Green' or '#121315'
+    timer_interval = 50, -- default timer check interval set to lower value if you want to reduce latency
+    toggle_key = "<C-n>", -- toggle signature on and off in insert mode,  e.g. toggle_key = '<M-x>'
+
+    select_signature_key = nil, -- cycle to next signature, e.g. '<M-n>' function overloading
+    move_cursor_key = nil, -- imap, use nvim_set_current_win to move cursor between current win and floating
+  },
+}

config/nvim/lua/options.lua

@@ -0,0 +1,105 @@
+-- luacheck: globals vim
+
+-- Use the new FileType system of Neovim.
+-- let g:do_filetype_lua = 1
+
+vim.wo.linebreak = true -- Fix moving through lines 'gk' and 'gj'
+vim.o.breakindent = true -- Enable break indent
+vim.o.undofile = true -- Save undo history
+vim.wo.number = true -- Show lines number (hybrid)
+vim.wo.relativenumber = true -- Show lines number (hybrid)
+vim.wo.signcolumn = "yes" -- Keep signcolumn on by default
+
+-- Case-insensitive searching UNLESS \C or capital in search
+vim.o.ignorecase = true
+vim.o.smartcase = true
+
+vim.o.cmdheight = 0 -- To have a extra line :)
+vim.wo.wrap = true -- Set wrap for words
+vim.o.showtabline = 2 -- Always show tabs
+vim.opt.list = true -- Show xtra spaces
+vim.o.wildmenu = true -- Set wildmenu for later use
+vim.o.hlsearch = true -- Highlighting search
+vim.o.ruler = true -- Set ruler for better look
+vim.o.hidden = true -- No nice message
+vim.o.showcmd = true -- Partial commands only in the screen
+vim.o.showmatch = true -- Match braces when inserting new ones
+
+-- Cursor line
+---- Cursor column
+vim.o.cursorline = true
+vim.wo.cursorline = true
+vim.o.cursorcolumn = true
+vim.wo.cursorcolumn = true
+
+vim.o.scrolloff = 40 -- Off scroll when moving through the buffer
+vim.go.termguicolors = true -- For terminal RGB colours
+vim.go.t_Co = "256" -- Colours, I believe
+vim.go.t_ut = "" -- Colours, I believe
+vim.o.laststatus = 3 -- Space for tabs
+vim.o.softtabstop = 2 -- Space for tabs
+vim.o.expandtab = true -- Expand tab to use spaces instead
+vim.o.tabstop = 2 -- Space for tabs
+vim.bo.shiftwidth = 2 -- Space for tabs
+vim.o.shiftwidth = 2 -- Space for tabs
+
+vim.o.formatoptions = "tqj" -- Format options to not create new lines with comments
+vim.o.mouse = "a" -- Mouse working with neovim
+
+-- viminfo file
+-- vim.o.viminfo = vim.o.viminfo .. '~/.config/nvim/viminfo'
+
+-- Spell language to English (UK)
+vim.o.spelllang = "en_gb"
+vim.bo.spelllang = "en_gb"
+
+vim.opt.laststatus = 2 -- Global statusline.
+
+-- When "on" the commands listed below move the cursor to the first non-blank
+--  of the line.  When off the cursor is kept in the same column (if possible).
+-- https://neovim.io/doc/user/options.html#'startofline'
+vim.opt.startofline = true
+
+-- Set path for better searching across the system
+-- vim.o.path = vim.o.path .. '**'
+
+-- Complete options
+vim.o.completeopt = "menuone,longest,noselect"
+vim.o.shortmess = vim.o.shortmess .. "c"
+
+vim.go.pumblend = 10 -- Menu Transparency.
+
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ Variables                                                │
+--  ╰──────────────────────────────────────────────────────────╯
+
+vim.api.nvim_set_var("one_allow_itali:set cursorlinec:set cursorlines", 1)
+vim.api.nvim_set_var("do_filetype_lua", 1)
+vim.api.nvim_set_var("MRU_File", "~/.cache/vim_mru_files")
+
+--  ╭──────────────────────────────────────────────────────────╮
+--  │ API                                                      │
+--  ╰──────────────────────────────────────────────────────────╯
+
+-- Change title accordingly.
+vim.api.nvim_set_option("title", true)
+
+-- Set clipboard to be global across the system
+vim.api.nvim_set_option("clipboard", "unnamedplus")
+
+-- Basic fold column
+vim.api.nvim_set_option("foldcolumn", "1")
+
+-- Set dictionary to language spell
+vim.api.nvim_set_option("dictionary", "/usr/share/dict/words")
+
+-- Wildignore for when opening files :0
+vim.api.nvim_set_option(
+  "wildignore",
+  "*/tmp*/,*/node_modules/*,_site,*/__pycache__/,*/venv/*,*/target/*,*/.vim$,~$,*/.log"
+)
+
+-- Folding
+vim.api.nvim_set_option("foldmethod", "syntax")
+vim.api.nvim_set_option('foldenable', false)
+vim.api.nvim_set_option('foldminlines', 5)

config/nvim/lua/plugin-manager.lua

@@ -0,0 +1,40 @@
+-- Package manager https://github.com/folke/lazy.nvim
+-- :help lazy.nvim.txt
+-- luacheck: globals vim
+
+-- To install lazy.nvim automatically.
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system({
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  })
+end
+
+vim.opt.rtp:prepend(lazypath)
+
+local options = {
+  defaults = { lazy = false },
+  install = { colorscheme = { "catppuccin" } },
+  performance = {
+    cache = {
+      enabled = true,
+    },
+    rtp = {
+      disabled_plugins = {
+        "matchit",
+        "matchparen",
+        "netrwPlugin",
+        "tohtml",
+        "tutor",
+      },
+    },
+  },
+}
+
+require("lazy").setup("plugins", options)

config/nvim/lua/plugins/barbecue.lua

@@ -0,0 +1,92 @@
+-- A VS Code like winbar for Neovim
+-- https://github.com/utilyre/barbecue.nvim
+return {
+  "utilyre/barbecue.nvim",
+  dependencies = {
+    "neovim/nvim-lspconfig",
+    "SmiteshP/nvim-navic",
+    "kyazdani42/nvim-web-devicons",
+  },
+  version = "*",
+  config = {
+    theme = "catppuccin",
+
+    -- If you set this to false, floating windows will look weird
+    exclude_float = true,
+
+    -- Instead of excluding countless number of filetypes, barbecue tries to only show on some buftypes
+    -- "": file buffer
+    -- "nofile": e.g. nvim-tree and nvim-dap-ui
+    -- "prompt": e.g. telescope.nvim and nvim-fzf
+    -- "terminal": e.g. fterm.nvim and toggleterm.nvim
+    -- ...
+    include_buftypes = { "" },
+
+    ---Filetypes not to enable winbar in.
+    ---
+    ---@type string[]
+    exclude_filetypes = {
+      "",
+      "txt",
+      "markdown",
+    },
+
+    -- :help events
+    -- :help [event] (like :help BufWinEnter)
+    update_events = {
+      "BufWinEnter",
+      "BufWritePost",
+      "CursorMoved",
+      "CursorMovedI",
+      "TextChanged",
+      "TextChangedI",
+    },
+
+    -- Show `~  ...` instead of `/  home  user  ...`
+    tilde_home = true,
+
+    -- Your winbar will have a little padding from the edge
+    prefix = "  ",
+
+    -- The sign between each entry
+    separator = "  ",
+
+    -- Show if lsp context is available but there is nothing to show
+    no_info_indicator = "…",
+
+    -- Symbol to show if file has been modified (not saved). It's usually `[+]` in vim
+    -- `nil` to disable
+    modified_indicator = nil,
+
+    -- Icons passed to nvim-navic
+    icons = {
+      File = " ",
+      Module = " ",
+      Namespace = " ",
+      Package = " ",
+      Class = " ",
+      Method = " ",
+      Property = " ",
+      Field = " ",
+      Constructor = " ",
+      Enum = "練",
+      Interface = "練",
+      Function = " ",
+      Variable = " ",
+      Constant = " ",
+      String = " ",
+      Number = " ",
+      Boolean = "◩ ",
+      Array = " ",
+      Object = " ",
+      Key = " ",
+      Null = "ﳠ ",
+      EnumMember = " ",
+      Struct = " ",
+      Event = " ",
+      Operator = " ",
+      TypeParameter = " ",
+      Define = " ",
+    },
+  },
+}

config/nvim/lua/plugins/gitsigns.lua

@@ -0,0 +1,89 @@
+-- Git integration for buffers
+-- https://github.com/lewis6991/gitsigns.nvim
+-- luacheck: globals vim
+return {
+  "lewis6991/gitsigns.nvim",
+  dependencies = { "nvim-lua/plenary.nvim" },
+  config = {
+    signs = {
+      add = { hl = "GitSignsAdd", text = "┃", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
+      change = { hl = "GitSignsChange", text = "┃", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
+      delete = { hl = "GitSignsDelete", text = "_", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
+      topdelete = { hl = "GitSignsDelete", text = "‾", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
+      changedelete = { hl = "GitSignsChange", text = "~", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
+    },
+    signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
+    numhl = false,     -- Toggle with `:Gitsigns toggle_numhl`
+    linehl = false,    -- Toggle with `:Gitsigns toggle_linehl`
+    word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
+    on_attach = function(bufnr)
+      local gs = package.loaded.gitsigns
+
+      local function map(mode, l, r, opts)
+        opts = opts or {}
+        opts.buffer = bufnr
+        vim.keymap.set(mode, l, r, opts)
+      end
+
+      -- Navigation
+      map("n", "]c", function()
+        if vim.wo.diff then return "]c" end
+        vim.schedule(function() gs.next_hunk() end)
+        return "<Ignore>"
+      end, { expr = true })
+
+      map("n", "[c", function()
+        if vim.wo.diff then return "[c" end
+        vim.schedule(function() gs.prev_hunk() end)
+        return "<Ignore>"
+      end, { expr = true })
+
+      -- Actions
+      map("n", "<leader>oghs", gs.stage_hunk, { desc = "Stage Hunk" })
+      map("n", "<leader>oghr", gs.reset_hunk, { desc = "Reset Hunk" })
+      map("v", "<leader>oghs", function() gs.stage_hunk({ vim.fn.line("."), vim.fn.line("v") }) end)
+      map("v", "<leader>oghr", function() gs.reset_hunk({ vim.fn.line("."), vim.fn.line("v") }) end)
+      map("n", "<leader>oghS", gs.stage_buffer, { desc = "Stage Buffer" })
+      map("n", "<leader>oghu", gs.undo_stage_hunk, { desc = "Undo Stage Hunk" })
+      map("n", "<leader>oghR", gs.reset_buffer, { desc = "Reset Buffer" })
+      map("n", "<leader>oghp", gs.preview_hunk, { desc = "Preview Hunk" })
+      map("n", "<leader>ogbl", function() gs.blame_line({ full = true }) end, { desc = "Blame Line" })
+      map("n", "<leader>ogbt", gs.toggle_current_line_blame, { desc = "Toggle Current Line Blame" })
+      map("n", "<leader>oghd", gs.diffthis, { desc = "Diff This" })
+      map("n", "<leader>oghD", function() gs.diffthis("~") end)
+      map("n", "<leader>ogtd", gs.toggle_deleted, { desc = "Toggle Deleted" })
+
+      -- Text object
+      map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>")
+    end,
+    watch_gitdir = {
+      interval = 1000,
+      follow_files = true,
+    },
+    attach_to_untracked = true,
+    current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+    current_line_blame_opts = {
+      virt_text = true,
+      virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
+      delay = 1000,
+    },
+    current_line_blame_formatter_opts = {
+      relative_time = false,
+    },
+    sign_priority = 6,
+    update_debounce = 100,
+    status_formatter = nil, -- Use default
+    max_file_length = 40000,
+    preview_config = {
+      -- Options passed to nvim_open_win
+      border = "single",
+      style = "minimal",
+      relative = "cursor",
+      row = 0,
+      col = 1,
+    },
+    yadm = {
+      enable = false,
+    },
+  },
+}

config/nvim/lua/plugins/lazy.lua

@@ -0,0 +1,264 @@
+-- luacheck: globals vim
+
+return {
+  -- plenary: full; complete; entire; absolute; unqualified.
+  -- All the lua functions I don't want to write twice.
+  -- https://github.com/nvim-lua/plenary.nvim
+  { "nvim-lua/plenary.nvim",       lazy = true },
+
+  -- lua `fork` of vim-web-devicons for neovim
+  -- https://github.com/nvim-tree/nvim-web-devicons
+  { "kyazdani42/nvim-web-devicons" },
+
+  -- The theme of choise, catppuccin
+  -- https://github.com/catppuccin/nvim
+  {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    priority = 10000,
+    enabled = true,
+    lazy = false,
+    config = function() vim.cmd.colorscheme("catppuccin") end,
+    opts = {
+      flavour = "mocha",
+      transparent_background = true,
+      dim_inactive = {
+        enabled = true,
+        shade = "dark",
+        percentage = 0.15,
+      },
+      integrations = {
+        aerial = true,
+        barbecue = {
+          -- directory name is dimmed by default
+          dim_dirname = true,
+          bold_basename = true,
+          dim_context = false,
+          alt_background = false,
+        },
+        cmp = true,
+        dap = { enabled = true, enable_ui = true },
+        gitsigns = true,
+        harpoon = true,
+        indent_blankline = {
+          enabled = true,
+          colored_indent_levels = false,
+        },
+        mason = true,
+        neotree = true,
+        notify = true,
+        native_lsp = {
+          enabled = true,
+          virtual_text = {
+            errors = { "italic" },
+            hints = { "italic" },
+            warnings = { "italic" },
+            information = { "italic" },
+          },
+          underlines = {
+            errors = { "underline" },
+            hints = { "underline" },
+            warnings = { "underline" },
+            information = { "underline" },
+          },
+          inlay_hints = {
+            background = true,
+          },
+        },
+        semantic_tokens = true,
+        symbols_outline = true,
+        telescope = {
+          enabled = true,
+          style = "catppuccin",
+        },
+        treesitter = true,
+        lsp_trouble = true,
+        which_key = true,
+      },
+    },
+  },
+
+  -- Notifications as a popup
+  -- https://github.com/rcarriga/nvim-notify
+  {
+    "rcarriga/nvim-notify",
+    keys = {
+      {
+        "<leader>un",
+        function() require("notify").dismiss({ silent = true, pending = true }) end,
+        desc = "Dismiss all Notifications",
+      },
+    },
+    opts = {
+      timeout = 3000,
+      max_height = function() return math.floor(vim.o.lines * 0.75) end,
+      max_width = function() return math.floor(vim.o.columns * 0.75) end,
+    },
+    init = function() vim.notify = require("notify") end,
+  },
+
+  -- vscode-like pictograms for neovim lsp completion items
+  -- https://github.com/onsails/lspkind.nvim
+  { "onsails/lspkind-nvim" },
+
+  -- Save and restore Vim views automatically
+  -- https://github.com/senderle/restoreview
+  { "senderle/restoreview" },
+
+  -- Create key bindings that stick. WhichKey is a lua plugin for Neovim that
+  -- displays a popup with possible keybindings of the command you started typing.
+  -- https://github.com/folke/which-key.nvim
+  {
+    "folke/which-key.nvim",
+    enabled = true,
+    lazy = false,
+    init = function()
+      vim.o.timeout = true
+      vim.o.timeoutlen = 300
+    end,
+    opts = {
+      plugins = { spelling = true, marks = true, registers = true },
+    },
+  },
+
+  -- Neovim plugin to improve the default vim.ui interfaces
+  -- https://github.com/stevearc/dressing.nvim
+  {
+    "stevearc/dressing.nvim",
+    lazy = true,
+    init = function()
+      ---@diagnostic disable-next-line: duplicate-set-field
+      vim.ui.select = function(...)
+        require("lazy").load({ plugins = { "dressing.nvim" } })
+        return vim.ui.select(...)
+      end
+      ---@diagnostic disable-next-line: duplicate-set-field
+      vim.ui.input = function(...)
+        require("lazy").load({ plugins = { "dressing.nvim" } })
+        return vim.ui.input(...)
+      end
+    end,
+  },
+
+  -- A tree like view for symbols in Neovim using the LSP.
+  -- https://github.com/simrat39/symbols-outline.nvim
+  {
+    "simrat39/symbols-outline.nvim",
+    cmd = "SymbolsOutline",
+    keys = { { "<leader>bs", "<cmd>SymbolsOutline<cr>", desc = "Symbols Outline" } },
+    opts = {
+      -- add your options that should be passed to the setup() function here
+      position = "right",
+    },
+  },
+
+  -- Getting you where you want with the fewest keystrokes.
+  -- https://github.com/ThePrimeagen/harpoon
+  { "ThePrimeagen/harpoon" },
+
+  -- A Neovim plugin hiding your colorcolumn when unneeded.
+  -- https://github.com/m4xshen/smartcolumn.nvim
+  {
+    "m4xshen/smartcolumn.nvim",
+    opts = {
+      colorcolumn = { "80", "100", "120" },
+      disabled_filetypes = {
+        "dashboard",
+        "help",
+        "json",
+        "lazy",
+        "lazyterm",
+        "mason",
+        "neo-tree",
+        "notify",
+        "starter",
+        "toggleterm",
+        "Trouble",
+      },
+    },
+  },
+
+  -- Status information for LSP.
+  -- https://github.com/j-hui/fidget.nvim
+  { "j-hui/fidget.nvim" },
+
+  -- A neovim lua plugin to help easily manage multiple terminal windows
+  -- https://github.com/akinsho/toggleterm.nvim
+  {
+    'akinsho/toggleterm.nvim',
+    version = "*",
+    opts = {
+      open_mapping = [[<c-t>]],
+      insert_mappings = true,
+      -- direction = "float",
+      float_opts = {
+        width = function()
+          return math.floor(vim.o.columns * 0.9)
+        end,
+        height = function()
+          return math.floor(vim.o.lines * 0.9)
+        end,
+      },
+    }
+  },
+
+  -- Close buffer without messing up with the window.
+  -- https://github.com/famiu/bufdelete.nvim
+  { "famiu/bufdelete.nvim" },
+
+  -- Delete multiple vim buffers based on different conditions
+  -- https://github.com/kazhala/close-buffers.nvim
+  { "kazhala/close-buffers.nvim" },
+
+  -- JSONLS
+  -- https://github.com/b0o/schemastore.nvim
+  { "b0o/schemastore.nvim" },
+
+  -- sleuth.vim: Heuristically set buffer options
+  -- https://github.com/tpope/vim-sleuth
+  { "tpope/vim-sleuth" },
+
+  -- Neovim plugin for locking a buffer to a window
+  -- https://github.com/stevearc/stickybuf.nvim
+  { "stevearc/stickybuf.nvim",   opts = {} },
+
+  -- Describe the regexp under the cursor
+  -- https://github.com/bennypowers/nvim-regexplainer
+  {
+    "bennypowers/nvim-regexplainer",
+    requires = {
+      "nvim-treesitter/nvim-treesitter",
+      "MunifTanjim/nui.nvim",
+    },
+    opts = {
+      -- automatically show the explainer when the cursor enters a regexp
+      auto = true,
+    },
+  },
+
+  -- Clarify and beautify your comments using boxes and lines.
+  -- https://github.com/LudoPinelli/comment-box.nvim
+  { "LudoPinelli/comment-box.nvim", opts = {} },
+
+  -- Tabnine Client for Neovim
+  -- https://github.com/codota/tabnine-nvim
+  {
+    "codota/tabnine-nvim",
+    name = "tabnine",
+    build = vim.loop.os_uname().sysname == "Windows_NT" and "pwsh.exe -file .\\dl_binaries.ps1" or "./dl_binaries.sh",
+    cmd = { "TabnineStatus", "TabnineDisable", "TabnineEnable", "TabnineToggle" },
+    event = "User",
+    opts = {
+      accept_keymap = "<C-CR>",
+      dismiss_keymap = "<C-Esc>",
+    },
+  },
+
+  -- Vim plugin for automatic time tracking and metrics generated from your programming activity.
+  -- https://github.com/wakatime/vim-wakatime
+  {
+    "wakatime/vim-wakatime",
+    lazy = false,
+    enabled = true,
+  },
+}

config/nvim/lua/plugins/mini.lua

@@ -0,0 +1,140 @@
+return {
+  "echasnovski/mini.nvim",
+  version = "*",
+  config = function()
+    -- Common configuration presets
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-basics.md
+    require("mini.basics").setup()
+
+    -- Fast and flexible start screen
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-starter.md
+    local starter = require("mini.starter")
+    starter.setup({
+      header = table.concat({
+        "         ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄        ",
+        "       ▄▀░░░░░░░░░░░░▄░░░░░░░▀▄      ",
+        "       █░░▄░░░░▄░░░░░░░░░░░░░░█      ",
+        "       █░░░░░░░░░░░░▄█▄▄░░▄░░░█ ▄▄▄  ",
+        "▄▄▄▄▄  █░░░░░░▀░░░░▀█░░▀▄░░░░░█▀▀░██ ",
+        "██▄▀██▄█░░░▄░░░░░░░██░░░░▀▀▀▀▀░░░░██ ",
+        " ▀██▄▀██░░░░░░░░▀░██▀░░░░░░░░░░░░░▀██",
+        "   ▀████░▀░░░░▄░░░██░░░▄█░░░░▄░▄█░░██",
+        "      ▀█░░░░▄░░░░░██░░░░▄░░░▄░░▄░░░██",
+        "      ▄█▄░░░░░░░░░░░▀▄░░▀▀▀▀▀▀▀▀░░▄▀ ",
+        "     █▀▀█████████▀▀▀▀████████████▀   ",
+        "     ████▀  ███▀      ▀███  ▀██▀     ",
+      }, "\n"),
+      evaluate_single = true,
+      items = {
+        starter.sections.telescope(),
+        starter.sections.builtin_actions(),
+        starter.sections.recent_files(5, true, true),
+      },
+      content_hooks = {
+        starter.gen_hook.adding_bullet(),
+        starter.gen_hook.aligning("center", "center"),
+      },
+    })
+
+    -- Miscellaneous useful functions
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-misc.md
+    require("mini.misc").setup()
+
+    -- Extend and create a/i textobjects
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-ai.md
+    require("mini.ai").setup()
+
+    -- Align text interactively
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-align.md
+    require("mini.align").setup()
+
+    -- Animate common Neovim actions
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-animate.md
+    -- require("mini.animate").setup()
+
+    -- Go forward/backward with square brackets
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-bracketed.md
+    require("mini.bracketed").setup()
+
+    -- Comment lines
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-comment.md
+    require("mini.comment").setup()
+
+    -- Autocompletion and signature help plugin
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-completion.md
+    -- require("mini.completion").setup()
+
+    -- Automatic highlighting of word under cursor
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-cursorword.md
+    -- require("mini.cursorword").setup()
+
+    -- Highlight patterns in text
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-hipatterns.md
+    local hipatterns = require("mini.hipatterns")
+    hipatterns.setup({
+      highlighters = {
+        -- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE'
+        fixme = { pattern = "%f[%w]()FIXME()%f[%W]", group = "MiniHipatternsFixme" },
+        hack = { pattern = "%f[%w]()HACK()%f[%W]", group = "MiniHipatternsHack" },
+        todo = { pattern = "%f[%w]()TODO()%f[%W]", group = "MiniHipatternsTodo" },
+        note = { pattern = "%f[%w]()NOTE()%f[%W]", group = "MiniHipatternsNote" },
+
+        -- Highlight hex color strings (`#rrggbb`) using that color
+        hex_color = hipatterns.gen_highlighter.hex_color(),
+      },
+    })
+
+    -- Visualize and work with indent scope
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-indentscope.md
+    require("mini.indentscope").setup({
+      draw = {
+        delay = 0,
+        -- animation = require("mini.indentscope").gen_animation("none"),
+      },
+    })
+
+    -- Jump to next/previous single character
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-jump.md
+    require("mini.jump").setup()
+
+    -- Jump within visible lines via iterative label filtering
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-jump2d.md
+    require("mini.jump2d").setup()
+
+    -- Window with buffer text overview, scrollbar, and highlights
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-map.md
+    require("mini.map").setup()
+
+    -- Move any selection in any direction
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-move.md
+    require("mini.move").setup()
+
+    -- Text edit operators
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-operators.md
+    -- require("mini.operators").setup()
+
+    -- Minimal and fast autopairs
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-pairs.md
+    require("mini.pairs").setup()
+
+    -- Split and join arguments
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-splitjoin.md
+    require("mini.splitjoin").setup()
+
+    -- Minimal and fast statusline module with opinionated default look
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-statusline.md
+    require("mini.statusline").setup()
+
+    -- Fast and feature-rich surround actions
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-surround.md
+    require("mini.surround").setup()
+
+    -- Minimal and fast tabline showing listed buffers
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-tabline.md
+    require("mini.tabline").setup()
+
+    -- Work with trailing whitespace
+    -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-trailspace.md
+    require("mini.trailspace").setup()
+  end,
+}

config/nvim/lua/plugins/neo-tree.lua

@@ -0,0 +1,456 @@
+-- File-tree manager.
+-- https://github.com/nvim-neo-tree/neo-tree.nvim
+-- luacheck: globals vim
+
+-- Unless you are still migrating, remove the deprecated commands from v1.x
+vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
+
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "kyazdani42/nvim-web-devicons",
+    "MunifTanjim/nui.nvim",
+    {
+      -- only needed if you want to use the commands with "_with_window_picker" suffix
+      "s1n7ax/nvim-window-picker",
+      config = function()
+        require("window-picker").setup({
+          autoselect_one = true,
+          include_current = false,
+          filter_rules = {
+            -- filter using buffer options
+            bo = {
+              -- if the file type is one of following, the window will be ignored
+              filetype = { "neo-tree", "neo-tree-popup", "notify" },
+
+              -- if the buffer type is one of following, the window will be ignored
+              buftype = { "terminal", "quickfix" },
+            },
+          },
+          other_win_hl_color = "#e35e4f",
+        })
+      end,
+    },
+  },
+  config = function()
+    -- If you want icons for diagnostic errors, you'll need to define them somewhere:
+    vim.fn.sign_define("DiagnosticSignError", { text = " ", texthl = "DiagnosticSignError" })
+    vim.fn.sign_define("DiagnosticSignWarn", { text = " ", texthl = "DiagnosticSignWarn" })
+    vim.fn.sign_define("DiagnosticSignInfo", { text = " ", texthl = "DiagnosticSignInfo" })
+    vim.fn.sign_define("DiagnosticSignHint", { text = "󰌵", texthl = "DiagnosticSignHint" })
+
+    require("neo-tree").setup({
+      -- Close Neo-tree if it is the last window left in the tab
+      close_if_last_window = true,
+      -- "double", "none", "rounded", "shadow", "single" or "solid"
+      popup_border_style = "rounded",
+      enable_git_status = true,
+      enable_diagnostics = true,
+      -- Enable normal mode for input dialogs.
+      enable_normal_mode_for_inputs = false,
+
+      -- when opening files, do not use windows containing these filetypes or buftypes
+      open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
+
+      -- popup_border_style is for input and confirmation dialogs.
+      -- Configurtaion of floating window is done in the individual source sections.
+      -- "NC" is a special style that works well with NormalNC set
+      close_floats_on_escape_key = true,
+      default_source = "filesystem",
+      git_status_async = true,
+      -- "trace", "debug", "info", "warn", "error", "fatal"
+      log_level = "info",
+      -- true, false, "/path/to/file.log", use :NeoTreeLogs to show the file
+      log_to_file = false,
+      -- false = open files in top left window
+      open_files_in_last_window = true,
+      -- in ms, needed for containers to redraw right aligned and faded content
+      resize_timer_interval = 100,
+      -- used when sorting files and directories in the tree
+      sort_case_insensitive = true,
+      -- If false, inputs will use vim.ui.input() instead of custom floats.
+      use_popups_for_input = false,
+      -- use a custom function for sorting files and directories in the tree
+      sort_function = nil,
+      event_handlers = {
+        --  {
+        --    event = "before_render",
+        --    handler = function (state)
+        --      -- add something to the state that can be used by custom components
+        --    end
+        --  },
+        --  {
+        --    event = "file_opened",
+        --    handler = function(file_path)
+        --      --auto close
+        --      require("neo-tree").close_all()
+        --    end
+        --  },
+        --  {
+        --    event = "file_opened",
+        --    handler = function(file_path)
+        --      --clear search after opening a file
+        --      require("neo-tree.sources.filesystem").reset_search()
+        --    end
+        --  },
+        --  {
+        --    event = "file_renamed",
+        --    handler = function(args)
+        --      -- fix references to file
+        --      print(args.source, " renamed to ", args.destination)
+        --    end
+        --  },
+        --  {
+        --    event = "file_moved",
+        --    handler = function(args)
+        --      -- fix references to file
+        --      print(args.source, " moved to ", args.destination)
+        --    end
+        --  },
+        {
+          event = "neo_tree_buffer_enter",
+          handler = function()
+            vim.cmd("set winbar=")
+            vim.cmd("highlight CursorLine gui='bold'")
+            vim.cmd("highlight CursorColumn guibg=NONE")
+            --vim.cmd("set guicursor+=a:InvisibleCursor")
+            --vim.cmd("highlight InvisibleCursor gui=reverse blend=100")
+          end,
+        },
+        {
+          event = "neo_tree_buffer_leave",
+          handler = function()
+            --vim.cmd("set guicursor-=a:InvisibleCursor")
+            vim.cmd("highlight CursorLine gui=NONE")
+          end,
+        },
+      },
+      default_component_configs = {
+        container = {
+          enable_character_fade = true,
+        },
+        indent = {
+          indent_size = 2,
+          -- extra padding on left hand side
+          padding = 1,
+          -- indent guides
+          with_markers = true,
+          indent_marker = "│",
+          last_indent_marker = "└",
+          highlight = "NeoTreeIndentMarker",
+          -- expander config, needed for nesting files
+          -- if nil and file nesting is enabled, will enable expanders
+          with_expanders = true,
+          expander_collapsed = "",
+          expander_expanded = "",
+          expander_highlight = "NeoTreeExpander",
+        },
+        icon = {
+          folder_closed = "",
+          folder_open = "",
+          folder_empty = "-",
+          -- The next two settings are only a fallback,
+          -- if you use nvim-web-devicons and configure default icons there
+          -- then these will never be used.
+          default = "*",
+          highlight = "NeoTreeFileIcon",
+        },
+        modified = {
+          symbol = "[+]",
+          highlight = "NeoTreeModified",
+        },
+        name = {
+          trailing_slash = true,
+          use_git_status_colors = false,
+          highlight = "NeoTreeFileName",
+        },
+        git_status = {
+          symbols = {
+            -- Change type
+            added = "˖",
+            modified = "±",
+            deleted = "✕",
+            renamed = "↪",
+            -- Status type
+            untracked = "?",
+            ignored = "⍨",
+            unstaged = "·",
+            staged = "✓",
+            conflict = "",
+          },
+        },
+      },
+      -- A list of functions, each representing a global custom command
+      -- that will be available in all sources (if not overridden in `opts[source_name].commands`)
+      -- see `:h neo-tree-custom-commands-global`
+      commands = {},
+      window = {
+        -- see https://github.com/MunifTanjim/nui.nvim/tree/main/lua/nui/popup for
+        -- possible options. These can also be functions that return these options.
+
+        -- left, right, float, current
+        position = "left",
+        -- applies to left and right positions
+        width = 40,
+        mapping_options = {
+          noremap = true,
+          nowait = true,
+        },
+        -- settings that apply to float position only
+        popup = {
+          size = {
+            height = "80%",
+            width = "50%",
+          },
+          position = "50%", -- 50% means center it
+          -- you can also specify border here, if you want a different setting from
+          -- the global popup_border_style.
+        },
+        -- Mappings for tree window. See `:h nep-tree-mappings` for a list of built-in commands.
+        -- You can also create your own commands by providing a function instead of a string.
+        mappings = {
+          ["<space>"] = {
+            "toggle_node",
+            -- disable `nowait` if you have existing combos
+            -- starting with this char that you want to use
+            nowait = false,
+          },
+          ["<2-LeftMouse>"] = "open",
+          ["<cr>"] = "open",
+          -- close preview or floating neo-tree window
+          ["<esc>"] = "cancel",
+          ["P"] = { "toggle_preview", config = { use_float = true } },
+          ["l"] = "focus_preview",
+          -- ["S"] = "open_split",
+          -- ["s"] = "open_vsplit",
+          ["S"] = "split_with_window_picker",
+          ["s"] = "vsplit_with_window_picker",
+          ["t"] = "open_tabnew",
+          -- ["<cr>"] = "open_drop",
+          -- ["t"] = "open_tab_drop",
+          ["w"] = "open_with_window_picker",
+          -- -- enter preview mode, which shows the current node without focusing
+          --["P"] = "toggle_preview",
+          ["C"] = "close_node",
+          -- ['C'] = 'close_all_subnodes',
+          ["z"] = "close_all_nodes",
+          --["Z"] = "expand_all_nodes",
+          ["a"] = {
+            "add",
+            -- this command supports BASH style brace expansion ("x{a,b,c}" -> xa,xb,xc).
+            -- see `:h neo-tree-file-actions` for details
+            -- some commands may take optional config options,
+            -- see `:h neo-tree-mappings` for details
+            config = {
+              -- "none", "relative", "absolute"
+              show_path = "relative",
+            },
+          },
+          -- also accepts the optional config.show_path option like "add".
+          -- this also supports BASH style brace expansion.
+          ["A"] = "add_directory",
+          ["d"] = "delete",
+          ["r"] = "rename",
+          ["y"] = "copy_to_clipboard",
+          ["x"] = "cut_to_clipboard",
+          ["p"] = "paste_from_clipboard",
+          -- takes text input for destination, also accepts the optional config.show_path option like "add":
+          -- ["c"] = {
+          --  "copy",
+          --  config = {
+          --    show_path = "none" -- "none", "relative", "absolute"
+          --  }
+          --}
+          ["c"] = "copy",
+          -- takes text input for destination, also accepts the optional config.show_path option like "add".
+          ["m"] = "move",
+          ["q"] = "close_window",
+          ["R"] = "refresh",
+          ["?"] = "show_help",
+          ["<"] = "prev_source",
+          [">"] = "next_source",
+        },
+      },
+      nesting_rules = {},
+      filesystem = {
+        -- Add a custom command or override a global one using the same function name
+        commands = {},
+        components = {
+          harpoon_index = function(config, node, _)
+            local Marked = require("harpoon.mark")
+            local path = node:get_id()
+            local succuss, index = pcall(Marked.get_index_of, path)
+            if succuss and index and index > 0 then
+              return {
+                text = string.format(" ⥤ %d", index), -- <-- Add your favorite harpoon like arrow here
+                highlight = config.highlight or "NeoTreeDirectoryIcon",
+              }
+            else
+              return {}
+            end
+          end,
+        },
+        renderers = {
+          directory = {
+            { "indent" },
+            { "icon" },
+            { "current_filter" },
+            {
+              "container",
+              width = "100%",
+              right_padding = 0,
+              --max_width   = 60,
+              content = {
+                { "name",        zindex = 10 },
+                { "clipboard",   zindex = 10 },
+                { "diagnostics", errors_only = true, zindex = 20, align = "right" },
+              },
+            },
+          },
+          file = {
+            { "indent" },
+            { "icon" },
+            {
+              "container",
+              width = "100%",
+              right_padding = 0,
+              --max_width   = 60,
+              content = {
+                {
+                  "name",
+                  use_git_status_colors = false,
+                  zindex = 10,
+                },
+                -- {
+                --   "symlink_target",
+                --   zindex = 10,
+                --   highlight = "NeoTreeSymbolicLinkTarget",
+                -- },
+                { "clipboard",     zindex = 10 },
+                { "bufnr",         zindex = 10 },
+                { "harpoon_index", zindex = 20, align = "right" },
+                { "modified",      zindex = 20, align = "right" },
+                { "diagnostics",   zindex = 20, align = "right" },
+                { "git_status",    zindex = 20, align = "right" },
+              },
+            },
+          },
+        },
+        filtered_items = {
+          -- when true, they will just be displayed differently than normal items
+          visible = false,
+          hide_dotfiles = false,
+          hide_gitignored = false,
+          -- only works on Windows for hidden files/directories
+          hide_hidden = true,
+          hide_by_name = {
+            ".git",
+            ".DS_Store",
+            "thumbs.db",
+            ".idea",
+            ".mypy_cache",
+            "node_modules",
+          },
+          -- uses glob style patterns
+          hide_by_pattern = {
+            --"*.meta",
+            --"*/src/*/tsconfig.json",
+            "*-cache",
+            "*.cache",
+            ".null-ls_*",
+          },
+          never_show = { -- remains hidden even if visible is toggled to true
+            ".DS_Store",
+            "thumbs.db",
+          },
+          always_show = { -- remains visible even if other settings would normally hide it
+            ".gitignore",
+            ".gitkeep",
+          },
+        },
+        find_by_full_path_words = true,
+        -- when true, empty folders will be grouped together
+        group_empty_dirs = false,
+        -- true creates a 2-way binding between vim's cwd and neo-tree's root
+        bind_to_cwd = false,
+        -- max number of search results when using filters
+        search_limit = 50,
+        follow_current_file = {
+          -- This will find and focus the file in the active buffer every time
+          -- the current file is changed while the tree is open.
+          enabled = false,
+          -- `false` closes auto expanded dirs, such as with `:Neotree reveal`
+          leave_dirs_open = false,
+        },
+        -- netrw disabled, opening a directory opens neo-tree
+        -- in whatever position is specified in window.position
+        -- "open_current",  -- netrw disabled, opening a directory opens within the
+        -- window like netrw would, regardless of window.position
+        -- "disabled",    -- netrw left alone, neo-tree does not handle opening dirs
+        hijack_netrw_behavior = "open_default",
+        -- This will use the OS level file watchers to detect changes
+        -- instead of relying on nvim autocmd events.
+        use_libuv_file_watcher = true,
+        window = {
+          mappings = {
+            ["."] = "set_root",
+            ["/"] = "fuzzy_finder",
+            -- fuzzy sorting using the fzy algorithm
+            ["#"] = "fuzzy_sorter",
+            ["<bs>"] = "navigate_up",
+            ["<c-up>"] = "navigate_up",
+            ["<c-x>"] = "clear_filter",
+            ["D"] = "fuzzy_finder_directory",
+            ["f"] = "filter_on_submit",
+            ["gn"] = "next_git_modified",
+            ["gp"] = "prev_git_modified",
+            ["H"] = "toggle_hidden",
+          },
+          -- define keymaps for filter popup window in fuzzy_finder_mode
+          fuzzy_finder_mappings = {
+            ["<down>"] = "move_cursor_down",
+            ["<C-n>"] = "move_cursor_down",
+            ["<up>"] = "move_cursor_up",
+            ["<C-p>"] = "move_cursor_up",
+          },
+        },
+      },
+      buffers = {
+        follow_current_file = {
+          -- This will find and focus the file in the active buffer every time
+          -- the current file is changed while the tree is open.
+          enabled = true,
+          -- `false` closes auto expanded dirs, such as with `:Neotree reveal`
+          leave_dirs_open = true,
+        },
+        -- when true, empty folders will be grouped together
+        group_empty_dirs = true,
+        show_unloaded = true,
+        window = {
+          mappings = {
+            ["bd"] = "buffer_delete",
+            ["<bs>"] = "navigate_up",
+            ["."] = "set_root",
+          },
+        },
+      },
+      git_status = {
+        window = {
+          position = "float",
+          mappings = {
+            ["A"] = "git_add_all",
+            ["gu"] = "git_unstage_file",
+            ["ga"] = "git_add_file",
+            ["gr"] = "git_revert_file",
+            ["gc"] = "git_commit",
+            ["gp"] = "git_push",
+            ["gg"] = "git_commit_and_push",
+          },
+        },
+      },
+    })
+
+    vim.cmd([[nnoremap \ :Neotree reveal<cr>]])
+  end,
+}

config/nvim/lua/plugins/neogen.lua

@@ -0,0 +1,23 @@
+-- A better annotation generator. Supports multiple languages and annotation conventions.
+-- https://github.com/danymat/neogen
+return {
+  "danymat/neogen",
+  dependencies = "nvim-treesitter/nvim-treesitter",
+  version = "*",
+  cmd = "Neogen",
+  opts = {
+    snippet_engine = "luasnip",
+    languages = {
+      lua = { template = { annotation_convention = "ldoc" } },
+      typescript = { template = { annotation_convention = "tsdoc" } },
+      typescriptreact = { template = { annotation_convention = "tsdoc" } },
+    },
+  },
+  keys = {
+    { "<leader>baa", function() require("neogen").generate({ type = "current" }) end, desc = "Current" },
+    { "<leader>bac", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
+    { "<leader>baf", function() require("neogen").generate({ type = "func" }) end, desc = "Function" },
+    { "<leader>bat", function() require("neogen").generate({ type = "type" }) end, desc = "Type" },
+    { "<leader>baF", function() require("neogen").generate({ type = "file" }) end, desc = "File" },
+  },
+}

config/nvim/lua/plugins/null-ls.lua

@@ -0,0 +1,56 @@
+return {
+  "jose-elias-alvarez/null-ls.nvim",
+  config = function()
+    local null_ls = require("null-ls")
+    -- Check supported formatters and linters
+    -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting
+    -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
+
+    -- Register any number of sources simultaneously
+    null_ls.setup({
+      -- filetypes = { "markdown", "text" },
+      sources = {
+
+        -- Code Actions
+        null_ls.builtins.code_actions.eslint,
+        null_ls.builtins.code_actions.gitsigns,
+        null_ls.builtins.code_actions.refactoring,
+        null_ls.builtins.code_actions.shellcheck,
+
+        -- Diagnostics
+        null_ls.builtins.diagnostics.actionlint,
+        null_ls.builtins.diagnostics.alex,
+        null_ls.builtins.diagnostics.ansiblelint,
+        null_ls.builtins.diagnostics.dotenv_linter,
+        null_ls.builtins.diagnostics.editorconfig_checker,
+        null_ls.builtins.diagnostics.eslint,
+        null_ls.builtins.diagnostics.jsonlint,
+        null_ls.builtins.diagnostics.luacheck,
+        null_ls.builtins.diagnostics.php,
+        null_ls.builtins.diagnostics.phpcs,
+        null_ls.builtins.diagnostics.phpstan,
+        null_ls.builtins.diagnostics.psalm,
+        null_ls.builtins.diagnostics.semgrep,
+        null_ls.builtins.diagnostics.shellcheck,
+        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.write_good,
+        null_ls.builtins.diagnostics.zsh,
+
+        -- Formatting
+        null_ls.builtins.formatting.clang_format,
+        null_ls.builtins.formatting.fixjson,
+        null_ls.builtins.formatting.isort,
+        null_ls.builtins.formatting.jq,
+        null_ls.builtins.formatting.phpcsfixer,
+        null_ls.builtins.formatting.prettier,
+        null_ls.builtins.formatting.rome,
+        null_ls.builtins.formatting.shfmt.with({
+          args = { "-i", "1", "-bn", "-ci", "-sr", "-kb", "-fn" },
+        }),
+      },
+    })
+  end,
+}

config/nvim/lua/plugins/nvim-dap.lua

@@ -0,0 +1,101 @@
+--
+-- Shows how to use the DAP plugin to debug your code.
+--
+-- https://github.com/mfussenegger/nvim-dap
+-- luacheck: globals vim
+return {
+  "mfussenegger/nvim-dap",
+  dependencies = {
+    -- Creates a beautiful debugger UI
+    "rcarriga/nvim-dap-ui",
+
+    -- Installs the debug adapters for you
+    "williamboman/mason.nvim",
+    "jay-babu/mason-nvim-dap.nvim",
+
+    -- Add your own debuggers here
+    "leoluz/nvim-dap-go",
+  },
+  config = function()
+    local dap = require("dap")
+    local dapui = require("dapui")
+
+    require("mason-nvim-dap").setup({
+      -- Makes a best effort to setup the various debuggers with
+      -- reasonable debug configurations
+      automatic_setup = true,
+      automatic_installation = true,
+
+      -- You can provide additional configuration to the handlers,
+      -- see mason-nvim-dap README for more information
+      -- handlers = {},
+
+      -- You'll need to check that you have the required things installed
+      -- online, please don't ask me how to install them :)
+      ensure_installed = {
+        -- Update this to ensure that you have the debuggers for the langs you want
+        "bash",
+        "delve",
+        "jq",
+        "js",
+        "lua",
+        "php",
+        "python",
+        "stylua",
+      },
+      handlers = {
+        function(config)
+          -- all sources with no handler get passed here
+
+          -- Keep original functionality
+          require("mason-nvim-dap").default_setup(config)
+        end,
+      },
+    })
+
+    local wk = require("which-key")
+    wk.register({
+      -- Basic debugging keymaps, feel free to change to your liking!
+      ["<F5>"] = { dap.continue, "Debug: Start/Continue" },
+      ["<F1>"] = { dap.step_into, "Debug: Step Into" },
+      ["<F2>"] = { dap.step_over, "Debug: Step Over" },
+      ["<F3>"] = { dap.step_out, "Debug: Step Out" },
+      ["<leader>Db"] = { dap.toggle_breakpoint, "Debug: Toggle Breakpoint" },
+      ["<leader>DB"] = {
+        function() dap.set_breakpoint(vim.fn.input("Breakpoint condition: ")) end,
+        "Debug: Set Breakpoint",
+      },
+      -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
+      ["<F7>"] = { dapui.toggle, "Debug: See last session result." },
+    }, { prefix = "", mode = "n" })
+
+    -- Dap UI setup
+    -- For more information, see |:help nvim-dap-ui|
+    dapui.setup({
+      -- Set icons to characters that are more likely to work in every terminal.
+      --    Feel free to remove or use ones that you like more! :)
+      --    Don't feel like these are good choices.
+      icons = { expanded = "▾", collapsed = "▸", current_frame = "*" },
+      controls = {
+        icons = {
+          pause = "⏸",
+          play = "▶",
+          step_into = "⏎",
+          step_over = "⏭",
+          step_out = "⏮",
+          step_back = "b",
+          run_last = "▶▶",
+          terminate = "⏹",
+          disconnect = "⏏",
+        },
+      },
+    })
+
+    dap.listeners.after.event_initialized["dapui_config"] = dapui.open
+    dap.listeners.before.event_terminated["dapui_config"] = dapui.close
+    dap.listeners.before.event_exited["dapui_config"] = dapui.close
+
+    -- Install golang specific config
+    require("dap-go").setup()
+  end,
+}

config/nvim/lua/plugins/nvim-lspconfig.lua

@@ -0,0 +1,87 @@
+-- Quickstart configs for Nvim LSP
+-- https://github.com/neovim/nvim-lspconfig
+-- luacheck: globals vim
+return {
+  -- LSP auto-complete.
+  "neovim/nvim-lspconfig",
+  dependencies = {
+    -- Automatically install LSPs to stdpath for neovim
+    { "williamboman/mason.nvim",          config = true },
+    { "williamboman/mason-lspconfig.nvim" },
+
+    -- Useful status updates for LSP
+    -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
+    -- NOTE: using tag legacy, fidget is being re-written completely
+    { "j-hui/fidget.nvim",                event = "LspAttach", tag = "legacy", opts = {} },
+
+    -- Additional lua configuration, makes nvim stuff amazing!
+    { "folke/neodev.nvim" },
+  },
+  init = function()
+    -- disable lsp watcher. Too slow on linux
+    local ok, wf = pcall(require, "vim.lsp._watchfiles")
+    if ok then
+      wf._watchfunc = function()
+        return function() end
+      end
+    end
+  end,
+  config = function()
+    -- Switch for controlling whether you want autoformatting.
+    --  Use :KickstartFormatToggle to toggle autoformatting on or off
+    local format_is_enabled = true
+    vim.api.nvim_create_user_command("KickstartFormatToggle", function()
+      format_is_enabled = not format_is_enabled
+      print("Setting autoformatting to: " .. tostring(format_is_enabled))
+    end, {})
+
+    -- Create an augroup that is used for managing our formatting autocmds.
+    --      We need one augroup per client to make sure that multiple clients
+    --      can attach to the same buffer without interfering with each other.
+    local _augroups = {}
+    local get_augroup = function(client)
+      if not _augroups[client.id] then
+        local group_name = "kickstart-lsp-format-" .. client.name
+        local id = vim.api.nvim_create_augroup(group_name, { clear = true })
+        _augroups[client.id] = id
+      end
+
+      return _augroups[client.id]
+    end
+
+    -- Whenever an LSP attaches to a buffer, we will run this function.
+    --
+    -- See `:help LspAttach` for more information about this autocmd event.
+    vim.api.nvim_create_autocmd("LspAttach", {
+      group = vim.api.nvim_create_augroup("kickstart-lsp-attach-format", { clear = true }),
+      -- This is where we attach the autoformatting for reasonable clients
+      callback = function(args)
+        local client_id = args.data.client_id
+        local client = vim.lsp.get_client_by_id(client_id)
+        local bufnr = args.buf
+
+        -- Only attach to clients that support document formatting
+        if not client.server_capabilities.documentFormattingProvider then return end
+
+        -- Tsserver usually works poorly. Sorry you work with bad languages
+        -- You can remove this line if you know what you're doing :)
+        if client.name == "tsserver" then return end
+
+        -- Create an autocmd that will run *before* we save the buffer.
+        --  Run the formatting command for the LSP that has just attached.
+        vim.api.nvim_create_autocmd("BufWritePre", {
+          group = get_augroup(client),
+          buffer = bufnr,
+          callback = function()
+            if not format_is_enabled then return end
+
+            vim.lsp.buf.format({
+              async = false,
+              filter = function(c) return c.id == client.id end,
+            })
+          end,
+        })
+      end,
+    })
+  end,
+}

config/nvim/lua/plugins/nvim-treesitter.lua

@@ -0,0 +1,102 @@
+-- Nvim Treesitter configurations and abstraction layer
+-- https://github.com/nvim-treesitter/nvim-treesitter
+-- luacheck: globals vim
+return {
+  {
+    "nvim-treesitter/nvim-treesitter",
+    build = ":TSUpdate",
+    config = function()
+      require("nvim-treesitter.configs").setup({
+        -- Install parsers synchronously (only applied to `ensure_installed`)
+        sync_install = false,
+
+        -- Automatically install missing parsers when entering buffer
+        -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
+        auto_install = true,
+
+        -- List of parsers to ignore installing (or "all")
+        ignore_install = {},
+
+        modules = {},
+
+        -- Add languages to be installed here that you want installed for treesitter
+        ensure_installed = "all",
+
+        highlight = {
+          enable = true,
+          disable = {},
+          --injections = {
+          --  python = {
+          --    docstrings: "markdown",
+          --  },
+          --}
+        },
+        indent = { enable = true },
+        incremental_selection = {
+          enable = true,
+          keymaps = {
+            init_selection = "<c-space>",
+            node_incremental = "<c-space>",
+            scope_incremental = "<c-s>",
+            node_decremental = "<M-space>",
+          },
+        },
+        textobjects = {
+          select = {
+            enable = true,
+            -- Automatically jump forward to textobj, similar to targets.vim
+            lookahead = true,
+            keymaps = {
+              -- You can use the capture groups defined in textobjects.scm
+              ["aa"] = "@parameter.outer",
+              ["ia"] = "@parameter.inner",
+              ["af"] = "@function.outer",
+              ["if"] = "@function.inner",
+              ["ac"] = "@class.outer",
+              ["ic"] = "@class.inner",
+            },
+          },
+          move = {
+            enable = true,
+            -- whether to set jumps in the jumplist
+            set_jumps = true,
+            goto_next_start = {
+              ["]m"] = "@function.outer",
+              ["]]"] = "@class.outer",
+            },
+            goto_next_end = {
+              ["]M"] = "@function.outer",
+              ["]["] = "@class.outer",
+            },
+            goto_previous_start = {
+              ["[m"] = "@function.outer",
+              ["[["] = "@class.outer",
+            },
+            goto_previous_end = {
+              ["[M"] = "@function.outer",
+              ["[]"] = "@class.outer",
+            },
+          },
+          swap = {
+            enable = true,
+            swap_next = {
+              ["<leader>a"] = "@parameter.inner",
+            },
+            swap_previous = {
+              ["<leader>A"] = "@parameter.inner",
+            },
+          },
+        },
+      })
+    end,
+  },
+  {
+    "nvim-treesitter/nvim-treesitter-context",
+    lazy = false,
+    enabled = true,
+    opts = {
+      enable = true,
+      mode = "cursor", -- cursor, or topline
+    },
+  },
+}

config/nvim/lua/plugins/refactoring-nvim.lua

@@ -0,0 +1,100 @@
+return {
+  "ThePrimeagen/refactoring.nvim",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-treesitter/nvim-treesitter",
+  },
+  cmd = { "Refactor" },
+  opts = {},
+  keys = {
+    {
+      "<leader>re",
+      [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function')<CR>]],
+      { silent = true, expr = false },
+      mode = {
+        "v",
+        "x",
+      },
+      desc = "Extract Function",
+    },
+    {
+      "<leader>rf",
+      [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]],
+      { silent = true, expr = false },
+      mode = {
+        "v",
+        "x",
+      },
+      desc = "Extract Function To File",
+    },
+    {
+      "<leader>rv",
+      [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]],
+      { silent = true, expr = false },
+      mode = {
+        "v",
+        "x",
+      },
+      desc = "Extract Variable",
+    },
+    {
+      "<leader>ri",
+      [[ <Esc><Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]],
+      { silent = true, expr = false },
+      mode = {
+        "n",
+        "v",
+        "x",
+      },
+      desc = "Inline Variable",
+    },
+    {
+      "<leader>rb",
+      function() require("refactoring").refactor("Extract Block") end,
+      { silent = true, expr = false },
+      mode = {
+        "n",
+      },
+      desc = "Extract Block",
+    },
+    {
+      "<leader>rbf",
+      function() require("refactoring").refactor("Extract Block To File") end,
+      { silent = true, expr = false },
+      mode = {
+        "n",
+      },
+      desc = "Extract Block To File",
+    },
+    {
+      "<leader>rr",
+      function() require("refactoring").select_refactor() end,
+      { silent = true, expr = false },
+      desc = "Select Refactor",
+    },
+    {
+      "<leader>rp",
+      function() require("refactoring").debug.printf({ below = false }) end,
+      mode = { "n" },
+      desc = "Debug: Print Function",
+    },
+    {
+      "<leader>rd",
+      function() require("refactoring").debug.print_var({ normal = true, below = false }) end,
+      mode = { "n" },
+      desc = "Debug: Print Variable",
+    },
+    {
+      "<leader>rd",
+      function() require("refactoring").debug.print_var({ below = false }) end,
+      mode = { "v" },
+      desc = "Debug: Print Variable",
+    },
+    {
+      "<leader>rc",
+      function() require("refactoring").debug.cleanup({}) end,
+      mode = { "n" },
+      desc = "Debug: Clean Up",
+    },
+  },
+}

config/nvim/lua/plugins/telescope-nvim.lua

@@ -0,0 +1,155 @@
+-- Telescope, a see-all-through file manager.
+-- vim: ts=2 sw=2 si et
+-- luacheck: globals vim
+return {
+  "nvim-telescope/telescope.nvim",
+  dependencies = {
+    { "nvim-lua/plenary.nvim" },
+    { "nvim-lua/popup.nvim" },
+    -- Fuzzy Finder Algorithm which requires local dependencies to be built.
+    -- Only load if `make` is available. Make sure you have the system
+    -- requirements installed.
+    {
+      "nvim-telescope/telescope-fzf-native.nvim",
+      -- NOTE: If you are having trouble with this installation,
+      --       refer to the README for telescope-fzf-native for more instructions.
+      build = "make",
+      cond = function() return vim.fn.executable("make") == 1 end,
+    },
+    { "nvim-telescope/telescope-file-browser.nvim" },
+  },
+  config = function()
+    local actions = require("telescope.actions")
+    local sorters = require("telescope.sorters")
+    local previewers = require("telescope.previewers")
+
+    require("telescope").setup({
+      defaults = {
+        mappings = {
+          i = {
+            ["<ESC>"] = actions.close,
+            ["<C-u>"] = false,
+            ["<C-d>"] = false,
+          },
+        },
+        vimgrep_arguments = {
+          "rg",
+          "-L",
+          "--color=never",
+          "--no-heading",
+          "--with-filename",
+          "--line-number",
+          "--column",
+          "--smart-case",
+        },
+
+        prompt_prefix = "   ",
+        selection_caret = "  ",
+        entry_prefix = "  ",
+        initial_mode = "insert",
+        selection_strategy = "reset",
+        sorting_strategy = "ascending",
+        layout_strategy = "horizontal",
+        layout_config = {
+          horizontal = {
+            prompt_position = "top",
+            preview_width = 0.55,
+            results_width = 0.8,
+          },
+          vertical = {
+            mirror = false,
+          },
+          width = 0.87,
+          height = 0.80,
+          preview_cutoff = 120,
+        },
+        file_sorter = sorters.get_fuzzy_file,
+        file_ignore_patterns = { "node_modules", "dotbot" },
+        generic_sorter = sorters.get_generic_fuzzy_sorter,
+        path_display = { "truncate" },
+        winblend = 0,
+        border = {},
+        borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
+        color_devicons = true,
+        use_less = true,
+        set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil,
+        file_previewer = previewers.vim_buffer_cat.new,
+        grep_previewer = previewers.vim_buffer_vimgrep.new,
+        qflist_previewer = previewers.vim_buffer_qflist.new,
+        -- Developer configurations: Not meant for general override
+        buffer_previewer_maker = previewers.buffer_previewer_maker,
+      },
+      pickers = {
+        buffers = {
+          mappings = {
+            i = {
+              ["<c-d>"] = actions.delete_buffer + actions.move_to_top,
+            },
+          },
+        },
+      },
+
+      extensions_list = { "themes", "terms" },
+    })
+
+    pcall(require("telescope").load_extension, "fzf")
+    pcall(require("telescope").load_extension, "file_browser")
+    pcall(require("telescope").load_extension, "harpoon")
+
+    -- See `:help telescope.builtin`
+    local tbi = require("telescope.builtin")
+    local wk = require("which-key")
+    wk.register({
+      ["?"] = {
+        function() tbi.oldfiles() end,
+        "[?] Find recently opened files",
+      },
+      ["<space>"] = {
+        function() tbi.buffers() end,
+        "[ ] Find existing buffers",
+      },
+      ["/"] = {
+        function()
+          -- You can pass additional configuration to telescope to change theme, layout, etc.
+          tbi.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({
+            winblend = 10,
+            previewer = false,
+          }))
+        end,
+        "[/] Fuzzily search in current buffer",
+      },
+
+      t = {
+        b = {
+          "<cmd>Telescope file_browser<CR>",
+          "[T]elescope: File [B]rowser",
+        },
+        d = {
+          function() tbi.diagnostics() end,
+          "[T]elescope: Search [D]iagnostics",
+        },
+
+        f = {
+          function() tbi.find_files() end,
+          "[T]elescope: Search [F]iles",
+        },
+        g = {
+          function() tbi.git_files() end,
+          "[T]elescope: Search [G]it files",
+        },
+        h = {
+          function() tbi.help_tags() end,
+          "[T]elescope: Search [H]elp",
+        },
+        r = {
+          function() tbi.live_grep() end,
+          "[T]elescope: Search by G[r]ep",
+        },
+        w = {
+          function() tbi.grep_string() end,
+          "[T]elescope: Search current [W]ord",
+        },
+      },
+    }, { prefix = "<leader>" })
+  end,
+}

config/nvim/lua/plugins/trouble.lua

@@ -0,0 +1,92 @@
+-- A pretty diagnostics, references, telescope results,
+-- quickfix and location list to help you solve all
+-- the trouble your code is causing.
+-- https://github.com/folke/trouble.nvim
+return {
+  "folke/trouble.nvim",
+  dependencies = "kyazdani42/nvim-web-devicons",
+  config = {
+    -- position of the list can be: bottom, top, left, right
+    position = "bottom",
+    -- height of the trouble list when position is top or bottom
+    height = 6,
+    -- width of the list when position is left or right
+    width = 50,
+    -- use devicons for filenames
+    icons = true,
+    -- "workspace_diagnostics", "document_diagnostics",
+    -- "quickfix", "lsp_references", "loclist"
+    mode = "workspace_diagnostics",
+    -- icon used for open folds
+    fold_open = "",
+    -- icon used for closed folds
+    fold_closed = "",
+    -- group results by file
+    group = true,
+    -- add an extra new line on top of the list
+    padding = true,
+    -- key mappings for actions in the trouble list
+    action_keys = {
+      -- map to {} to remove a mapping, for example:
+      -- close = {},
+
+      -- close the list
+      close = "q",
+      -- cancel the preview and get back to your last window / buffer / cursor
+      cancel = "<esc>",
+      -- manually refresh
+      refresh = "r",
+      -- jump to the diagnostic or open / close folds
+      jump = { "<cr>", "<tab>" },
+      -- open buffer in new split
+      open_split = { "<c-x>" },
+      -- open buffer in new vsplit
+      open_vsplit = { "<c-v>" },
+      -- open buffer in new tab
+      open_tab = { "<c-t>" },
+      -- jump to the diagnostic and close the list
+      jump_close = { "o" },
+      -- toggle between "workspace" and "document" diagnostics mode
+      toggle_mode = "m",
+      -- toggle auto_preview
+      toggle_preview = "P",
+      -- opens a small popup with the full multiline message
+      hover = "K",
+      -- preview the diagnostic location
+      preview = "p",
+      -- close all folds
+      close_folds = { "zM", "zm" },
+      -- open all folds
+      open_folds = { "zR", "zr" },
+      -- toggle fold of current file
+      toggle_fold = { "zA", "za" },
+      -- preview item
+      previous = "k",
+      -- next item
+      next = "j",
+    },
+    -- add an indent guide below the fold icons
+    indent_lines = true,
+    -- automatically open the list when you have diagnostics
+    auto_open = false,
+    -- automatically close the list when you have no diagnostics
+    auto_close = true,
+    -- automatically preview the location of the diagnostic.
+    -- <esc> to close preview and go back to last window
+    auto_preview = true,
+    -- automatically fold a file trouble list at creation
+    auto_fold = false,
+    -- for the given modes, automatically jump if there is only a single result
+    auto_jump = { "lsp_definitions" },
+    signs = {
+      -- icons / text used for a diagnostic
+      error = "",
+      warning = "",
+      hint = "",
+      information = "",
+      other = "﫠",
+    },
+    -- enabling this will use the signs defined in your lsp client
+    use_diagnostic_signs = false,
+  },
+}

config/nvim/lua/plugins/twilight.lua

@@ -0,0 +1,33 @@
+-- Twilight dims inactive portions of the
+-- code you're editing using TreeSitter
+-- https://github.com/folke/twilight.nvim
+return {
+  "folke/twilight.nvim",
+  config = {
+    dimming = {
+      -- amount of dimming
+      alpha = 0.2,
+      -- when true, other windows will be fully dimmed (unless they contain the same buffer)
+      inactive = false,
+    },
+    -- amount of lines we will try to show around the current line
+    context = 3,
+    -- use treesitter when available for the filetype
+    -- treesitter is used to automatically expand the visible text,
+    -- but you can further control the types of nodes that should always be fully expanded
+
+    treesitter = true,
+
+    -- for treesitter, we we always try to expand to the top-most ancestor with these types
+    expand = {
+      "function",
+      "while_statement",
+      "for_statement",
+      "switch_statement",
+      "method",
+      "table",
+      "if_statement",
+    },
+    exclude = {}, -- exclude these filetypes
+  },
+}

config/nvim/lua/plugins/wilder.lua

@@ -0,0 +1,32 @@
+-- A more adventurous wildmenu
+-- https://github.com/gelguy/wilder.nvim
+
+return {
+  'gelguy/wilder.nvim',
+  config = function()
+    local wilder = require('wilder')
+    wilder.setup({ modes = { ':', '/', '?' } })
+
+    local gradient = {
+      '#f4468f', '#fd4a85', '#ff507a', '#ff566f', '#ff5e63',
+      '#ff6658', '#ff704e', '#ff7a45', '#ff843d', '#ff9036',
+      '#f89b31', '#efa72f', '#e6b32e', '#dcbe30', '#d2c934',
+      '#c8d43a', '#bfde43', '#b6e84e', '#aff05b'
+    }
+
+    for i, fg in ipairs(gradient) do
+      gradient[i] = wilder.make_hl('WilderGradient' .. i, 'Pmenu', { { a = 1 }, { a = 1 }, { foreground = fg } })
+    end
+
+    wilder.set_option('renderer', wilder.popupmenu_renderer({
+      highlights = {
+        -- must be set
+        -- selected_gradient key can be set to apply gradient highlighting for the selected candidate.
+        gradient = gradient,
+      },
+      highlighter = wilder.highlighter_with_gradient({
+        wilder.basic_highlighter(), -- or wilder.lua_fzy_highlighter(),
+      }),
+    }))
+  end,
+}

config/nvim/spell/en.utf-8.add

@@ -0,0 +1,3 @@
+Plugins
+lua
+plugins

config/nvm/default-packages

@@ -4,5 +4,4 @@ editorconfig-checker
 github-release-notes
 neovim
 stylelint-lsp
-tldr
 

config/starship.toml

@@ -1,21 +1,58 @@
 # 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
+format = """
+$os\
+$directory\
+$git_branch\
+$git_state\
+$git_status\
+$fill\
+$battery\
+$username\
+$hostname\
+$aws\
+$gcloud\
+$conda\
+$golang\
+$nodejs\
+$php\
+$python\
+$package\
+$line_break\
+$character"""
 
 # Timeout for commands executed by starship (in milliseconds).
-command_timeout = 1000
+# 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'
+[character]
+success_symbol = "[→](bold green)"
+error_symbol   = "[→](red)"
+vimcmd_symbol  = "[←](green)"
+
+[aws]
+symbol = "  "
+format = '[$symbol($profile )(\($region\) )(\[$duration\] )]($style)'
 
 [cmd_duration]
 disabled = true
 
+[directory]
+read_only = " 󰌾"
+style = "blue"
+
+[docker_context]
+symbol = " "
+
+[fill]
+symbol = '·'
+style = 'bold black'
+
+[gcloud]
+format = ' [($symbol)$account(@$domain)(\($region\))]($style) '
+
 [git_branch]
-symbol = '🌱 '
+symbol = " "
 truncation_length = 20
 truncation_symbol = '…'
 ignore_branches = ['master', 'main']
@@ -24,7 +61,74 @@ ignore_branches = ['master', 'main']
 up_to_date = '✓'
 staged = '[++\($count\)](green)'
 
+[git_state]
+format = '\([$state( $progress_current/$progress_total)]($style)\) '
+style = "bright-black"
+
+[git_metrics]
+added_style = 'bold blue'
+format = '[+$added]($added_style)/[-$deleted]($deleted_style) '
+disabled = false
+
+[golang]
+symbol = " "
+
+[hostname]
+ssh_symbol = " "
+
+[nodejs]
+symbol = " "
+format = '[$symbol($version )]($style)'
+version_format = '${major}.${minor}'
+
+[os]
+format = "[$symbol]($style) "
+style = "bold blue"
+disabled = false
+
+[os.symbols]
+Alpaquita = " "
+Alpine = " "
+Amazon = " "
+Android = " "
+Arch = " "
+Artix = " "
+CentOS = " "
+Debian = " "
+DragonFly = " "
+Emscripten = " "
+EndeavourOS = " "
+Fedora = " "
+FreeBSD = " "
+Garuda = "󰛓 "
+Gentoo = " "
+HardenedBSD = "󰞌 "
+Illumos = "󰈸 "
+Linux = " "
+Mabox = " "
+Macos = " "
+Manjaro = " "
+Mariner = " "
+MidnightBSD = " "
+Mint = " "
+NetBSD = " "
+NixOS = " "
+OpenBSD = "󰈺 "
+openSUSE = " "
+OracleLinux = "󰌷 "
+Pop = " "
+Raspbian = " "
+Redhat = " "
+RedHatEnterprise = " "
+Redox = "󰀘 "
+Solus = "󰠳 "
+SUSE = " "
+Ubuntu = " "
+Unknown = " "
+Windows = "󰍲 "
+
 [package]
+symbol = "󰏗 "
 format = '[$symbol($version )]($style)'
 version_format = '${major}.${minor}'
 
@@ -32,6 +136,8 @@ version_format = '${major}.${minor}'
 format = '[$symbol($version )]($style)'
 version_format = '${major}.${minor}'
 
-[nodejs]
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'
+[python]
+symbol = " "
+format = "[$virtualenv]($style) "
+style = "bright-black"
+

config/task/taskrc

@@ -42,3 +42,41 @@ data.location=$XDG_DATA_HOME/task/
 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/tealdeer/config.toml

@@ -0,0 +1,38 @@
+[style.description]
+underline = false
+bold = false
+italic = false
+
+[style.command_name]
+foreground = "cyan"
+underline = false
+bold = false
+italic = false
+
+[style.example_text]
+foreground = "green"
+underline = false
+bold = false
+italic = false
+
+[style.example_code]
+foreground = "cyan"
+underline = false
+bold = false
+italic = false
+
+[style.example_variable]
+foreground = "cyan"
+underline = true
+bold = false
+italic = false
+
+[display]
+compact = false
+use_pager = false
+
+[updates]
+auto_update = false
+auto_update_interval_hours = 720
+
+[directories]