feat(nvim): Switched from brew nvim to bob-nvim

dotbot v1.20.1

.commitlintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@ivuorinen/commitlint-config"]
+}

.editorconfig

@@ -19,11 +19,11 @@ indent_size = 1
 indent_size = 1
 indent_style = tab
 
-[{local/bin/*,**/*.sh,**/zshrc}]
+[{local/bin/*,**/*.sh,**/zshrc,config/*}]
 shell_variant      = bash # --language-variant
 binary_next_line   = true
 switch_case_indent = true # --case-indent
 space_redirects    = true
-keep_padding       = true
+keep_padding       = false
 function_next_line = true # --func-next-line
 

.eslintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@ivuorinen"]
+}

.gitattributes

@@ -13,7 +13,7 @@
 ##   Handle line endings automatically for files detected as
 ##   text and leave all files detected as binary untouched.
 ##   This will handle all files NOT defined below.
-*                 text=auto
+*                 text=auto oel=lf
 
 # Source code
 *.bash            text eol=lf

.github/README.md

@@ -23,20 +23,14 @@ fork or download the repo as a zip and go from there with your own configs.
 
 ## 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)
+![screenshot of tmux with nvim editing this repo](./screenshots/tmux-nvim.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. |
@@ -45,7 +39,7 @@ fork or download the repo as a zip and go from there with your own configs.
 ### dotfile folders
 
 | Repo      | Destination | Description                                 |
-|-----------|-------------|---------------------------------------------|
+| --------- | ----------- | ------------------------------------------- |
 | `base/`   | `.*`        | `$HOME` level files.                        |
 | `config/` | `.config/`  | Configurations for applications.            |
 | `local/`  | `.local/`   | XDG Base folder: `bin`, `share` and `state` |
@@ -62,7 +56,7 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
 ### 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                       |
@@ -79,7 +73,7 @@ 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.
+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.
@@ -87,7 +81,7 @@ 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.
+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.
@@ -95,13 +89,13 @@ 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.
+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
+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:

.github/dependabot.yml

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

.github/renovate.json

@@ -1,6 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "local>ivuorinen/.github:renovate-config"
-  ]
+  "extends": ["local>ivuorinen/.github:renovate-config"]
 }

.github/tag-changelog-config.js

@@ -7,20 +7,21 @@ module.exports = {
     { types: ['build', 'ci'], label: '🏗️ Build System' },
     { types: ['refactor'], label: '🪚 Refactors' },
     { types: ['doc', 'docs'], label: '📚 Documentation Changes' },
+    { types: ['config'], label: '🪛 Configuration Changes' },
     { types: ['test', 'tests'], label: '🔍 Tests' },
-    { types: ['style', 'codestyle'], label: '💅 Code Style Changes' },
-    { types: ['chore', 'Chore'], label: '🧹 Chores' },
+    { types: ['style', 'codestyle', 'lint'], label: '💅 Code Style Changes' },
+    { types: ['chore', 'Chore', 'deps', 'Deps'], label: '🧹 Chores' },
     { types: ['other', 'Other'], label: 'Other Changes' },
   ],
 
   excludeTypes: [],
 
   renderTypeSection: function (label, commits) {
-    let text = `\n## ${ label }\n\n`
+    let text = `\n## ${label}\n\n`
 
-    commits.forEach((commit) => {
-      const scope = commit.scope ? `**${ commit.scope }:** ` : ''
-      text += `- ${ scope }${ commit.subject }\n`
+    commits.forEach(commit => {
+      const scope = commit.scope ? `**${commit.scope}:** ` : ''
+      text += `- ${scope}${commit.subject}\n`
     })
 
     return text
@@ -28,8 +29,8 @@ module.exports = {
 
   renderChangelog: function (release, changes) {
     const now = new Date()
-    const d = now.toISOString().substring(0, 10);
-    const header = `# ${ release } - ${ d }\n`;
+    const d = now.toISOString().substring(0, 10)
+    const header = `# ${release} - ${d}\n`
     return header + changes + '\n\n'
   },
 }

.github/workflows/changelog.yml

@@ -12,7 +12,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config_file: .github/tag-changelog-config.js
-      - name: "Echo results"
+      - name: 'Echo results'
         id: output-changelog
         run: |
           echo "${{ steps.changelog.outputs.changes }}"

.github/workflows/new-release.yml

@@ -2,7 +2,7 @@ name: Release Daily State # Workflow name displayed on GitHub
 on:
   workflow_dispatch: # Trigger manually
   schedule:
-    - cron: "30 20 * * *" # UTC is 2-3 hours behind Europe/Helsinki, my timezone
+    - cron: '30 20 * * *' # UTC is 2-3 hours behind Europe/Helsinki, my timezone
 permissions:
   contents: write
 jobs:

.github/workflows/update-submodules.yml

@@ -1,6 +1,6 @@
 name: Update submodules
 on:
-  schedule: [{cron: 0 3 * * *}]
+  schedule: [{ cron: 0 3 * * * }]
   workflow_dispatch:
 permissions:
   contents: write

.gitignore

@@ -13,4 +13,6 @@ ssh/local.d/*
 !ssh/local.d/.gitkeep
 !.gitkeep
 .env
+local/share/fonts/NerdFonts
+node_modules
 

.gitmodules

@@ -44,3 +44,15 @@
 [submodule "tmux/tmux-yank"]
 	path = config/tmux/plugins/tmux-yank
 	url = https://github.com/tmux-plugins/tmux-yank.git
+[submodule "tmux/tmux-window-name"]
+	path = config/tmux/plugins/tmux-window-name
+	url = https://github.com/ofirgall/tmux-window-name.git
+[submodule "dotbot-crontab"]
+	path = tools/dotbot-crontab
+	url = https://github.com/codekansas/dotbot-crontab.git
+[submodule "dotbot-snap"]
+	path = tools/dotbot-snap
+	url = https://github.com/DrDynamic/dotbot-snap.git
+[submodule "dotbot-pip"]
+	path = tools/dotbot-pip
+	url = https://github.com/sobolevn/dotbot-pip.git

.ignore

@@ -3,4 +3,4 @@ config/cheat/cheatsheets/community/**
 tools/dotbot/**
 tools/dotbot-brew/**
 tools/dotbot-include/**
-
+node_modules

.markdownlint.json

@@ -1,5 +1,5 @@
 {
-  "extends": "markdownlint/style/prettier",
+  "extends": "@ivuorinen/markdownlint-config",
   "code-block-style": {
     "style": "fenced"
   },

.markdownlintignore

@@ -0,0 +1,6 @@
+# only care about files that are under our control
+config/cheat/cheatsheets/community/*
+config/tmux/plugins/*
+tools/*
+node_modules/*
+

.prettierignore

@@ -0,0 +1,8 @@
+.mypy_cache/*
+tools/dotbot*
+local/bin/antigen.zsh
+config/cheat/cheatsheets/community
+config/tmux/plugins/*
+lazy-lock.json
+Brewfile.lock.json
+

.prettierrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  ...require('@ivuorinen/prettier-config'),
+  trailingComma: 'all',
+  // Add custom options below:
+  overrides: [
+    {
+      files: '*.md',
+      options: {
+        printWidth: 120,
+        proseWrap: 'preserve',
+      },
+    },
+  ],
+}

.yamlfmt

@@ -1,24 +0,0 @@
-formatter:
-  type: basic
-  indent: 2
-  retain_line_breaks: false
-  disallow_anchors: false
-  max_line_length: 0
-  scan_folded_as_literal: false
-  indentless_arrays: false
-
-doublestar: true
-
-extensions:
-  - yaml
-  - yml
-
-include:
-  - ./*.{yml,yaml}
-  - ./**/*.{yml,yaml}
-
-exclude:
-  - ./tools/dotbot/**
-  - ./tools/dotbot-*/**
-  - ./config/astronvim/**
-  - ./config/nvim/**

.yamlignore

@@ -1,2 +0,0 @@
-# .yamlignore
-

add-submodules.sh

@@ -1,9 +1,22 @@
 #!/usr/bin/env bash
 
-git submodule add --name dotbot -f https://github.com/anishathalye/dotbot.git tools/dotbot
-git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew
-git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include
-git submodule add --name cheat-community -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
+# dotbot and plugins
+git submodule add --name dotbot \
+  -f https://github.com/anishathalye/dotbot.git tools/dotbot
+git submodule add --name dotbot-brew \
+  -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew
+git submodule add --name dotbot-include \
+  -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include
+git submodule add --name dotbot-crontab \
+  -f https://github.com/codekansas/dotbot-crontab.git tools/dotbot-crontab
+git submodule add --name dotbot-snap \
+  -f https://github.com/DrDynamic/dotbot-snap.git tools/dotbot-snap
+git submodule add --name dotbot-pip \
+  -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip
+
+# other repos
+git submodule add --name cheat-community \
+  -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
 
 # tmux plugin manager and plugins
 git submodule add --name tmux/tpm \
@@ -20,5 +33,7 @@ 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-window-name \
+  -f https://github.com/ofirgall/tmux-window-name.git config/tmux/plugins/tmux-window-name
 git submodule add --name tmux/tmux-yank \
   -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank

base/bashrc

@@ -3,23 +3,34 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
+export DOTFILES_SHARED_LOADED=""
+# shellcheck source=scripts/shared.sh
+source "$DOTFILES/scripts/shared.sh"
 
 # 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
     HOST="$(hostname -s)"
-    # Load the shell dotfiles, and then some:
-    for file in $DOTFILES/config/{exports,alias,functions}; do
-        [ -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
+    # 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;
+ssh-add -A 2> /dev/null
 
 # shellcheck source=../config/fzf/fzf.bash
 [ -f "${DOTFILES}/config/fzf/fzf.bash" ] \

base/zshrc

@@ -3,6 +3,7 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
+export DOTFILES_SHARED_LOADED=""
 # shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
 
@@ -30,39 +31,69 @@ function x-load-configs()
 }
 x-load-configs
 
-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}"
+if type brew &> /dev/null; then
+  FPATH="$HOMEBREW_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
-have antigen && {
-  antigen use oh-my-zsh
+antigen use oh-my-zsh
 
-  # config/functions
-  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
 
-  antigen apply
-}
+export NVM_DIR="$XDG_CONFIG_HOME/nvm"
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+
+# z, the zsh version
+export ZSHZ_DATA="$XDG_STATE_HOME/z"
+antigen bundle z
+
+# these should be always available
+antigen bundle tmux
+antigen bundle colored-man-pages
+antigen bundle command-not-found
+antigen bundle ssh-agent
+antigen bundle jreese/zsh-titles
+antigen bundle unixorn/autoupdate-antigen.zshplugin
+antigen bundle zsh-users/zsh-completions
+
+# prettier history search
+antigen bundle zsh-history-substring-search
+bindkey "${terminfo[kcuu1]}" history-substring-search-up
+bindkey "${terminfo[kcud1]}" history-substring-search-down
+bindkey -M vicmd 'k' history-substring-search-up
+bindkey -M vicmd 'j' history-substring-search-down
+
+# these should be available if there's need
+have brew && antigen bundle brew
+have php && antigen bundle php
+have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
+
+# nvm is a strange beast
+zstyle ':omz:plugins:nvm' autoload yes
+antigen bundle nvm
+# antigen bundle "$DOTFILES/config/zsh/plugins/nvm-auto-use"
+
+# nice to have stuff
+antigen bundle gcloud
+
+# this needs to be the last item
+antigen bundle zsh-users/zsh-syntax-highlighting
+antigen apply
 
 # shellcheck source=../config/fzf/fzf.zsh
 [ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
@@ -70,4 +101,3 @@ have antigen && {
 
 # Start starship
 eval "$(starship init zsh)"
-

config/alacritty/alacritty.yml

@@ -1,3 +1,4 @@
+---
 # Configuration for Alacritty, the GPU enhanced terminal emulator
 
 # Any items in the `env` entry below will be added as
@@ -16,6 +17,7 @@ env:
 # Window dimensions in character columns and lines
 # (changes require restart)
 window:
+  dynamic_title: true
   dimensions:
     columns: 130
     lines: 40
@@ -29,7 +31,7 @@ window:
 
   decorations: buttonless
 
-  opacity: 0.85
+  opacity: 0.97
 
 # When true, bold text is drawn using the bright variant of colors.
 draw_bold_text_with_bright_colors: true
@@ -38,19 +40,19 @@ draw_bold_text_with_bright_colors: true
 font:
   # The normal (roman) font face to use.
   normal:
-    family: JetBrainsMono Nerd Font
+    family: JetBrainsMonoNL Nerd Font Mono
     # Style can be specified to pick a specific face.
-    # style: Regular
+    style: ExtraLight
 
     # The bold font face
   bold:
-    family: JetBrainsMono Nerd Font
+    family: JetBrainsMonoNL Nerd Font Mono
     # Style can be specified to pick a specific face.
     style: Bold
 
   # The italic font face
   italic:
-    family: JetBrainsMono Nerd Font
+    family: JetBrainsMonoNL Nerd Font Mono
     # Style can be specified to pick a specific face.
     style: Italic
 
@@ -76,82 +78,82 @@ debug.render_timer: false
 # https://github.com/catppuccin/alacritty
 colors:
   primary:
-    background: "#1E1E2E" # base
-    foreground: "#CDD6F4" # text
+    background: '#1E1E2E' # base
+    foreground: '#CDD6F4' # text
     # Bright and dim foreground colors
-    dim_foreground: "#CDD6F4" # text
-    bright_foreground: "#CDD6F4" # text
+    dim_foreground: '#CDD6F4' # text
+    bright_foreground: '#CDD6F4' # text
 
   # Cursor colors
   cursor:
-    text: "#1E1E2E" # base
-    cursor: "#F5E0DC" # rosewater
+    text: '#1E1E2E' # base
+    cursor: '#F5E0DC' # rosewater
   vi_mode_cursor:
-    text: "#1E1E2E" # base
-    cursor: "#B4BEFE" # lavender
+    text: '#1E1E2E' # base
+    cursor: '#B4BEFE' # lavender
 
   # Search colors
   search:
     matches:
-      foreground: "#1E1E2E" # base
-      background: "#A6ADC8" # subtext0
+      foreground: '#1E1E2E' # base
+      background: '#A6ADC8' # subtext0
     focused_match:
-      foreground: "#1E1E2E" # base
-      background: "#A6E3A1" # green
+      foreground: '#1E1E2E' # base
+      background: '#A6E3A1' # green
     footer_bar:
-      foreground: "#1E1E2E" # base
-      background: "#A6ADC8" # subtext0
+      foreground: '#1E1E2E' # base
+      background: '#A6ADC8' # subtext0
 
   # Keyboard regex hints
   hints:
     start:
-      foreground: "#1E1E2E" # base
-      background: "#F9E2AF" # yellow
+      foreground: '#1E1E2E' # base
+      background: '#F9E2AF' # yellow
     end:
-      foreground: "#1E1E2E" # base
-      background: "#A6ADC8" # subtext0
+      foreground: '#1E1E2E' # base
+      background: '#A6ADC8' # subtext0
 
   # Selection colors
   selection:
-    text: "#1E1E2E" # base
-    background: "#F5E0DC" # rosewater
+    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
+    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
+    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
+    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" }
+    - { index: 16, color: '#FAB387' }
+    - { index: 17, color: '#F5E0DC' }
 
 # Visual Bell
 #
@@ -260,7 +262,7 @@ key_bindings:
   - { key: F10, chars: "\e[21~" }
   - { key: F11, chars: "\e[23~" }
   - { key: F12, chars: "\e[24~" }
-  - { key: Back, chars: "" }
+  - { key: Back, chars: '' }
   - { key: Back, mods: Alt, chars: "\e" }
   - { key: Insert, chars: "\e[2~" }
   - { key: Delete, chars: "\e[3~" }
@@ -298,7 +300,6 @@ mouse:
 
 selection:
   semantic_escape_chars: ',│`|:"'' ()[]{}<>'
-
 # Shell
 #
 # You can set shell.program to the path of your favorite shell, e.g. /bin/fish.

config/alias

@@ -8,7 +8,7 @@ function x-set-php-aliases
 {
   have brew && {
     local php_versions=()
-    while IFS="" read -r line; do php_versions+=("$line"); done < <(brew list | grep '^php')
+    while IFS="" read -r line; do php_versions+=("$line"); done < <(brew_installed | grep '^php')
 
     php_error_reporting='-d error_reporting=22527'
 
@@ -55,6 +55,60 @@ if [[ $(uname) == 'Darwin' ]]; then
   alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
 fi
 
+# Be nice
+alias please="sudo "
+
+# Color the grep output
+alias grep='grep --color'
+
+! have eza && alias ls='ls --color=auto'
+have eza && {
+  alias ls='eza -h -s=type --git --icons --group-directories-first'
+}
+
+# Easier navigation: .., ..., ....
+alias ..="cd .."
+alias ...="cd ../.."
+alias ....="cd ../../.."
+
+# cd to git root directory
+alias cdgr='cd "$(git root)"'
+
+# Shortcuts for listing
+alias ll="ls -la"
+alias l="ls -a"
+
+# Prevent common typos
+alias cd..="cd .."
+alias sl="ls"
+
+# List only directories
+alias lsd="ls -lF | grep '^d'"
+
+# IP addresses
+alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
+alias localip="ipconfig getifaddr en1"
+alias ips="ifconfig -a | grep -o 'inet6\? \(\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)\|[a-fA-F0-9:]\+\)' | sed -e 's/inet6* //'"
+
+# Show/hide hidden files in Finder
+alias show="defaults write com.apple.finder AppleShowAllFiles -bool true; killall Finder"
+alias hide="defaults write com.apple.finder AppleShowAllFiles -bool false; killall Finder"
+
+# Pipe public key to clipboard.
+alias pubkey="more ~/.ssh/id_rsa.pub | pbcopy | echo '=> Public key copied to pasteboard.'"
+
+# Flush Directory Service cache
+alias flush="dscacheutil -flushcache"
+
+# Update locatedb
+alias updatedb="sudo /usr/libexec/locate.updatedb"
+
+# Always return full history
+alias history="history 1"
+
+alias pip="pip3 "
+alias python="python3 "
+
 # tmux: automatically attach or create session with name 'main'
 alias tmux='tmux new-session -A -s main'
 # tmux: attach or create new session
@@ -64,6 +118,10 @@ alias ta='tmux attach || tmux'
 alias watchx='watch -dpbc'
 # delete .DS_Store files
 alias zapds='find . -name ".DS_Store" -print -delete'
+# Recursively delete `.pyc` files
+alias zappyc="find . -type f -name '*.pyc' -ls -delete"
+# Run all zaps
+alias zapall="zapds && zappyc"
 # tail with follow flag on
 alias t='tail -f'
 # directory usage, return only the total

config/cheat/conf.yml

@@ -6,7 +6,7 @@ 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"
+style: 'catppuccin'
 # Which 'chroma' "formatter" should be applied?
 # One of: "terminal", "terminal256", "terminal16m"
 formatter: terminal256
@@ -74,7 +74,6 @@ cheatpaths:
     path: ~/.dotfiles/config/cheat/cheatsheets/tldr
     tags: [tldr]
     readonly: true
-
 # While it requires no configuration here, it's also worth noting that
 # cheat will automatically append directories named '.cheat' within the
 # current working directory to the 'cheatpath'. This can be very useful if

config/exports

@@ -23,11 +23,6 @@ have brew && eval "$(brew shellenv)"
 path_append "/usr/local/bin"
 path_append "$XDG_BIN_HOME"
 
-# brew, https://brew.sh
-have brew && {
-  have_brew python && path_append "$(brew --prefix python)/bin"
-}
-
 source "$DOTFILES/config/exports-shell"
 source "$DOTFILES/config/exports-apps"
 

config/exports-apps

@@ -3,6 +3,7 @@
 # shellcheck enable=external-sources
 # shellcheck disable=1091,2139
 # vim: filetype=zsh
+
 export DOTFILES="$HOME/.dotfiles"
 source "$DOTFILES/scripts/shared.sh"
 
@@ -17,10 +18,8 @@ export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
 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 && {
-  x-dc "$ANSIBLE_HOME"
-  x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
-}
+x-dc "$ANSIBLE_HOME"
+x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
 
 export ANDROID_HOME="$XDG_DATA_HOME/android"
 
@@ -29,29 +28,18 @@ 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 PATH="$COMPOSER_BIN:$PATH"
-}
+path_append "$COMPOSER_BIN"
 
 # docker, https://docs.docker.com/engine/reference/commandline/cli/
 export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
-have docker && {
-  x-dc "$DOCKER_CONFIG"
-  # Docker: Disable snyk ad
-  export DOCKER_SCAN_SUGGEST=false
-}
+x-dc "$DOCKER_CONFIG"
+# Docker: Disable snyk ad
+export DOCKER_SCAN_SUGGEST=false
 
 # ffmpeg
 export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
 have ffmpeg && x-dc "$FFMPEG_DATADIR"
 
-# gcloud
-have gcloud && {
-  GCLOUD_LOC=$(gcloud info --format="value(installation.sdk_root)" --quiet)
-  [[ -f "$GCLOUD_LOC/path.zsh.inc" ]] && builtin source "$GCLOUD_LOC/path.zsh.inc"
-  [[ -f "$GCLOUD_LOC/completion.zsh.inc" ]] && builtin source "$GCLOUD_LOC/completion.zsh.inc"
-}
-
 # GnuPG
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 
@@ -71,17 +59,7 @@ have irssi && {
 export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
 export NB_DIR="$XDG_STATE_HOME/nb"
 
-# nvm, the node version manager
-export NVM_LAZY_LOAD=true
-export NVM_COMPLETION=true
-export NVM_AUTO_USE=true
-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
+# NPM: Add npm packages to path
 have node && {
   NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
   path_append "$NVM_NODE_BIN_DIR"
@@ -100,8 +78,7 @@ have op && {
 export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
 export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
 have pyenv && {
-  path_append "$(pyenv root)/shims"
-  path_append "$PYENV_ROOT/bin"
+  path_append "$PYENV_ROOT/shims"
   eval "$(pyenv init -)"
 }
 
@@ -115,10 +92,11 @@ 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 gem && path_append "${GEM_HOME}/bin"
 have rbenv && eval "$(rbenv init - zsh)"
 
 # Rust / cargo
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 path_append "$CARGO_HOME/bin"
 
@@ -138,10 +116,6 @@ export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
 export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
 x-dc "$WAKATIME_HOME"
 
-# z, https://github.com/rupa/z
-export _Z_DATA="$XDG_STATE_HOME/z"
-[[ -f "$XDG_BIN_HOME/z/z.sh" ]] && source "$XDG_BIN_HOME/z/z.sh"
-
 # Misc
 export BAT_THEME="ansi"
 export CHEAT_USE_FZF=true

config/exports-lakka

@@ -0,0 +1,7 @@
+# lakka exports
+
+## LUA
+have luarocks && $(luarocks path --bin)
+
+path_append "$HOME/.local/go/bin"
+

config/exports-shell

@@ -2,6 +2,7 @@
 # shellcheck shell=bash
 # shellcheck disable=1091,2046
 # vim: filetype=zsh
+
 export DOTFILES="$HOME/.dotfiles"
 source "$DOTFILES/scripts/shared.sh"
 
@@ -23,9 +24,16 @@ export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
 # And include the parameter for ZSH
 export HISTORY_IGNORE="(ls|cd|cd -|pwd|exit|date|* --help)"
 
+# Less history location
+export LESSHISTFILE="$XDG_STATE_HOME"/less/history
+
 # Highlight section titles in manual pages
 export LESS_TERMCAP_md="$ORANGE"
 
+# zsh autoloaded terminfo
+export TERMINFO="$XDG_DATA_HOME"/terminfo
+export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo
+
 # Don’t clear the screen after quitting a manual page
 export MANPAGER="less -X"
 
@@ -46,6 +54,10 @@ have dircolors && eval $(dircolors "$XDG_CONFIG_HOME/dircolors")
 
 # If we are using zsh, color our dir lists and such
 if [ "$SHELL" = "$(which zsh)" ]; then
+  autoload -U colors zsh/terminfo compinit
+  colors
+  compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+
   x-dc "$XDG_CACHE_HOME/zsh"
   x-dc "$XDG_STATE_HOME/zsh"
   export HISTFILE="$XDG_STATE_HOME/zsh/history"

config/functions

@@ -6,6 +6,20 @@
 export DOTFILES="$HOME/.dotfiles"
 source "$DOTFILES/scripts/shared.sh"
 
+# Alacritty preexec hook to update dynamic title
+preexec()
+{
+  print -Pn "\e]0;$1%~\a"
+}
+
+# Update dotfiles
+dfu()
+{
+  (
+    cd "$DOTFILES" && git pull --ff-only && ./install -q
+  )
+}
+
 # Weather in Tampere, or other city
 weather()
 {
@@ -57,35 +71,3 @@ scheduler()
     sleep 60
   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 jreese/zsh-titles
-  antigen bundle unixorn/autoupdate-antigen.zshplugin
-  antigen bundle zsh-users/zsh-completions
-  antigen bundle zsh-users/zsh-syntax-highlighting
-
-  # these should be available if there's need
-  have brew && antigen bundle brew
-  # 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/gh-changelog/config.yaml

@@ -0,0 +1,19 @@
+check_for_updates: true
+excluded_labels:
+  - maintenance
+  - dependencies
+file_name: CHANGELOG.md
+logger: spinner
+no_color: false
+sections:
+  added:
+    - feature
+    - enhancement
+  changed:
+    - backwards-incompatible
+  fixed:
+    - bug
+    - bugfix
+    - documentation
+show_unreleased: true
+skip_entries_without_label: false

config/gh-dash/config.yml

@@ -0,0 +1,54 @@
+prSections:
+  - title: My Pull Requests
+    filters: is:open author:@me
+  - title: Needs My Review
+    filters: is:open review-requested:@me
+  - title: Involved
+    filters: is:open involves:@me -author:@me
+issuesSections:
+  - title: My Issues
+    filters: is:open author:@me
+  - title: Assigned
+    filters: is:open assignee:@me
+  - title: Involved
+    filters: is:open involves:@me -author:@me
+defaults:
+  preview:
+    open: true
+    width: 50
+  prsLimit: 20
+  issuesLimit: 20
+  view: prs
+  layout:
+    prs:
+      updatedAt:
+        width: 7
+      repo:
+        width: 15
+      author:
+        width: 15
+      assignees:
+        width: 20
+        hidden: true
+      base:
+        width: 15
+        hidden: true
+      lines:
+        width: 16
+    issues:
+      updatedAt:
+        width: 7
+      repo:
+        width: 15
+      creator:
+        width: 10
+      assignees:
+        width: 20
+        hidden: true
+  refetchIntervalMinutes: 30
+keybindings:
+  issues: []
+  prs: []
+repoPaths: {}
+pager:
+  diff: ''

config/gh/hosts.yml

@@ -0,0 +1,3 @@
+github.com:
+  user: ivuorinen
+  git_protocol: https

config/git/config

@@ -5,3 +5,9 @@
   name = Ismo Vuorinen
   email = ismo@ivuorinen.net
 
+[github]
+  user = ivuorinen
+
+[include]
+  path = ~/.config/git/overrides/config
+

config/git/overrides/.gitignore

@@ -0,0 +1,2 @@
+!.gitkeep
+config

config/homebrew/Brewfile

@@ -18,8 +18,6 @@ tap "xwmx/taps"
 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
@@ -68,6 +66,8 @@ brew "awscli"
 brew "bash"
 # Clone of cat(1) with syntax highlighting and Git integration
 brew "bat"
+# C/C++ and Java libraries for Unicode and globalization
+brew "icu4c"
 # Yet another cross-platform graphical process/system monitor
 brew "bottom"
 # Switch Apache / Valet / CLI configs between PHP versions
@@ -102,8 +102,14 @@ brew "dnsmasq"
 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"
+# OpenType text shaping engine
+brew "harfbuzz"
+# Development kit for the Java programming language
+brew "openjdk"
 # Run arbitrary commands when files change
 brew "entr"
 # Perl lib for reading and writing EXIF metadata
@@ -152,10 +158,6 @@ brew "gpgme"
 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
@@ -198,8 +200,6 @@ brew "m-cli"
 brew "mas"
 # 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
@@ -210,8 +210,6 @@ brew "nvm"
 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
@@ -278,6 +276,8 @@ brew "virtualenv"
 brew "wakatime-cli"
 # Executes a program periodically, showing output fullscreen
 brew "watch"
+# Watch files and take action when they change
+brew "watchman"
 # Internet file retriever
 brew "wget"
 # Personal information dashboard for your terminal
@@ -314,8 +314,10 @@ brew "shivammathur/php/php@7.4"
 brew "shivammathur/php/php@8.0"
 # Ookla Speedtest
 brew "teamookla/speedtest/speedtest"
-# Command-line helper for the 1Password password manager
+# Command-line interface for 1Password
 cask "1password-cli"
+# GPU-accelerated terminal emulator
+cask "alacritty"
 # Turn audio CDs and files into audiobooks
 cask "audiobook-builder"
 # Text editor
@@ -414,6 +416,7 @@ mas "Keynote", id: 409183694
 mas "LastPass", id: 926036361
 mas "Numbers", id: 409203825
 mas "Pages", id: 409201541
+mas "Pixelmator Pro", id: 1289583905
 mas "Tailscale", id: 1475387142
 mas "Xcode", id: 497799835
 vscode "akamud.vscode-theme-onelight"
@@ -435,6 +438,7 @@ vscode "esbenp.prettier-vscode"
 vscode "formulahendry.auto-close-tag"
 vscode "formulahendry.auto-rename-tag"
 vscode "formulahendry.code-runner"
+vscode "foxundermoon.shell-format"
 vscode "gencer.html-slim-scss-css-class-completion"
 vscode "github.vscode-github-actions"
 vscode "GitHub.vscode-pull-request-github"
@@ -473,6 +477,7 @@ vscode "phiter.phpstorm-snippets"
 vscode "sibiraj-s.vscode-scss-formatter"
 vscode "SonarSource.sonarlint-vscode"
 vscode "stylelint.vscode-stylelint"
+vscode "sumneko.lua"
 vscode "syler.sass-indented"
 vscode "timonwong.shellcheck"
 vscode "tootone.org-mode"
@@ -481,6 +486,7 @@ vscode "Vue.volar"
 vscode "Vue.vscode-typescript-vue-plugin"
 vscode "WakaTime.vscode-wakatime"
 vscode "wix.vscode-import-cost"
+vscode "XadillaX.viml"
 vscode "xdebug.php-debug"
 vscode "xdebug.php-pack"
 vscode "yinfei.luahelper"

config/iterm2/iterm2-config.json

@@ -1,417 +1,410 @@
 {
-  "Badge Text" : "",
-  "Working Directory" : "\/Users\/ivuorinen\/Code",
-  "Prompt Before Closing 2" : false,
-  "Selected Text Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 1,
-    "Green Component" : 0.83921568627450982
+  "Badge Text": "",
+  "Working Directory": "/Users/ivuorinen/Code",
+  "Prompt Before Closing 2": false,
+  "Selected Text Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 1,
+    "Green Component": 0.83921568627450982
   },
-  "Rows" : 25,
-  "Ansi 11 Color" : {
-    "Red Component" : 0.97647058823529409,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.68627450980392157,
-    "Alpha Component" : 1,
-    "Green Component" : 0.88627450980392153
+  "Rows": 25,
+  "Ansi 11 Color": {
+    "Red Component": 0.97647058823529409,
+    "Color Space": "sRGB",
+    "Blue Component": 0.68627450980392157,
+    "Alpha Component": 1,
+    "Green Component": 0.88627450980392153
   },
-  "Use Italic Font" : true,
-  "Foreground Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 1,
-    "Green Component" : 0.83921568627450982
+  "Use Italic Font": true,
+  "Foreground Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 1,
+    "Green Component": 0.83921568627450982
   },
-  "Right Option Key Sends" : 0,
-  "Character Encoding" : 4,
-  "Selection Color" : {
-    "Red Component" : 0.34509803921568627,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.4392156862745098,
-    "Alpha Component" : 1,
-    "Green Component" : 0.35686274509803922
+  "Right Option Key Sends": 0,
+  "Character Encoding": 4,
+  "Selection Color": {
+    "Red Component": 0.34509803921568627,
+    "Color Space": "sRGB",
+    "Blue Component": 0.4392156862745098,
+    "Alpha Component": 1,
+    "Green Component": 0.35686274509803922
   },
-  "Blend" : 0.24709154211956524,
-  "Mouse Reporting" : true,
-  "Cursor Boost" : 0,
-  "Ansi 4 Color" : {
-    "Red Component" : 0.53725490196078429,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.98039215686274506,
-    "Alpha Component" : 1,
-    "Green Component" : 0.70588235294117652
+  "Blend": 0.24709154211956524,
+  "Mouse Reporting": true,
+  "Cursor Boost": 0,
+  "Ansi 4 Color": {
+    "Red Component": 0.53725490196078429,
+    "Color Space": "sRGB",
+    "Blue Component": 0.98039215686274506,
+    "Alpha Component": 1,
+    "Green Component": 0.70588235294117652
   },
-  "Non-ASCII Anti Aliased" : true,
-  "Sync Title" : false,
-  "Badge Font" : "JetBrainsMonoNerdFontCompleteM-Bold",
-  "Disable Window Resizing" : true,
-  "Description" : "Default",
-  "Close Sessions On End" : true,
-  "Jobs to Ignore" : [
-    "rlogin",
-    "ssh",
-    "slogin",
-    "telnet"
-  ],
-  "Scrollback Lines" : 0,
-  "Draw Powerline Glyphs" : true,
-  "Flashing Bell" : true,
-  "Cursor Guide Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 0.070000000000000007,
-    "Green Component" : 0.83921568627450982
+  "Non-ASCII Anti Aliased": true,
+  "Sync Title": false,
+  "Badge Font": "JetBrainsMonoNerdFontCompleteM-Bold",
+  "Disable Window Resizing": true,
+  "Description": "Default",
+  "Close Sessions On End": true,
+  "Jobs to Ignore": ["rlogin", "ssh", "slogin", "telnet"],
+  "Scrollback Lines": 0,
+  "Draw Powerline Glyphs": true,
+  "Flashing Bell": true,
+  "Cursor Guide Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 0.070000000000000007,
+    "Green Component": 0.83921568627450982
   },
-  "BM Growl" : true,
-  "Ansi 3 Color" : {
-    "Red Component" : 0.97647058823529409,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.68627450980392157,
-    "Alpha Component" : 1,
-    "Green Component" : 0.88627450980392153
+  "BM Growl": true,
+  "Ansi 3 Color": {
+    "Red Component": 0.97647058823529409,
+    "Color Space": "sRGB",
+    "Blue Component": 0.68627450980392157,
+    "Alpha Component": 1,
+    "Green Component": 0.88627450980392153
   },
-  "Icon" : 1,
-  "Use Non-ASCII Font" : false,
-  "Link Color" : {
-    "Red Component" : 0.53725490196078429,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.92156862745098034,
-    "Alpha Component" : 1,
-    "Green Component" : 0.86274509803921573
+  "Icon": 1,
+  "Use Non-ASCII Font": false,
+  "Link Color": {
+    "Red Component": 0.53725490196078429,
+    "Color Space": "sRGB",
+    "Blue Component": 0.92156862745098034,
+    "Alpha Component": 1,
+    "Green Component": 0.86274509803921573
   },
-  "Shortcut" : "",
-  "Background Image Location" : "",
-  "Bold Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 1,
-    "Green Component" : 0.83921568627450982
+  "Shortcut": "",
+  "Background Image Location": "",
+  "Bold Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 1,
+    "Green Component": 0.83921568627450982
   },
-  "Use Cursor Guide" : false,
-  "Unlimited Scrollback" : true,
-  "Custom Command" : "No",
-  "Title Components" : 512,
-  "Keyboard Map" : {
-    "0xf700-0x260000" : {
-      "Action" : 10,
-      "Text" : "[1;6A"
+  "Use Cursor Guide": false,
+  "Unlimited Scrollback": true,
+  "Custom Command": "No",
+  "Title Components": 512,
+  "Keyboard Map": {
+    "0xf700-0x260000": {
+      "Action": 10,
+      "Text": "[1;6A"
     },
-    "0x37-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1f"
+    "0x37-0x40000": {
+      "Action": 11,
+      "Text": "0x1f"
     },
-    "0x32-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x00"
+    "0x32-0x40000": {
+      "Action": 11,
+      "Text": "0x00"
     },
-    "0xf709-0x20000" : {
-      "Action" : 10,
-      "Text" : "[17;2~"
+    "0xf709-0x20000": {
+      "Action": 10,
+      "Text": "[17;2~"
     },
-    "0xf70c-0x20000" : {
-      "Action" : 10,
-      "Text" : "[20;2~"
+    "0xf70c-0x20000": {
+      "Action": 10,
+      "Text": "[20;2~"
     },
-    "0xf729-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2H"
+    "0xf729-0x20000": {
+      "Action": 10,
+      "Text": "[1;2H"
     },
-    "0xf72b-0x40000" : {
-      "Action" : 10,
-      "Text" : "[1;5F"
+    "0xf72b-0x40000": {
+      "Action": 10,
+      "Text": "[1;5F"
     },
-    "0xf705-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2Q"
+    "0xf705-0x20000": {
+      "Action": 10,
+      "Text": "[1;2Q"
     },
-    "0xf703-0x260000" : {
-      "Action" : 10,
-      "Text" : "[1;6C"
+    "0xf703-0x260000": {
+      "Action": 10,
+      "Text": "[1;6C"
     },
-    "0xf700-0x220000" : {
-      "Action" : 10,
-      "Text" : "[1;2A"
+    "0xf700-0x220000": {
+      "Action": 10,
+      "Text": "[1;2A"
     },
-    "0xf701-0x280000" : {
-      "Action" : 11,
-      "Text" : "0x1b 0x1b 0x5b 0x42"
+    "0xf701-0x280000": {
+      "Action": 11,
+      "Text": "0x1b 0x1b 0x5b 0x42"
     },
-    "0x38-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x7f"
+    "0x38-0x40000": {
+      "Action": 11,
+      "Text": "0x7f"
     },
-    "0x33-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1b"
+    "0x33-0x40000": {
+      "Action": 11,
+      "Text": "0x1b"
     },
-    "0xf703-0x220000" : {
-      "Action" : 10,
-      "Text" : "[1;2C"
+    "0xf703-0x220000": {
+      "Action": 10,
+      "Text": "[1;2C"
     },
-    "0xf701-0x240000" : {
-      "Action" : 10,
-      "Text" : "[1;5B"
+    "0xf701-0x240000": {
+      "Action": 10,
+      "Text": "[1;5B"
     },
-    "0xf70d-0x20000" : {
-      "Action" : 10,
-      "Text" : "[21;2~"
+    "0xf70d-0x20000": {
+      "Action": 10,
+      "Text": "[21;2~"
     },
-    "0xf702-0x260000" : {
-      "Action" : 10,
-      "Text" : "[1;6D"
+    "0xf702-0x260000": {
+      "Action": 10,
+      "Text": "[1;6D"
     },
-    "0xf729-0x40000" : {
-      "Action" : 10,
-      "Text" : "[1;5H"
+    "0xf729-0x40000": {
+      "Action": 10,
+      "Text": "[1;5H"
     },
-    "0xf706-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2R"
+    "0xf706-0x20000": {
+      "Action": 10,
+      "Text": "[1;2R"
     },
-    "0x34-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1c"
+    "0x34-0x40000": {
+      "Action": 11,
+      "Text": "0x1c"
     },
-    "0xf700-0x280000" : {
-      "Action" : 11,
-      "Text" : "0x1b 0x1b 0x5b 0x41"
+    "0xf700-0x280000": {
+      "Action": 11,
+      "Text": "0x1b 0x1b 0x5b 0x41"
     },
-    "0x2d-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1f"
+    "0x2d-0x40000": {
+      "Action": 11,
+      "Text": "0x1f"
     },
-    "0xf70e-0x20000" : {
-      "Action" : 10,
-      "Text" : "[23;2~"
+    "0xf70e-0x20000": {
+      "Action": 10,
+      "Text": "[23;2~"
     },
-    "0xf702-0x220000" : {
-      "Action" : 10,
-      "Text" : "[1;2D"
+    "0xf702-0x220000": {
+      "Action": 10,
+      "Text": "[1;2D"
     },
-    "0xf703-0x280000" : {
-      "Action" : 11,
-      "Text" : "0x1b 0x1b 0x5b 0x43"
+    "0xf703-0x280000": {
+      "Action": 11,
+      "Text": "0x1b 0x1b 0x5b 0x43"
     },
-    "0xf700-0x240000" : {
-      "Action" : 10,
-      "Text" : "[1;5A"
+    "0xf700-0x240000": {
+      "Action": 10,
+      "Text": "[1;5A"
     },
-    "0xf707-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2S"
+    "0xf707-0x20000": {
+      "Action": 10,
+      "Text": "[1;2S"
     },
-    "0xf70a-0x20000" : {
-      "Action" : 10,
-      "Text" : "[18;2~"
+    "0xf70a-0x20000": {
+      "Action": 10,
+      "Text": "[18;2~"
     },
-    "0x35-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1d"
+    "0x35-0x40000": {
+      "Action": 11,
+      "Text": "0x1d"
     },
-    "0xf70f-0x20000" : {
-      "Action" : 10,
-      "Text" : "[24;2~"
+    "0xf70f-0x20000": {
+      "Action": 10,
+      "Text": "[24;2~"
     },
-    "0xf703-0x240000" : {
-      "Action" : 10,
-      "Text" : "[1;5C"
+    "0xf703-0x240000": {
+      "Action": 10,
+      "Text": "[1;5C"
     },
-    "0xf701-0x260000" : {
-      "Action" : 10,
-      "Text" : "[1;6B"
+    "0xf701-0x260000": {
+      "Action": 10,
+      "Text": "[1;6B"
     },
-    "0xf702-0x280000" : {
-      "Action" : 11,
-      "Text" : "0x1b 0x1b 0x5b 0x44"
+    "0xf702-0x280000": {
+      "Action": 11,
+      "Text": "0x1b 0x1b 0x5b 0x44"
     },
-    "0xf72b-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2F"
+    "0xf72b-0x20000": {
+      "Action": 10,
+      "Text": "[1;2F"
     },
-    "0x36-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1e"
+    "0x36-0x40000": {
+      "Action": 11,
+      "Text": "0x1e"
     },
-    "0xf708-0x20000" : {
-      "Action" : 10,
-      "Text" : "[15;2~"
+    "0xf708-0x20000": {
+      "Action": 10,
+      "Text": "[15;2~"
     },
-    "0xf701-0x220000" : {
-      "Action" : 10,
-      "Text" : "[1;2B"
+    "0xf701-0x220000": {
+      "Action": 10,
+      "Text": "[1;2B"
     },
-    "0xf70b-0x20000" : {
-      "Action" : 10,
-      "Text" : "[19;2~"
+    "0xf70b-0x20000": {
+      "Action": 10,
+      "Text": "[19;2~"
     },
-    "0xf702-0x240000" : {
-      "Action" : 10,
-      "Text" : "[1;5D"
+    "0xf702-0x240000": {
+      "Action": 10,
+      "Text": "[1;5D"
     },
-    "0xf704-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2P"
+    "0xf704-0x20000": {
+      "Action": 10,
+      "Text": "[1;2P"
     }
   },
-  "Ansi 14 Color" : {
-    "Red Component" : 0.58039215686274515,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.83529411764705885,
-    "Alpha Component" : 1,
-    "Green Component" : 0.88627450980392153
+  "Ansi 14 Color": {
+    "Red Component": 0.58039215686274515,
+    "Color Space": "sRGB",
+    "Blue Component": 0.83529411764705885,
+    "Alpha Component": 1,
+    "Green Component": 0.88627450980392153
   },
-  "Ansi 2 Color" : {
-    "Red Component" : 0.65098039215686276,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.63137254901960782,
-    "Alpha Component" : 1,
-    "Green Component" : 0.8901960784313725
+  "Ansi 2 Color": {
+    "Red Component": 0.65098039215686276,
+    "Color Space": "sRGB",
+    "Blue Component": 0.63137254901960782,
+    "Alpha Component": 1,
+    "Green Component": 0.8901960784313725
   },
-  "Send Code When Idle" : false,
-  "ASCII Anti Aliased" : true,
-  "Tags" : [
-
-  ],
-  "Ansi 9 Color" : {
-    "Red Component" : 0.95294117647058818,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.6588235294117647,
-    "Alpha Component" : 1,
-    "Green Component" : 0.54509803921568623
+  "Send Code When Idle": false,
+  "ASCII Anti Aliased": true,
+  "Tags": [],
+  "Ansi 9 Color": {
+    "Red Component": 0.95294117647058818,
+    "Color Space": "sRGB",
+    "Blue Component": 0.6588235294117647,
+    "Alpha Component": 1,
+    "Green Component": 0.54509803921568623
   },
-  "Badge Right Margin" : 10,
-  "Use Bold Font" : true,
-  "Silence Bell" : false,
-  "Ansi 12 Color" : {
-    "Red Component" : 0.53725490196078429,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.98039215686274506,
-    "Alpha Component" : 1,
-    "Green Component" : 0.70588235294117652
+  "Badge Right Margin": 10,
+  "Use Bold Font": true,
+  "Silence Bell": false,
+  "Ansi 12 Color": {
+    "Red Component": 0.53725490196078429,
+    "Color Space": "sRGB",
+    "Blue Component": 0.98039215686274506,
+    "Alpha Component": 1,
+    "Green Component": 0.70588235294117652
   },
-  "Window Type" : 0,
-  "Use Bright Bold" : true,
-  "Cursor Text Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 1,
-    "Green Component" : 0.83921568627450982
+  "Window Type": 0,
+  "Use Bright Bold": true,
+  "Cursor Text Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 1,
+    "Green Component": 0.83921568627450982
   },
-  "Default Bookmark" : "No",
-  "Cursor Color" : {
-    "Red Component" : 0.96078431372549022,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.86274509803921573,
-    "Alpha Component" : 1,
-    "Green Component" : 0.8784313725490196
+  "Default Bookmark": "No",
+  "Cursor Color": {
+    "Red Component": 0.96078431372549022,
+    "Color Space": "sRGB",
+    "Blue Component": 0.86274509803921573,
+    "Alpha Component": 1,
+    "Green Component": 0.8784313725490196
   },
-  "Ansi 1 Color" : {
-    "Red Component" : 0.95294117647058818,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.6588235294117647,
-    "Alpha Component" : 1,
-    "Green Component" : 0.54509803921568623
+  "Ansi 1 Color": {
+    "Red Component": 0.95294117647058818,
+    "Color Space": "sRGB",
+    "Blue Component": 0.6588235294117647,
+    "Alpha Component": 1,
+    "Green Component": 0.54509803921568623
   },
-  "Name" : "Default",
-  "Blinking Cursor" : false,
-  "Guid" : "82636119-EA17-4A26-9AA7-408172F4A9C8",
-  "Badge Max Width" : 0.45000000000000001,
-  "Idle Code" : 0,
-  "Ansi 10 Color" : {
-    "Red Component" : 0.65098039215686276,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.63137254901960782,
-    "Alpha Component" : 1,
-    "Green Component" : 0.8901960784313725
+  "Name": "Default",
+  "Blinking Cursor": false,
+  "Guid": "82636119-EA17-4A26-9AA7-408172F4A9C8",
+  "Badge Max Width": 0.45000000000000001,
+  "Idle Code": 0,
+  "Ansi 10 Color": {
+    "Red Component": 0.65098039215686276,
+    "Color Space": "sRGB",
+    "Blue Component": 0.63137254901960782,
+    "Alpha Component": 1,
+    "Green Component": 0.8901960784313725
   },
-  "Ansi 8 Color" : {
-    "Red Component" : 0.34509803921568627,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.4392156862745098,
-    "Alpha Component" : 1,
-    "Green Component" : 0.35686274509803922
+  "Ansi 8 Color": {
+    "Red Component": 0.34509803921568627,
+    "Color Space": "sRGB",
+    "Blue Component": 0.4392156862745098,
+    "Alpha Component": 1,
+    "Green Component": 0.35686274509803922
   },
-  "Badge Color" : {
-    "Red Component" : 1,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0,
-    "Alpha Component" : 0.5,
-    "Green Component" : 0.14910030364990234
+  "Badge Color": {
+    "Red Component": 1,
+    "Color Space": "sRGB",
+    "Blue Component": 0,
+    "Alpha Component": 0.5,
+    "Green Component": 0.14910030364990234
   },
-  "Smart Cursor Color" : true,
-  "Ambiguous Double Width" : false,
-  "Blur Radius" : 9.5927277260638313,
-  "Badge Max Height" : 0.10000000000000001,
-  "Ansi 0 Color" : {
-    "Red Component" : 0.27058823529411763,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.35294117647058826,
-    "Alpha Component" : 1,
-    "Green Component" : 0.27843137254901962
+  "Smart Cursor Color": true,
+  "Ambiguous Double Width": false,
+  "Blur Radius": 9.5927277260638313,
+  "Badge Max Height": 0.10000000000000001,
+  "Ansi 0 Color": {
+    "Red Component": 0.27058823529411763,
+    "Color Space": "sRGB",
+    "Blue Component": 0.35294117647058826,
+    "Alpha Component": 1,
+    "Green Component": 0.27843137254901962
   },
-  "Blur" : true,
-  "Normal Font" : "JetBrainsMonoNerdFontCompleteM-Light 15",
-  "Vertical Spacing" : 1,
-  "Ansi 7 Color" : {
-    "Red Component" : 0.72941176470588232,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.87058823529411766,
-    "Alpha Component" : 1,
-    "Green Component" : 0.76078431372549016
+  "Blur": true,
+  "Normal Font": "JetBrainsMonoNerdFontCompleteM-Light 15",
+  "Vertical Spacing": 1,
+  "Ansi 7 Color": {
+    "Red Component": 0.72941176470588232,
+    "Color Space": "sRGB",
+    "Blue Component": 0.87058823529411766,
+    "Alpha Component": 1,
+    "Green Component": 0.76078431372549016
   },
-  "Command" : "",
-  "Terminal Type" : "xterm-256color",
-  "Horizontal Spacing" : 1,
-  "Option Key Sends" : 0,
-  "Only The Default BG Color Uses Transparency" : true,
-  "Minimum Contrast" : 0.14973958333333334,
-  "Ansi 15 Color" : {
-    "Red Component" : 0.65098039215686276,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.78431372549019607,
-    "Alpha Component" : 1,
-    "Green Component" : 0.67843137254901964
+  "Command": "",
+  "Terminal Type": "xterm-256color",
+  "Horizontal Spacing": 1,
+  "Option Key Sends": 0,
+  "Only The Default BG Color Uses Transparency": true,
+  "Minimum Contrast": 0.14973958333333334,
+  "Ansi 15 Color": {
+    "Red Component": 0.65098039215686276,
+    "Color Space": "sRGB",
+    "Blue Component": 0.78431372549019607,
+    "Alpha Component": 1,
+    "Green Component": 0.67843137254901964
   },
-  "Ansi 6 Color" : {
-    "Red Component" : 0.58039215686274515,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.83529411764705885,
-    "Alpha Component" : 1,
-    "Green Component" : 0.88627450980392153
+  "Ansi 6 Color": {
+    "Red Component": 0.58039215686274515,
+    "Color Space": "sRGB",
+    "Blue Component": 0.83529411764705885,
+    "Alpha Component": 1,
+    "Green Component": 0.88627450980392153
   },
-  "Badge Top Margin" : 10,
-  "Transparency" : 0.10293218085106381,
-  "Background Color" : {
-    "Red Component" : 0.11764705882352941,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.1803921568627451,
-    "Alpha Component" : 1,
-    "Green Component" : 0.11764705882352941
+  "Badge Top Margin": 10,
+  "Transparency": 0.10293218085106381,
+  "Background Color": {
+    "Red Component": 0.11764705882352941,
+    "Color Space": "sRGB",
+    "Blue Component": 0.1803921568627451,
+    "Alpha Component": 1,
+    "Green Component": 0.11764705882352941
   },
-  "Screen" : -2,
-  "Non Ascii Font" : "Monaco 12",
-  "Ansi 13 Color" : {
-    "Red Component" : 0.96078431372549022,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.90588235294117647,
-    "Alpha Component" : 1,
-    "Green Component" : 0.76078431372549016
+  "Screen": -2,
+  "Non Ascii Font": "Monaco 12",
+  "Ansi 13 Color": {
+    "Red Component": 0.96078431372549022,
+    "Color Space": "sRGB",
+    "Blue Component": 0.90588235294117647,
+    "Alpha Component": 1,
+    "Green Component": 0.76078431372549016
   },
-  "Columns" : 120,
-  "Visual Bell" : true,
-  "ASCII Ligatures" : false,
-  "Ansi 5 Color" : {
-    "Red Component" : 0.96078431372549022,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.90588235294117647,
-    "Alpha Component" : 1,
-    "Green Component" : 0.76078431372549016
+  "Columns": 120,
+  "Visual Bell": true,
+  "ASCII Ligatures": false,
+  "Ansi 5 Color": {
+    "Red Component": 0.96078431372549022,
+    "Color Space": "sRGB",
+    "Blue Component": 0.90588235294117647,
+    "Alpha Component": 1,
+    "Green Component": 0.76078431372549016
   },
-  "Custom Directory" : "Yes"
-}
+  "Custom Directory": "Yes"
+}

config/nvim/.gitignore

@@ -1 +1,8 @@
-session.vim
+tt.*
+.tests
+doc/tags
+debug
+.repro
+foo.*
+*.log
+data

config/nvim/.luarc.json

@@ -0,0 +1,5 @@
+{
+    "diagnostics.globals": [
+        "vim"
+    ]
+}

config/nvim/.neoconf.json

@@ -0,0 +1,15 @@
+{
+  "neodev": {
+    "library": {
+      "enabled": true,
+      "plugins": true
+    }
+  },
+  "neoconf": {
+    "plugins": {
+      "lua_ls": {
+        "enabled": true
+      }
+    }
+  }
+}

config/nvim/.stylua.toml

@@ -1,10 +0,0 @@
-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/README.md

@@ -0,0 +1,4 @@
+# 💤 LazyVim
+
+A starter template for [LazyVim](https://github.com/LazyVim/LazyVim).
+Refer to the [documentation](https://lazyvim.github.io/installation) to get started.

config/nvim/after/ftplugin/lua.lua

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

config/nvim/init.lua

@@ -1,31 +1,2 @@
--- 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
+-- bootstrap lazy.nvim, LazyVim and your plugins
+require("config.lazy")

config/nvim/lazy-lock.json

@@ -1,52 +1,69 @@
 {
-  "barbecue.nvim": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
+  "LazyVim": { "branch": "main", "commit": "50401d358b7be9b931b42fc3b537794920308bef" },
+  "LuaSnip": { "branch": "master", "commit": "480b032f6708573334f4437d3f83307d143f1a72" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "917083c0ab4fc328628f0a55c72415e1bd72ab13" },
+  "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" },
+  "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
   "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" },
-  "catppuccin": { "branch": "main", "commit": "a937d546f4783a1ff67f84043d2d7871ad4ecd83" },
-  "close-buffers.nvim": { "branch": "master", "commit": "3acbcad1211572342632a6c0151f839e7dead27f" },
+  "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
+  "catppuccin": { "branch": "main", "commit": "3d9a5ed556e289bce6c1fb0af89ec838360641b2" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "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" },
+  "edgy.nvim": { "branch": "main", "commit": "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4" },
+  "flash.nvim": { "branch": "main", "commit": "cc8c7e03987134997d74ee87e55a5717279f2d05" },
+  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
+  "gitsigns.nvim": { "branch": "main", "commit": "bdeba1cec3faddd89146690c10b9a87949c0ee66" },
   "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" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
+  "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
+  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" },
+  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
+  "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
+  "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" },
+  "mini.animate": { "branch": "main", "commit": "989ac014933ab5cd14ab83f2fce4b9a08ca6d81e" },
+  "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" },
+  "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
+  "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" },
+  "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" },
+  "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" },
+  "neoconf.nvim": { "branch": "main", "commit": "909179f44e94b4cb8331d46b31d3b77ca71127d5" },
+  "neodev.nvim": { "branch": "main", "commit": "67b7a5c9facd65077cc4486c73d1774d1a2ed582" },
   "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" },
+  "noice.nvim": { "branch": "main", "commit": "396f9146529130904e07c45e90ecdbfa607534f3" },
   "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-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
+  "nvim-lspconfig": { "branch": "master", "commit": "bfdf2e91e7297a54bcc09d3e092a12bff69a1cf4" },
+  "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" },
+  "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" },
   "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" },
+  "nvim-spectre": { "branch": "master", "commit": "97cfd1b0f5a6ab35979ce1bee6c17f54745fd1e5" },
+  "nvim-treesitter": { "branch": "master", "commit": "d6c9c85e14e15bc59478a0d5d810e88dad0ac53f" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "95e9ba9de4289d221666b66fd930d157c7ca08c6" },
+  "nvim-ufo": { "branch": "main", "commit": "6f2ccdf2da390d62f8f9e15fc5ddbcbd312e1e66" },
+  "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
+  "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
+  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
+  "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" },
+  "stickybuf.nvim": { "branch": "master", "commit": "e3db41f2c1bb2df3ee6ff964ee74fe991f6f9566" },
+  "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" },
+  "telescope.nvim": { "branch": "master", "commit": "84d53dfdbefbdf84e861a288abc71ef8ccafd04e" },
+  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
+  "tokyonight.nvim": { "branch": "main", "commit": "8e670218651eaf02bf61c68ecdfdaa572bc14b47" },
+  "transparent.nvim": { "branch": "main", "commit": "3af6232c8d39d51062702e875ff6407c1eeb0391" },
   "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
-  "twilight.nvim": { "branch": "main", "commit": "a4843e6e67092a1e6fa9666f02bf0ab59174c1df" },
-  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
+  "typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" },
+  "venv-selector.nvim": { "branch": "main", "commit": "14d6e866070f759e9014a8053954f835294f56f9" },
+  "vim-illuminate": { "branch": "master", "commit": "1b5d70332a51a1de05f281069851865a2bb1e6d7" },
+  "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
   "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" },
   "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
-  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }
+  "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }
 }

config/nvim/lua/autocmd.lua

@@ -1,146 +0,0 @@
-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/config/autocmds.lua

@@ -0,0 +1,3 @@
+-- Autocmds are automatically loaded on the VeryLazy event
+-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
+-- Add any additional autocmds here

config/nvim/lua/config/keymaps.lua

@@ -0,0 +1,19 @@
+-- Keymaps are automatically loaded on the VeryLazy event
+-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
+-- Add any additional keymaps here
+
+local keymap = vim.keymap.set
+
+--         ╭──────────────────────────────────────────────────────────╮
+--         │                       Comment box                        │
+--         ╰──────────────────────────────────────────────────────────╯
+local cb = require("comment-box")
+
+-- left aligned fixed size box with left aligned text
+keymap({ "n", "v" }, "<Leader>bcb", cb.lbox, { desc = "Comment: Left aligned" })
+-- centered adapted box with centered text
+keymap({ "n", "v" }, "<Leader>bcc", cb.ccbox, { desc = "Comment: Centered" })
+
+-- centered line
+keymap("n", "<Leader>bcl", cb.cline, { desc = "Comment: Centered line" })
+keymap("i", "<M-l>", cb.cline, { desc = "Comment: Centered line" })

config/nvim/lua/config/lazy.lua

@@ -0,0 +1,61 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  -- bootstrap lazy.nvim
+  -- stylua: ignore
+  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
+end
+vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
+
+require("lazy").setup({
+  spec = {
+    -- add LazyVim and import its plugins
+    {
+      "LazyVim/LazyVim",
+      import = "lazyvim.plugins",
+      opts = {
+        colorscheme = "catppuccin",
+      },
+    },
+    -- import any extras modules here
+    { import = "lazyvim.plugins.extras.formatting.prettier" },
+    { import = "lazyvim.plugins.extras.lang.docker" },
+    { import = "lazyvim.plugins.extras.lang.go" },
+    { import = "lazyvim.plugins.extras.lang.json" },
+    { import = "lazyvim.plugins.extras.lang.python" },
+    { import = "lazyvim.plugins.extras.lang.tailwind" },
+    { import = "lazyvim.plugins.extras.lang.terraform" },
+    { import = "lazyvim.plugins.extras.lang.typescript" },
+    { import = "lazyvim.plugins.extras.lang.yaml" },
+    { import = "lazyvim.plugins.extras.linting.eslint" },
+    { import = "lazyvim.plugins.extras.ui.edgy" },
+    { import = "lazyvim.plugins.extras.ui.mini-animate" },
+    -- import/override with your plugins
+    { import = "plugins" },
+  },
+  defaults = {
+    -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
+    -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
+    lazy = false,
+    -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
+    -- have outdated releases, which may break your Neovim install.
+    version = false, -- always use the latest git commit
+    -- version = "*", -- try installing the latest stable version for plugins that support semver
+  },
+  install = { colorscheme = { "catppuccin" } },
+  checker = { enabled = true }, -- automatically check for plugin updates
+  performance = {
+    rtp = {
+      -- disable some rtp plugins
+      disabled_plugins = {
+        "gzip",
+        -- "matchit",
+        -- "matchparen",
+        -- "netrwPlugin",
+        "tarPlugin",
+        "tohtml",
+        "tutor",
+        "zipPlugin",
+      },
+    },
+  },
+})

config/nvim/lua/config/options.lua

@@ -0,0 +1,12 @@
+-- Options are automatically loaded before lazy.nvim startup
+-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
+-- Add any additional options here
+
+local opt = vim.opt
+
+opt.number = true
+opt.relativenumber = true
+opt.modeline = true
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/filetype.lua

@@ -1,77 +0,0 @@
--- 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

@@ -1,222 +0,0 @@
---[[
-  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

@@ -1,199 +0,0 @@
--- 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

@@ -1,59 +0,0 @@
--- 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

@@ -1,105 +0,0 @@
--- 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

@@ -1,40 +0,0 @@
--- 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

@@ -1,92 +0,0 @@
--- 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/coding.lua

@@ -0,0 +1,91 @@
+return {
+  -- A better annotation generator. Supports multiple languages and annotation conventions.
+  -- https://github.com/danymat/neogen
+  {
+    "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",
+      },
+    },
+  },
+  -- Describe the regexp under the cursor
+  -- https://github.com/bennypowers/nvim-regexplainer
+  {
+    "bennypowers/nvim-regexplainer",
+    dependencies = {
+      "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",
+    enabled = false,
+    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-e>",
+      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/example.lua

@@ -0,0 +1,266 @@
+-- since this is just an example spec, don't actually load anything here and return an empty spec
+-- stylua: ignore
+if true then return {} end
+
+-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim
+--
+-- In your plugin files, you can:
+-- * add extra plugins
+-- * disable/enabled LazyVim plugins
+-- * override the configuration of LazyVim plugins
+return {
+  -- add gruvbox
+  { "ellisonleao/gruvbox.nvim" },
+
+  -- Configure LazyVim to load gruvbox
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "gruvbox",
+    },
+  },
+
+  -- change trouble config
+  {
+    "folke/trouble.nvim",
+    -- opts will be merged with the parent spec
+    opts = { use_diagnostic_signs = true },
+  },
+
+  -- disable trouble
+  { "folke/trouble.nvim", enabled = false },
+
+  -- add symbols-outline
+  {
+    "simrat39/symbols-outline.nvim",
+    cmd = "SymbolsOutline",
+    keys = { { "<leader>cs", "<cmd>SymbolsOutline<cr>", desc = "Symbols Outline" } },
+    config = true,
+  },
+
+  -- override nvim-cmp and add cmp-emoji
+  {
+    "hrsh7th/nvim-cmp",
+    dependencies = { "hrsh7th/cmp-emoji" },
+    ---@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      local cmp = require("cmp")
+      opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } }))
+    end,
+  },
+
+  -- change some telescope options and a keymap to browse plugin files
+  {
+    "nvim-telescope/telescope.nvim",
+    keys = {
+      -- add a keymap to browse plugin files
+      -- stylua: ignore
+      {
+        "<leader>fp",
+        function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
+        desc = "Find Plugin File",
+      },
+    },
+    -- change some options
+    opts = {
+      defaults = {
+        layout_strategy = "horizontal",
+        layout_config = { prompt_position = "top" },
+        sorting_strategy = "ascending",
+        winblend = 0,
+      },
+    },
+  },
+
+  -- add telescope-fzf-native
+  {
+    "telescope.nvim",
+    dependencies = {
+      "nvim-telescope/telescope-fzf-native.nvim",
+      build = "make",
+      config = function()
+        require("telescope").load_extension("fzf")
+      end,
+    },
+  },
+
+  -- add pyright to lspconfig
+  {
+    "neovim/nvim-lspconfig",
+    ---@class PluginLspOpts
+    opts = {
+      ---@type lspconfig.options
+      servers = {
+        -- pyright will be automatically installed with mason and loaded with lspconfig
+        pyright = {},
+      },
+    },
+  },
+
+  -- add tsserver and setup with typescript.nvim instead of lspconfig
+  {
+    "neovim/nvim-lspconfig",
+    dependencies = {
+      "jose-elias-alvarez/typescript.nvim",
+      init = function()
+        require("lazyvim.util").on_attach(function(_, buffer)
+          -- stylua: ignore
+          vim.keymap.set("n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
+          vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
+        end)
+      end,
+    },
+    ---@class PluginLspOpts
+    opts = {
+      ---@type lspconfig.options
+      servers = {
+        -- tsserver will be automatically installed with mason and loaded with lspconfig
+        tsserver = {},
+      },
+      -- you can do any additional lsp server setup here
+      -- return true if you don't want this server to be setup with lspconfig
+      ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
+      setup = {
+        -- example to setup with typescript.nvim
+        tsserver = function(_, opts)
+          require("typescript").setup({ server = opts })
+          return true
+        end,
+        -- Specify * to use this function as a fallback for any server
+        -- ["*"] = function(server, opts) end,
+      },
+    },
+  },
+
+  -- for typescript, LazyVim also includes extra specs to properly setup lspconfig,
+  -- treesitter, mason and typescript.nvim. So instead of the above, you can use:
+  { import = "lazyvim.plugins.extras.lang.typescript" },
+
+  -- add more treesitter parsers
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = {
+      ensure_installed = {
+        "bash",
+        "html",
+        "javascript",
+        "json",
+        "lua",
+        "markdown",
+        "markdown_inline",
+        "python",
+        "query",
+        "regex",
+        "tsx",
+        "typescript",
+        "vim",
+        "yaml",
+      },
+    },
+  },
+
+  -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above
+  -- would overwrite `ensure_installed` with the new value.
+  -- If you'd rather extend the default config, use the code below instead:
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      -- add tsx and treesitter
+      vim.list_extend(opts.ensure_installed, {
+        "tsx",
+        "typescript",
+      })
+    end,
+  },
+
+  -- the opts function can also be used to change the default opts:
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    opts = function(_, opts)
+      table.insert(opts.sections.lualine_x, "😄")
+    end,
+  },
+
+  -- or you can return new options to override all the defaults
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    opts = function()
+      return {
+        --[[add your custom lualine config here]]
+      }
+    end,
+  },
+
+  -- use mini.starter instead of alpha
+  { import = "lazyvim.plugins.extras.ui.mini-starter" },
+
+  -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc
+  { import = "lazyvim.plugins.extras.lang.json" },
+
+  -- add any tools you want to have installed below
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        "stylua",
+        "shellcheck",
+        "shfmt",
+        "flake8",
+      },
+    },
+  },
+
+  -- Use <tab> for completion and snippets (supertab)
+  -- first: disable default <tab> and <s-tab> behavior in LuaSnip
+  {
+    "L3MON4D3/LuaSnip",
+    keys = function()
+      return {}
+    end,
+  },
+  -- then: setup supertab in cmp
+  {
+    "hrsh7th/nvim-cmp",
+    dependencies = {
+      "hrsh7th/cmp-emoji",
+    },
+    ---@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      local has_words_before = function()
+        unpack = unpack or table.unpack
+        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+        return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+      end
+
+      local luasnip = require("luasnip")
+      local cmp = require("cmp")
+
+      opts.mapping = vim.tbl_extend("force", opts.mapping, {
+        ["<Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_next_item()
+            -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
+            -- this way you will only jump inside the snippet region
+          elseif luasnip.expand_or_jumpable() then
+            luasnip.expand_or_jump()
+          elseif has_words_before() then
+            cmp.complete()
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+        ["<S-Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_prev_item()
+          elseif luasnip.jumpable(-1) then
+            luasnip.jump(-1)
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+      })
+    end,
+  },
+}

config/nvim/lua/plugins/gitsigns.lua

@@ -1,89 +0,0 @@
--- 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/lang-php.lua

@@ -0,0 +1,47 @@
+return {
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      vim.list_extend(opts.ensure_installed, {
+        "php",
+      })
+    end,
+  },
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      vim.list_extend(opts.ensure_installed, {
+        "phpactor",
+      })
+    end,
+  },
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        phpactor = {},
+      },
+    },
+  },
+  {
+    "mfussenegger/nvim-dap",
+    optional = true,
+    dependencies = {
+      "williamboman/mason.nvim",
+      opts = function(_, opts)
+        if type(opts.ensure_installed) == "table" then
+          table.insert(opts.ensure_installed, "php-debug-adapter")
+        end
+      end,
+    },
+    opts = function()
+      local dap = require("dap")
+      local path = require("mason-registry").get_package("php-debug-adapter"):get_install_path()
+      dap.adapters.php = {
+        type = "executable",
+        command = "node",
+        args = { path .. "/extension/out/phpDebug.js" },
+      }
+    end,
+  },
+}

config/nvim/lua/plugins/lazy.lua

@@ -1,264 +0,0 @@
--- 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

@@ -1,140 +0,0 @@
-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

@@ -1,456 +0,0 @@
--- 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

@@ -1,23 +0,0 @@
--- 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

@@ -1,56 +0,0 @@
-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

@@ -1,101 +0,0 @@
---
--- 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

@@ -1,87 +1,20 @@
--- 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,
-        })
+  opts = {
+    servers = {
+      eslint = {},
+      tflint = {},
+    },
+    setup = {
+      eslint = function()
+        require("lazyvim.util").on_attach(function(client)
+          if client.name == "eslint" then
+            client.server_capabilities.documentFormattingProvider = true
+          elseif client.name == "tsserver" then
+            client.server_capabilities.documentFormattingProvider = false
+          end
+        end)
       end,
-    })
-  end,
+    },
+  },
 }

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

@@ -1,102 +0,0 @@
--- 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

@@ -1,100 +0,0 @@
-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

@@ -1,155 +0,0 @@
--- 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/tools.lua

@@ -0,0 +1,24 @@
+return {
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        "actionlint",
+        "ansible-lint",
+        "bash-language-server",
+        "commitlint",
+        "flake8",
+        "intelephense",
+        "jsonlint",
+        "luacheck",
+        "phpcs",
+        "phpmd",
+        "shellcheck",
+        "shfmt",
+        "stylelint",
+        "stylua",
+        "yamllint",
+      },
+    },
+  },
+}

config/nvim/lua/plugins/treesitter.lua

@@ -0,0 +1,23 @@
+return {
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = {
+      ensure_installed = {
+        "bash",
+        "html",
+        "javascript",
+        "json",
+        "lua",
+        "markdown",
+        "markdown_inline",
+        "python",
+        "query",
+        "regex",
+        "tsx",
+        "typescript",
+        "vim",
+        "yaml",
+      },
+    },
+  },
+}

config/nvim/lua/plugins/trouble.lua

@@ -1,92 +0,0 @@
--- 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

@@ -1,33 +0,0 @@
--- 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/ui.lua

@@ -0,0 +1,137 @@
+-- luacheck: globals vim
+return {
+  -- The theme of choise, catppuccin
+  -- https://github.com/catppuccin/nvim
+  {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    priority = 1000,
+    enabled = true,
+    config = function()
+      vim.cmd.colorscheme("catppuccin")
+    end,
+    opts = {
+      flavour = "mocha",
+    },
+  },
+  -- Remove all background colors to make nvim transparent
+  -- https://github.com/xiyaowong/transparent.nvim
+  {
+    "xiyaowong/transparent.nvim",
+    lazy = false,
+    enabled = true,
+    config = function()
+      vim.g.transparent_groups = vim.list_extend(
+        vim.g.transparent_groups or {},
+        vim.tbl_map(function(v)
+          return v.hl_group
+        end, vim.tbl_values(require("bufferline.config").highlights))
+      )
+    end,
+  },
+  -- A fancy, configurable, notification manager for NeoVim
+  -- https://github.com/rcarriga/nvim-notify
+  {
+    "rcarriga/nvim-notify",
+    opts = {
+      -- Set background color to black so transparent doesn't mess stuff up
+      background_colour = "#000000",
+    },
+  },
+  -- Not UFO in the sky, but an ultra fold in Neovim.
+  -- https://github.com/kevinhwang91/nvim-ufo/
+  {
+    "kevinhwang91/nvim-ufo",
+    lazy = false,
+    enabled = true,
+    dependencies = {
+      "kevinhwang91/promise-async",
+      { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" },
+    },
+    init = function()
+      vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
+      vim.o.foldcolumn = "1" -- '0' is not bad
+      vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
+      vim.o.foldlevelstart = 99
+      vim.o.foldenable = true
+    end,
+    opts = {
+      open_fold_hl_timeout = 150,
+      close_fold_kinds = { "imports", "comment" },
+      preview = {
+        win_config = {
+          border = { "", "─", "", "", "", "─", "", "" },
+          winhighlight = "Normal:Folded",
+          winblend = 0,
+        },
+        mappings = {
+          scrollU = "<C-u>",
+          scrollD = "<C-d>",
+          jumpTop = "[",
+          jumpBot = "]",
+        },
+      },
+      provider_selector = function(bufnr, filetype, buftype)
+        return { "treesitter", "indent" }
+      end,
+      fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
+        local newVirtText = {}
+        local suffix = (" 󰁂 %d "):format(endLnum - lnum)
+        local sufWidth = vim.fn.strdisplaywidth(suffix)
+        local targetWidth = width - sufWidth
+        local curWidth = 0
+        for _, chunk in ipairs(virtText) do
+          local chunkText = chunk[1]
+          local chunkWidth = vim.fn.strdisplaywidth(chunkText)
+          if targetWidth > curWidth + chunkWidth then
+            table.insert(newVirtText, chunk)
+          else
+            chunkText = truncate(chunkText, targetWidth - curWidth)
+            local hlGroup = chunk[2]
+            table.insert(newVirtText, { chunkText, hlGroup })
+            chunkWidth = vim.fn.strdisplaywidth(chunkText)
+            -- str width returned from truncate() may less than 2nd argument, need padding
+            if curWidth + chunkWidth < targetWidth then
+              suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
+            end
+            break
+          end
+          curWidth = curWidth + chunkWidth
+        end
+        table.insert(newVirtText, { suffix, "MoreMsg" })
+        return newVirtText
+      end,
+    },
+  },
+  -- Indent guides for Neovim
+  -- https://github.com/lukas-reineke/indent-blankline.nvim
+  { "lukas-reineke/indent-blankline.nvim" },
+  -- Git integration for buffers
+  -- https://github.com/lewis6991/gitsigns.nvim
+  { "lewis6991/gitsigns.nvim" },
+  -- Getting you where you want with the fewest keystrokes.
+  -- https://github.com/ThePrimeagen/harpoon
+  { "ThePrimeagen/harpoon" },
+  -- Close buffer without messing up with the window.
+  -- https://github.com/famiu/bufdelete.nvim
+  { "famiu/bufdelete.nvim" },
+  -- Neovim plugin for locking a buffer to a window
+  -- https://github.com/stevearc/stickybuf.nvim
+  { "stevearc/stickybuf.nvim", opts = {} },
+  -- Automatically expand width of the current window.
+  -- Maximizes and restore it. And all this with nice animations!
+  -- https://github.com/anuvyklack/windows.nvim
+  {
+    "anuvyklack/windows.nvim",
+    dependencies = {
+      "anuvyklack/middleclass",
+      "anuvyklack/animation.nvim",
+    },
+    config = function()
+      vim.o.winwidth = 15
+      vim.o.winminwidth = 10
+      vim.o.equalalways = false
+      require("windows").setup()
+    end,
+  },
+}

config/nvim/lua/plugins/wilder.lua

@@ -1,32 +0,0 @@
--- 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/stylua.toml

@@ -0,0 +1,3 @@
+indent_type = "Spaces"
+indent_width = 2
+column_width = 120

config/starship.toml

@@ -7,7 +7,7 @@ $directory\
 $git_branch\
 $git_state\
 $git_status\
-$fill\
+$fill \
 $battery\
 $username\
 $hostname\
@@ -23,7 +23,7 @@ $line_break\
 $character"""
 
 # Timeout for commands executed by starship (in milliseconds).
-# command_timeout = 1000
+command_timeout = 1500
 
 [character]
 success_symbol = "[→](bold green)"
@@ -40,19 +40,23 @@ disabled = true
 [directory]
 read_only = " 󰌾"
 style = "blue"
+before_repo_root_style = "white"
+truncation_symbol = "…/"
 
 [docker_context]
 symbol = " "
+format = '[$symbol$context]($style) '
 
 [fill]
 symbol = '·'
 style = 'bold black'
 
 [gcloud]
-format = ' [($symbol)$account(@$domain)(\($region\))]($style) '
+format = '[($symbol)$account(@$domain)(\($region\))]($style) '
 
 [git_branch]
 symbol = " "
+format = '[$symbol$branch(:$remote_branch)]($style) '
 truncation_length = 20
 truncation_symbol = '…'
 ignore_branches = ['master', 'main']
@@ -72,9 +76,15 @@ disabled = false
 
 [golang]
 symbol = " "
+format = '[$symbol($version )]($style) '
 
 [hostname]
 ssh_symbol = " "
+ssh_only = false
+format = '[$ssh_symbol](bold blue)[$hostname](bold red) '
+
+[lua]
+format = '[$symbol($version )]($style)'
 
 [nodejs]
 symbol = " "
@@ -139,5 +149,7 @@ version_format = '${major}.${minor}'
 [python]
 symbol = " "
 format = "[$virtualenv]($style) "
-style = "bright-black"
+
+[username]
+format = "[$user]($style) "
 

config/tmux/tmux.conf

@@ -67,6 +67,9 @@ bind p paste-buffer
 #  │ Settings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
 
+# Expose window title
+set-option -g set-titles on
+
 # Mouse support
 set -g mouse on
 
@@ -94,6 +97,7 @@ set -g @tpm_plugins '            \
   catppuccin/tmux                \
   tmux-plugins/tmux-continuum    \
   jaclu/tmux-menus               \
+  ofirgall/tmux-window-name      \
   tmux-plugins/tmux-resurrect    \
   tmux-plugins/tmux-sensible     \
   tmux-plugins/tmux-sessionist   \
@@ -108,6 +112,13 @@ set -g @tpm_plugins '            \
 ## https://github.com/jaclu/tmux-menus
 set -g @menus_trigger 'm'
 
+##  A plugin to name your tmux windows smartly.
+## https://github.com/ofirgall/tmux-window-name
+### Maximum name length of a window
+set -g @tmux_window_name_max_name_len "20"
+### Replace $HOME with ~ in window names
+set -g @tmux_window_name_use_tilde "True"
+
 ## https://github.com/catppuccin/tmux
 set -g @catppuccin_flavour "mocha" # latte/frappe/macchiato/mocha
 set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs
@@ -129,6 +140,7 @@ set -g @continuum-boot 'on'
 
 ## https://github.com/tmux-plugins/tmux-resurrect
 set -g @resurrect-strategy-nvim 'session'
+set -g @resurrect-dir '$HOME/.local/state/tmux/tmux-resurrect'
 
 # Finally run the tmux plugin manager
 run '~/.dotfiles/config/tmux/plugins/tpm/tpm'

config/wtf/config.yml

@@ -20,62 +20,62 @@ wtf:
     # that support ten line of text and one of four.
     rows: [10, 10, 10, 20, 10, 4]
   refreshInterval: 1
-  openFileUtil: "open"
+  openFileUtil: 'open'
   mods:
     # You can have multiple widgets of the same type.
     # The "key" is the name of the widget and the type is the actual
     # widget you want to implement.
     europe_time:
-      title: "Europe"
+      title: 'Europe'
       type: clocks
       colors:
         rows:
-          even: "lightblue"
-          odd: "white"
+          even: 'lightblue'
+          odd: 'white'
       enabled: true
       locations:
-        GMT: "Etc/GMT"
-        Amsterdam: "Europe/Amsterdam"
-        Berlin: "Europe/Berlin"
-        Barcelona: "Europe/Madrid"
-        Copenhagen: "Europe/Copenhagen"
-        London: "Europe/London"
-        Rome: "Europe/Rome"
-        Stockholm: "Europe/Stockholm"
+        GMT: 'Etc/GMT'
+        Amsterdam: 'Europe/Amsterdam'
+        Berlin: 'Europe/Berlin'
+        Barcelona: 'Europe/Madrid'
+        Copenhagen: 'Europe/Copenhagen'
+        London: 'Europe/London'
+        Rome: 'Europe/Rome'
+        Stockholm: 'Europe/Stockholm'
       position:
         top: 0
         left: 0
         height: 1
         width: 1
       refreshInterval: 15
-      sort: "alphabetical"
+      sort: 'alphabetical'
     americas_time:
-      title: "Americas"
+      title: 'Americas'
       type: clocks
       colors:
         rows:
-          even: "lightblue"
-          odd: "white"
+          even: 'lightblue'
+          odd: 'white'
       enabled: true
       locations:
-        UTC: "Etc/UTC"
-        Vancouver: "America/Vancouver"
-        New_York: "America/New_York"
-        Sao_Paulo: "America/Sao_Paulo"
-        Denver: "America/Denver"
-        Iqaluit: "America/Iqaluit"
-        Bahamas: "America/Nassau"
-        Chicago: "America/Chicago"
+        UTC: 'Etc/UTC'
+        Vancouver: 'America/Vancouver'
+        New_York: 'America/New_York'
+        Sao_Paulo: 'America/Sao_Paulo'
+        Denver: 'America/Denver'
+        Iqaluit: 'America/Iqaluit'
+        Bahamas: 'America/Nassau'
+        Chicago: 'America/Chicago'
       position:
         top: 0
         left: 1
         height: 1
         width: 1
       refreshInterval: 15
-      sort: "alphabetical"
+      sort: 'alphabetical'
     battery:
       type: power
-      title: "⚡️"
+      title: '⚡️'
       enabled: true
       position:
         top: 1
@@ -85,14 +85,14 @@ wtf:
       refreshInterval: 15
     todolist:
       type: todo
-      checkedIcon: "X"
+      checkedIcon: 'X'
       colors:
         checked: gray
         highlight:
-          fore: "black"
-          back: "orange"
+          fore: 'black'
+          back: 'orange'
       enabled: true
-      filename: "todo.yml"
+      filename: 'todo.yml'
       position:
         top: 1
         left: 0
@@ -101,10 +101,10 @@ wtf:
       refreshInterval: 3600
     ip:
       type: ipinfo
-      title: "My IP"
+      title: 'My IP'
       colors:
-        name: "lightblue"
-        value: "white"
+        name: 'lightblue'
+        value: 'white'
       enabled: true
       position:
         top: 0
@@ -114,7 +114,7 @@ wtf:
       refreshInterval: 150
     security_info:
       type: security
-      title: "Staying safe"
+      title: 'Staying safe'
       enabled: true
       position:
         top: 1
@@ -126,9 +126,9 @@ wtf:
       type: textfile
       enabled: true
       filePaths:
-        - "~/.config/wtf/config.yml"
+        - '~/.config/wtf/config.yml'
       format: true
-      formatStyle: "monokai"
+      formatStyle: 'monokai'
       position:
         top: 3
         left: 0
@@ -137,7 +137,7 @@ wtf:
       refreshInterval: 15
     news:
       type: hackernews
-      title: "HackerNews"
+      title: 'HackerNews'
       enabled: true
       numberOfStories: 10
       position:
@@ -159,7 +159,7 @@ wtf:
     uptime:
       type: cmdrunner
       args: []
-      cmd: "uptime"
+      cmd: 'uptime'
       enabled: true
       position:
         top: 5
@@ -169,8 +169,8 @@ wtf:
       refreshInterval: 30
     disks:
       type: cmdrunner
-      cmd: "df"
-      args: ["-h"]
+      cmd: 'df'
+      args: ['-h']
       enabled: true
       position:
         top: 4

docs/nvim-keybindings.md

@@ -1,6 +1,6 @@
 # nvim keybindings
 
-```md
+```
 n  !           * <Cmd>lua require("which-key").show("!", {mode = "n", auto = true})<CR>
 n  '           * <Cmd>lua require("which-key").show("'", {mode = "n", auto = true})<CR>
 n  "           * <Cmd>lua require("which-key").show("\"", {mode = "n", auto = true})<CR>

docs/tmux-keybindings.md

@@ -1,9 +1,7 @@
 # tmux keybindings
 
-
 Leader: `<ctrl><space>`
 
-
 ```
 bind-key    -T copy-mode    C-Space              send-keys -X begin-selection
 bind-key    -T copy-mode    C-a                  send-keys -X start-of-line
@@ -31,7 +29,7 @@ bind-key    -T copy-mode    P                    send-keys -X toggle-position
 bind-key    -T copy-mode    R                    send-keys -X rectangle-toggle
 bind-key    -T copy-mode    T                    command-prompt -1 -p "(jump to backward)" { send-keys -X jump-to-backward "%%" }
 bind-key    -T copy-mode    X                    send-keys -X set-mark
-bind-key    -T copy-mode    Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer -p"
+bind-key    -T copy-mode    Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
 bind-key    -T copy-mode    f                    command-prompt -1 -p "(jump forward)" { send-keys -X jump-forward "%%" }
 bind-key    -T copy-mode    g                    command-prompt -p "(goto line)" { send-keys -X goto-line "%%" }
 bind-key    -T copy-mode    n                    send-keys -X search-again
@@ -41,7 +39,7 @@ bind-key    -T copy-mode    t                    command-prompt -1 -p "(jump to
 bind-key    -T copy-mode    y                    send-keys -X copy-pipe-and-cancel pbcopy
 bind-key    -T copy-mode    MouseDown1Pane       select-pane
 bind-key    -T copy-mode    MouseDrag1Pane       select-pane \; send-keys -X begin-selection
-bind-key    -T copy-mode    MouseDragEnd1Pane    send-keys -X copy-pipe-and-cancel pbcopy
+bind-key    -T copy-mode    MouseDragEnd1Pane    send-keys -X copy-pipe-and-cancel
 bind-key    -T copy-mode    WheelUpPane          select-pane \; send-keys -X -N 5 scroll-up
 bind-key    -T copy-mode    WheelDownPane        select-pane \; send-keys -X -N 5 scroll-down
 bind-key    -T copy-mode    DoubleClick1Pane     select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
@@ -75,7 +73,7 @@ bind-key    -T copy-mode    M-r                  send-keys -X middle-line
 bind-key    -T copy-mode    M-v                  send-keys -X page-up
 bind-key    -T copy-mode    M-w                  send-keys -X copy-pipe-and-cancel
 bind-key    -T copy-mode    M-x                  send-keys -X jump-to-mark
-bind-key    -T copy-mode    M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer -p"
+bind-key    -T copy-mode    M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer"
 bind-key    -T copy-mode    "M-{"                send-keys -X previous-paragraph
 bind-key    -T copy-mode    "M-}"                send-keys -X next-paragraph
 bind-key    -T copy-mode    M-Up                 send-keys -X halfpage-up
@@ -87,16 +85,13 @@ bind-key    -T copy-mode-vi C-c                  send-keys -X cancel
 bind-key    -T copy-mode-vi C-d                  send-keys -X halfpage-down
 bind-key    -T copy-mode-vi C-e                  send-keys -X scroll-down
 bind-key    -T copy-mode-vi C-f                  send-keys -X page-down
-bind-key    -T copy-mode-vi C-h                  select-pane -L
-bind-key    -T copy-mode-vi C-j                  select-pane -D
-bind-key    -T copy-mode-vi C-k                  select-pane -U
-bind-key    -T copy-mode-vi C-l                  select-pane -R
+bind-key    -T copy-mode-vi C-h                  send-keys -X cursor-left
+bind-key    -T copy-mode-vi C-j                  send-keys -X copy-pipe-and-cancel
 bind-key    -T copy-mode-vi Enter                send-keys -X copy-pipe-and-cancel
 bind-key    -T copy-mode-vi C-u                  send-keys -X halfpage-up
 bind-key    -T copy-mode-vi C-v                  send-keys -X rectangle-toggle
 bind-key    -T copy-mode-vi C-y                  send-keys -X scroll-up
 bind-key    -T copy-mode-vi Escape               send-keys -X clear-selection
-bind-key    -T copy-mode-vi C-\                 select-pane -l
 bind-key    -T copy-mode-vi Space                send-keys -X begin-selection
 bind-key    -T copy-mode-vi !                    send-keys -X copy-pipe-and-cancel "tr -d '
 ' | pbcopy"
@@ -136,7 +131,7 @@ bind-key    -T copy-mode-vi T                    command-prompt -1 -p "(jump to
 bind-key    -T copy-mode-vi V                    send-keys -X select-line
 bind-key    -T copy-mode-vi W                    send-keys -X next-space
 bind-key    -T copy-mode-vi X                    send-keys -X set-mark
-bind-key    -T copy-mode-vi Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer -p"
+bind-key    -T copy-mode-vi Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
 bind-key    -T copy-mode-vi ^                    send-keys -X back-to-indentation
 bind-key    -T copy-mode-vi b                    send-keys -X previous-word
 bind-key    -T copy-mode-vi e                    send-keys -X next-word-end
@@ -158,7 +153,7 @@ bind-key    -T copy-mode-vi \{                   send-keys -X previous-paragraph
 bind-key    -T copy-mode-vi \}                   send-keys -X next-paragraph
 bind-key    -T copy-mode-vi MouseDown1Pane       select-pane
 bind-key    -T copy-mode-vi MouseDrag1Pane       select-pane \; send-keys -X begin-selection
-bind-key    -T copy-mode-vi MouseDragEnd1Pane    send-keys -X copy-pipe-and-cancel pbcopy
+bind-key    -T copy-mode-vi MouseDragEnd1Pane    send-keys -X copy-pipe-and-cancel
 bind-key    -T copy-mode-vi WheelUpPane          select-pane \; send-keys -X -N 5 scroll-up
 bind-key    -T copy-mode-vi WheelDownPane        select-pane \; send-keys -X -N 5 scroll-down
 bind-key    -T copy-mode-vi DoubleClick1Pane     select-pane \; send-keys -X select-word \; run-shell -d 0.3 \; send-keys -X copy-pipe-and-cancel
@@ -171,24 +166,15 @@ bind-key    -T copy-mode-vi Down                 send-keys -X cursor-down
 bind-key    -T copy-mode-vi Left                 send-keys -X cursor-left
 bind-key    -T copy-mode-vi Right                send-keys -X cursor-right
 bind-key    -T copy-mode-vi M-x                  send-keys -X jump-to-mark
-bind-key    -T copy-mode-vi M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer -p"
+bind-key    -T copy-mode-vi M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer"
 bind-key    -T copy-mode-vi C-Up                 send-keys -X scroll-up
 bind-key    -T copy-mode-vi C-Down               send-keys -X scroll-down
-bind-key    -T join-pane    \"                   run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-v'"
-bind-key    -T join-pane    \%                   run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-h'"
-bind-key    -T join-pane    -                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-v'"
-bind-key    -T join-pane    @                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-b'"
-bind-key    -T join-pane    f                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-b'"
-bind-key    -T join-pane    h                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-h'"
-bind-key    -T join-pane    v                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-v'"
-bind-key    -T join-pane    |                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-h'"
-bind-key    -T prefix       C-Space              run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/promote_window.sh '#{session_name}' '#{window_id}' '#{window_name}' '#{pane_current_path}'"
-bind-key    -T prefix       Enter                run-shell -b "/Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/notify.sh false true"
+bind-key    -T prefix       C-Space              send-prefix
 bind-key    -T prefix       C-n                  next-window
 bind-key    -T prefix       C-o                  rotate-window
 bind-key    -T prefix       C-p                  previous-window
-bind-key    -T prefix       C-r                  run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-resurrect/scripts/restore.sh
-bind-key    -T prefix       C-s                  run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-resurrect/scripts/save.sh
+bind-key    -T prefix       C-r                  run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-resurrect/scripts/restore.sh
+bind-key    -T prefix       C-s                  run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-resurrect/scripts/save.sh
 bind-key    -T prefix       C-z                  suspend-client
 bind-key    -T prefix       Escape               copy-mode
 bind-key    -T prefix       Space                next-layout
@@ -196,7 +182,7 @@ bind-key    -T prefix       !                    split-window -h -c "#{pane_curr
 bind-key    -T prefix       \"                   split-window -v -c "#{pane_current_path}"
 bind-key    -T prefix       \#                   list-buffers
 bind-key    -T prefix       \$                   command-prompt -I "#S" { rename-session "%%" }
-bind-key    -T prefix       \%                   split-window -h -c "#{pane_current_path}"
+bind-key    -T prefix       \%                   split-window -h
 bind-key    -T prefix       &                    confirm-before -p "kill-window #W? (y/n)" kill-window
 bind-key    -T prefix       \'                   command-prompt -T window-target -p index { select-window -t ":%%" }
 bind-key    -T prefix       (                    switch-client -p
@@ -221,40 +207,42 @@ bind-key    -T prefix       <                    display-menu -T "#[align=centre
 bind-key    -T prefix       =                    choose-buffer -Z
 bind-key    -T prefix       >                    display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -x P -y P "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z }
 bind-key    -T prefix       ?                    list-keys -N
-bind-key    -T prefix       @                    run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/promote_pane.sh '#{session_name}' '#{pane_id}' '#{pane_current_path}'"
-bind-key    -T prefix       C                    run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/new_session_prompt.sh
+bind-key    -T prefix       @                    run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-sessionist/scripts/promote_pane.sh '#{session_name}' '#{pane_id}' '#{pane_current_path}'"
+bind-key    -T prefix       C                    run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-sessionist/scripts/new_session_prompt.sh
 bind-key    -T prefix       D                    choose-client -Z
 bind-key    -T prefix       E                    select-layout -E
-bind-key    -T prefix       I                    run-shell /Users/ivuorinen/.config/tmux/plugins/tpm/bindings/install_plugins
+bind-key    -T prefix       I                    run-shell $HOME/.dotfiles/config/tmux/plugins/tpm/bindings/install_plugins
 bind-key    -T prefix       L                    switch-client -l
-bind-key    -T prefix       M                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/cancel.sh
+bind-key    -T prefix       M                    select-pane -M
 bind-key    -T prefix       N                    new-window
-bind-key    -T prefix       R                    run-shell " 			tmux source-file /Users/ivuorinen/.config/tmux/tmux.conf > /dev/null; 			tmux display-message 'Sourced /Users/ivuorinen/.config/tmux/tmux.conf!'"
+bind-key    -T prefix       R                    run-shell " \
+			tmux source-file ~/.tmux.conf > /dev/null; \
+			tmux display-message \"Sourced .tmux.conf!\""
 bind-key    -T prefix       S                    switch-client -l
-bind-key    -T prefix       U                    run-shell /Users/ivuorinen/.config/tmux/plugins/tpm/bindings/update_plugins
-bind-key    -T prefix       X                    run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/kill_session_prompt.sh '#{session_name}' '#{session_id}'"
-bind-key    -T prefix       Y                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-yank/scripts/copy_pane_pwd.sh
+bind-key    -T prefix       U                    run-shell $HOME/.dotfiles/config/tmux/plugins/tpm/bindings/update_plugins
+bind-key    -T prefix       X                    run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-sessionist/scripts/kill_session_prompt.sh '#{session_name}' '#{session_id}'"
+bind-key    -T prefix       Y                    run-shell -b $HOME/.dotfiles/config/tmux/plugins/tmux-yank/scripts/copy_pane_pwd.sh
 bind-key    -T prefix       ]                    paste-buffer -p
 bind-key    -T prefix       c                    new-window
 bind-key    -T prefix       d                    detach-client
 bind-key    -T prefix       f                    command-prompt { find-window -Z "%%" }
-bind-key    -T prefix       g                    run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/goto_session.sh
+bind-key    -T prefix       g                    run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-sessionist/scripts/goto_session.sh
 bind-key    -T prefix       h                    select-pane -L
 bind-key    -T prefix       i                    display-message
 bind-key    -T prefix       j                    select-pane -D
 bind-key    -T prefix       k                    select-pane -U
-bind-key    -T prefix       l                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-fzf/main.sh
-bind-key    -T prefix       m                    run-shell /Users/ivuorinen/.config/tmux/plugins/tmux-menus/items/main.sh
+bind-key    -T prefix       l                    select-pane -R
+bind-key    -T prefix       m                    run-shell $HOME/.dotfiles/config/tmux/plugins/tmux-menus/items/main.sh
 bind-key    -T prefix       n                    next-window
 bind-key    -T prefix       o                    select-pane -t :.+
 bind-key    -T prefix       p                    paste-buffer
 bind-key    -T prefix       q                    display-panes
-bind-key    -T prefix       r                    source-file /Users/ivuorinen/.dotfiles/config/tmux/tmux.conf \; display-message "tmux cfg reloaded!"
+bind-key    -T prefix       r                    source-file $HOME/.dotfiles/config/tmux/tmux.conf \; display-message "tmux cfg reloaded!"
 bind-key    -T prefix       s                    choose-tree -Zs
-bind-key    -T prefix       t                    run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh 'join-pane' '-b'"
+bind-key    -T prefix       t                    clock-mode
 bind-key    -T prefix       w                    choose-tree -Zw
-bind-key    -T prefix       x                    run-shell "tmux split-window -l 10 \"/Users/ivuorinen/.config/tmux/plugins/tmux-1password/scripts/main.sh '#{pane_id}'\""
-bind-key    -T prefix       y                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-yank/scripts/copy_line.sh
+bind-key    -T prefix       x                    confirm-before -p "kill-pane #P? (y/n)" kill-pane
+bind-key    -T prefix       y                    run-shell -b $HOME/.dotfiles/config/tmux/plugins/tmux-yank/scripts/copy_line.sh
 bind-key    -T prefix       z                    resize-pane -Z
 bind-key    -T prefix       \{                   swap-pane -U
 bind-key    -T prefix       \}                   swap-pane -D
@@ -265,17 +253,16 @@ bind-key -r -T prefix       Up                   select-pane -U
 bind-key -r -T prefix       Down                 select-pane -D
 bind-key -r -T prefix       Left                 select-pane -L
 bind-key -r -T prefix       Right                select-pane -R
-bind-key    -T prefix       M-Enter              run-shell -b "/Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/notify.sh true true"
 bind-key    -T prefix       M-1                  select-layout even-horizontal
 bind-key    -T prefix       M-2                  select-layout even-vertical
 bind-key    -T prefix       M-3                  select-layout main-horizontal
 bind-key    -T prefix       M-4                  select-layout main-vertical
 bind-key    -T prefix       M-5                  select-layout tiled
-bind-key    -T prefix       M-m                  run-shell -b "/Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/notify.sh true"
+bind-key    -T prefix       M-c                  attach-session -c "#{pane_current_path}"
 bind-key    -T prefix       M-n                  next-window -a
 bind-key    -T prefix       M-o                  rotate-window -D
 bind-key    -T prefix       M-p                  previous-window -a
-bind-key    -T prefix       M-u                  run-shell /Users/ivuorinen/.config/tmux/plugins/tpm/bindings/clean_plugins
+bind-key    -T prefix       M-u                  run-shell $HOME/.dotfiles/config/tmux/plugins/tpm/bindings/clean_plugins
 bind-key -r -T prefix       M-Up                 resize-pane -U 5
 bind-key -r -T prefix       M-Down               resize-pane -D 5
 bind-key -r -T prefix       M-Left               resize-pane -L 5
@@ -288,11 +275,6 @@ bind-key -r -T prefix       S-Up                 refresh-client -U 10
 bind-key -r -T prefix       S-Down               refresh-client -D 10
 bind-key -r -T prefix       S-Left               refresh-client -L 10
 bind-key -r -T prefix       S-Right              refresh-client -R 10
-bind-key    -T root         C-h                  if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(\S+\/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-h" "select-pane -L"
-bind-key    -T root         C-j                  if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(\S+\/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-j" "select-pane -D"
-bind-key    -T root         C-k                  if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(\S+\/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-k" "select-pane -U"
-bind-key    -T root         C-l                  if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(\S+\/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-l" "select-pane -R"
-bind-key    -T root         C-\                 if-shell "ps -o state= -o comm= -t '#{pane_tty}'     | grep -iqE '^[^TXZ ]+ +(S+/)?g?(view|l?n?vim?x?)(diff)?$'" "send-keys C-\\" "select-pane -l"
 bind-key    -T root         MouseDown1Pane       select-pane -t = \; send-keys -M
 bind-key    -T root         MouseDown1Status     select-window -t =
 bind-key    -T root         MouseDown2Pane       select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { paste-buffer -p }
@@ -306,16 +288,11 @@ bind-key    -T root         WheelUpStatus        previous-window
 bind-key    -T root         WheelDownStatus      next-window
 bind-key    -T root         DoubleClick1Pane     select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -H ; send-keys -X select-word ; run-shell -d 0.3 ; send-keys -X copy-pipe-and-cancel }
 bind-key    -T root         TripleClick1Pane     select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -H ; send-keys -X select-line ; run-shell -d 0.3 ; send-keys -X copy-pipe-and-cancel }
-bind-key    -T root         F12                  run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-suspend/scripts/suspend.sh \"\" \"   @mode_indicator_custom_prompt:: ---- ,   @mode_indicator_custom_mode_style::bg=brightblack\,fg=black, \""
-bind-key    -T root         M-H                  previous-window
-bind-key    -T root         M-L                  next-window
 bind-key    -T root         M-MouseDown3Pane     display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -t = -x M -y M "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z }
 bind-key    -T root         M-Up                 select-pane -U
 bind-key    -T root         M-Down               select-pane -D
 bind-key    -T root         M-Left               select-pane -L
 bind-key    -T root         M-Right              select-pane -R
-bind-key    -T root         S-Left               previous-window
-bind-key    -T root         S-Right              next-window
-bind-key    -T suspended    F12                  run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-suspend/scripts/resume.sh \"\""
+bind-key    -T root         C-Tab                previous-window
+bind-key    -T root         C-S-Tab              next-window
 ```
-

hosts/air/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring air"
 - brewfile:
@@ -8,7 +8,7 @@
       force: true
       glob: true
       path: hosts/air/base/**
-      prefix: "."
+      prefix: '.'
     ~/.config/:
       glob: true
       force: true

hosts/lakka/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring lakka"
 - link:
@@ -6,7 +6,7 @@
       force: true
       glob: true
       path: hosts/lakka/base/**
-      prefix: "."
+      prefix: '.'
     ~/.config/:
       glob: true
       force: true

hosts/tunkki/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring tunkki"
 - link:
@@ -6,8 +6,11 @@
       force: true
       glob: true
       path: hosts/tunkki/base/**
-      prefix: "."
+      prefix: '.'
     ~/.config/:
       glob: true
       force: true
       path: hosts/tunkki/config/**
+- snap:
+    - nvim:
+      classic: true

hosts/v/install.conf.yaml

@@ -1,14 +1,12 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring v"
-- brewfile:
-    - Brewfile
 - link:
     ~/:
       force: true
       glob: true
       path: hosts/v/base/**
-      prefix: "."
+      prefix: '.'
     ~/.config/:
       glob: true
       force: true

install

@@ -10,14 +10,17 @@ BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 DOTBOT_BIN_PATH="${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}"
 DOTBOT_HOST="$(hostname -s)"
 
-cd "$BASEDIR"
-git submodule sync --quiet --recursive
-git submodule update --init --recursive
+cd "${BASEDIR}"
+git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive
+git submodule update --init --recursive "${DOTBOT_DIR}"
 
 "${DOTBOT_BIN_PATH}" \
   -d "${BASEDIR}" \
   --plugin-dir=tools/dotbot-brew \
   --plugin-dir=tools/dotbot-include \
+  --plugin-dir=tools/dotbot-crontab \
+  --plugin-dir=tools/dotbot-snap \
+  --plugin-dir=tools/dotbot-pip \
   -c "${CONFIG}" \
   "${@}"
 
@@ -30,6 +33,9 @@ if [ "${DOTBOT_HOST}" != "" ]; then
       -d "$BASEDIR" \
       --plugin-dir=tools/dotbot-brew \
       --plugin-dir=tools/dotbot-include \
+      --plugin-dir=tools/dotbot-crontab \
+      --plugin-dir=tools/dotbot-snap \
+      --plugin-dir=tools/dotbot-pip \
       -c "$DOTBOT_HOST_CONFIG" \
       "${@}"
 fi

install.conf.yaml

@@ -1,40 +1,67 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - clean:
     ~/:
     ~/.config:
       recursive: true
     ~/.local:
       recursive: true
+    ~/.ssh:
+      recursive: true
 - create:
     ~/.cache:
     ~/.cache/git:
     ~/.config:
-    ~/.config/cheat/cheatsheets/personal:
-    ~/.config/cheat/cheatsheets/pure-bash-bible:
-    ~/.config/cheat/cheatsheets/tldr:
     ~/.local:
+    ~/.local/bin:
     ~/.local/run:
     ~/.local/share:
     ~/.local/state:
     ~/.ssh:
       mode: 0700
+    ~/.ssh/local.d:
+      mode: 0700
     ~/Code:
 - link:
     ~/:
       force: true
       glob: true
-      path: base/**
-      prefix: "."
+      path: base/*
+      prefix: '.'
     ~/.config/:
       glob: true
-      path: config/**
-    ~/.local/:
+      relink: true
+      path: config/*
+      exclude: [config/nvm]
+    ~/.config/nvm/default-packages:
+      create: true
+      relink: true
+      path: config/nvm/default-packages
+    ~/.local/bin:
       glob: true
-      path: local/**
+      path: local/bin/*
+    ~/.local/man:
+      glob: true
+      path: local/man/**
+    ~/.local/share:
+      glob: true
+      path: local/share/*
     ~/.ssh/:
       glob: true
       mode: 0600
-      path: ssh/**
+      path: ssh/*
 - shell:
     - git submodule update --init --recursive --force
     - bash local/bin/dfm install all
+- pipx:
+    file: tools/requirements-pipx.txt
+    stdout: false
+    stderr: true
+- crontab:
+    - time: 0 5 * * *
+      command: brew update && brew upgrade
+      platform: darwin # Optional
+    - time: 0 5 * * *
+      command: apt update && apt upgrade
+      platform: linux # Optional
+    - time: 0 5 * * *
+      command: task sync

local/bin/README.md

@@ -13,7 +13,7 @@ Some problematic code has been fixed per `shellcheck` suggestions.
 ## Sourced
 
 | Script                  | Source            |
-|-------------------------|-------------------|
+| ----------------------- | ----------------- |
 | `x-dupes`               | skx/sysadmin-util |
 | `x-foreach`             | mvdan/dotfiles    |
 | `x-multi-ping`          | skx/sysadmin-util |

local/bin/dfm

@@ -18,6 +18,7 @@ SCRIPT=$(basename "$0")
 
 VERSION_NVM="v0.39.5"
 
+export DOTFILES_SHARED_LOADED=""
 # shellcheck source=./../../scripts/shared.sh
 source "$SHARED_SCRIPT"
 
@@ -28,9 +29,11 @@ function section_install
   MENU=(
     "all:Installs everything in the correct order"
     "antigen:Updates the antigen.zsh file"
+    "cargo:Install rust/cargo packages"
     "cheat-databases:Install cheat external cheatsheet databases"
     "composer:Install composer"
     "dotenv:Install dotenv-linter"
+    "fonts:Install programming fonts"
     "gh:Install GitHub CLI Extensions"
     "go:Install Go Packages"
     "imagick:Install ImageMagick CLI"
@@ -40,14 +43,18 @@ function section_install
     "nvm:Install Node Version Manager (nvm)"
     "npm:Install NPM Packages"
     "ntfy:Install ntfy"
+    "pip:Install pip/python packages"
     "z:Install z"
   )
 
   case "$1" in
     all)
       $0 install macos
+      $0 install fonts
       $0 install antigen
       $0 brew install
+      $0 install pip
+      $0 install cargo
       $0 install composer
       $0 install dotenv
       $0 install fzf
@@ -65,6 +72,10 @@ function section_install
       curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
         && msg_yay "New antigen installed!"
       ;;
+    cargo)
+      bash "$DOTFILES/scripts/install-cargo-packages.sh" \
+        && msg_yay "cargo packages installed!"
+      ;;
     cheat-databases)
       for database in "$DOTFILES"/scripts/install-cheat-*; do
         bash "$database" \
@@ -81,6 +92,10 @@ function section_install
         | sh -s -- -b "$XDG_BIN_HOME" \
         && msg_yay "dotenv-linter installed!"
       ;;
+    fonts)
+      bash "$DOTFILES/scripts/install-fonts.sh" \
+        && msg_yay "Installed fonts!"
+      ;;
     fzf)
       bash "$DOTFILES/scripts/install-fzf.sh" \
         && msg_yay "fzf installed!"
@@ -126,6 +141,10 @@ function section_install
       bash "$DOTFILES/scripts/install-ntfy.sh" \
         && msg_yay "ntfy installed!"
       ;;
+    pip)
+      bash "$DOTFILES/scripts/install-pip-packages.sh" \
+        && msg_yay "pip/python packages installed!"
+      ;;
     z)
       bash "$DOTFILES/scripts/install-z.sh" \
         && msg_yay "z has been installed!"
@@ -232,10 +251,8 @@ function section_dotfiles
         ~/.local/share/nvim \
         ~/.local/state/nvim \
         ~/.cache/nvim \
-        ~/.config/astronvim \
         ~/.config/nvim
-      msg_ok "Deleted old nvim files"
-      ln -s "$DOTFILES/config/astronvim" ~/.config/astronvim
+      msg_ok "Deleted old nvim files (share, state and cache + config)"
       ln -s "$DOTFILES/config/nvim" ~/.config/nvim
       msg_ok "Linked nvim and astronvim"
       have npm && $0 install npm
@@ -249,18 +266,9 @@ function section_dotfiles
       ;;
     shfmt)
       # Format shell scripts according to following rules.
-      find "$DOTFILES" \
-        -type f -executable \
-        -not -path '*/.git/*' \
-        -not -path '*dotbot*' \
-        -not -path '*config/fzf*' \
-        -not -path '*bin/fzf*' \
-        -not -path '*tmux/plugins*' \
-        -not -name '*.pl' \
-        -not -name '*.py' \
-        -not -name '*.php' \
-        -not -name '*.zsh' \
-        -exec shfmt \
+      fd --full-path "$DOTFILES" -tx \
+        -E '*.pl' -E '*.php' -E '*.py' -E '*.zsh' -E 'plugins' -E 'fzf' -E 'dotbot' \
+        -x shfmt \
         --language-dialect bash \
         --func-next-line --list --write \
         --indent 2 --case-indent --space-redirects \

local/bin/fzf-tmux

@@ -2,8 +2,9 @@
 # fzf-tmux: starts fzf in a tmux pane
 # usage: fzf-tmux [LAYOUT OPTIONS] [--] [FZF OPTIONS]
 
-fail() {
-  >&2 echo "$1"
+fail()
+{
+  echo >&2 "$1"
   exit 2
 }
 
@@ -19,8 +20,9 @@ term=""
 [[ -n "$LINES" ]] && lines=$LINES || lines=$(tput lines) || lines=$(tmux display-message -p "#{pane_height}")
 [[ -n "$COLUMNS" ]] && columns=$COLUMNS || columns=$(tput cols) || columns=$(tmux display-message -p "#{pane_width}")
 
-help() {
-  >&2 echo 'usage: fzf-tmux [LAYOUT OPTIONS] [--] [FZF OPTIONS]
+help()
+{
+  echo >&2 'usage: fzf-tmux [LAYOUT OPTIONS] [--] [FZF OPTIONS]
 
   LAYOUT OPTIONS:
     (default layout: -d 50%)
@@ -55,7 +57,7 @@ while [[ $# -gt 0 ]]; do
       echo "fzf-tmux (with fzf $("$fzf" --version))"
       exit
       ;;
-    -p*|-w*|-h*|-x*|-y*|-d*|-u*|-r*|-l*)
+    -p* | -w* | -h* | -x* | -y* | -d* | -u* | -r* | -l*)
       if [[ "$arg" =~ ^-[pwhxy] ]]; then
         [[ "$opt" =~ "-E" ]] || opt="-E"
       elif [[ "$arg" =~ ^.[lr] ]]; then
@@ -93,9 +95,9 @@ while [[ $# -gt 0 ]]; do
       elif [[ "$arg" =~ ^-[whxy] ]]; then
         opt="$opt ${arg:0:2}$size"
       elif [[ "$size" =~ %$ ]]; then
-        size=${size:0:((${#size}-1))}
+        size=${size:0:((${#size} - 1))}
         if [[ -n "$swap" ]]; then
-          opt="$opt -p $(( 100 - size ))"
+          opt="$opt -p $((100 - size))"
         else
           opt="$opt -p $size"
         fi
@@ -106,7 +108,7 @@ while [[ $# -gt 0 ]]; do
           else
             max=$lines
           fi
-          size=$(( max - size ))
+          size=$((max - size))
           [[ $size -lt 0 ]] && size=0
           opt="$opt -l $size"
         else
@@ -152,13 +154,14 @@ fifo1="${TMPDIR:-/tmp}/fzf-fifo1-$id"
 fifo2="${TMPDIR:-/tmp}/fzf-fifo2-$id"
 fifo3="${TMPDIR:-/tmp}/fzf-fifo3-$id"
 if tmux_win_opts=$(tmux show-options -p remain-on-exit \; show-options -p synchronize-panes 2> /dev/null); then
-  tmux_win_opts=( $(sed '/ off/d; s/synchronize-panes/set-option -p synchronize-panes/; s/remain-on-exit/set-option -p remain-on-exit/; s/$/ \\;/' <<< "$tmux_win_opts") )
+  tmux_win_opts=($(sed '/ off/d; s/synchronize-panes/set-option -p synchronize-panes/; s/remain-on-exit/set-option -p remain-on-exit/; s/$/ \\;/' <<< "$tmux_win_opts"))
   tmux_off_opts='; set-option -p synchronize-panes off ; set-option -p remain-on-exit off'
 else
-  tmux_win_opts=( $(tmux show-window-options remain-on-exit \; show-window-options synchronize-panes | sed '/ off/d; s/^/set-window-option /; s/$/ \\;/') )
+  tmux_win_opts=($(tmux show-window-options remain-on-exit \; show-window-options synchronize-panes | sed '/ off/d; s/^/set-window-option /; s/$/ \\;/'))
   tmux_off_opts='; set-window-option synchronize-panes off ; set-window-option remain-on-exit off'
 fi
-cleanup() {
+cleanup()
+{
   \rm -f $argsf $fifo1 $fifo2 $fifo3
 
   # Restore tmux window options
@@ -196,7 +199,7 @@ if [[ "$opt" =~ "-E" ]]; then
     exit 2
   fi
 fi
-[[ -n "$FZF_DEFAULT_OPTS"    ]] && envs="$envs FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS")"
+[[ -n "$FZF_DEFAULT_OPTS" ]] && envs="$envs FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS")"
 [[ -n "$FZF_DEFAULT_COMMAND" ]] && envs="$envs FZF_DEFAULT_COMMAND=$(printf %q "$FZF_DEFAULT_COMMAND")"
 [[ -n "$RUNEWIDTH_EASTASIAN" ]] && envs="$envs RUNEWIDTH_EASTASIAN=$(printf %q "$RUNEWIDTH_EASTASIAN")"
 [[ -n "$BAT_THEME" ]] && envs="$envs BAT_THEME=$(printf %q "$BAT_THEME")"
@@ -236,6 +239,9 @@ fi
 tmux \
   split-window -c "$PWD" $opt "bash -c 'exec -a fzf bash $argsf'" $swap \
   $tmux_off_opts \
-  > /dev/null 2>&1 || { "$fzf" "${args[@]}"; exit $?; }
+  > /dev/null 2>&1 || {
+  "$fzf" "${args[@]}"
+  exit $?
+}
 cat $fifo2
 exit "$(cat $fifo3)"

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

@@ -4,6 +4,7 @@
 # Updates $HOME/.dotfiles/docs/tmux.md with my keybindings.
 
 # shellcheck source=./../../scripts/shared.sh
+DOTFILES_SHARED_LOADED=""
 source "$HOME/.dotfiles/scripts/shared.sh"
 
 have tmux || {
@@ -15,7 +16,10 @@ TMUX_KEYBINDINGS_DOCS="$DOTFILES/docs/tmux-keybindings.md"
 CB="\n\`\`\`\n"
 KB=$(tmux list-keys)
 H="# tmux keybindings\n"
-L="\n\nLeader: \`<ctrl><space>\`\n\n"
+L="\nLeader: \`<ctrl><space>\`\n"
+
+# Generalize expanded $HOME to "$HOME"
+KB="${KB//$HOME/\$HOME}"
 
 msg "Outputting tmux keybindings to $TMUX_KEYBINDINGS_DOCS"
 echo -e "${H}${L}${CB}${KB}${CB}" > "$TMUX_KEYBINDINGS_DOCS"

local/bin/x-git-largest-files.py

@@ -1,136 +1,195 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Python script to find the largest files in a git repository.
 # The general method is based on the script in this blog post:
 # http://stubbisms.wordpress.com/2009/07/10/git-script-to-show-largest-pack-objects-and-trim-your-waist-line/
 #
-# The above script worked for me, but was very slow on my 11GB repository. This version has a bunch
-# of changes to speed things up to a more reasonable time. It takes less than a minute on repos with 250K objects.
+# The above script worked for me, but was very slow on my 11GB repository.
+# This version has a bunch of changes to speed things up to a more
+# reasonable time. It takes less than a minute on repos with 250K objects.
 #
 # The MIT License (MIT)
 # Copyright (c) 2015 Nick Kocharhook
+# Copyright (c) 2023 Ismo Vuorinen
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
-# associated documentation files (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge, publish, distribute,
-# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in all copies or
-# substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in all copies
+# or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT 
-# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
-# OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+# vim:tw=120:ts=4:ft=python:norl:
 
-from subprocess import check_output, CalledProcessError, Popen, PIPE
+from subprocess import check_output, Popen, PIPE
 import argparse
 import signal
 import sys
 
 sortByOnDiskSize = False
 
+class Blob(object):
+  sha1 = ''
+  size = 0
+  packedSize = 0
+  path = ''
+
+  def __init__(self, line):
+    cols = line.split()
+    self.sha1, self.size, self.packedSize = cols[0], int(cols[2]), int(cols[3])
+
+  def __repr__(self):
+    return '{} - {} - {} - {}'.format(
+      self.sha1, self.size, self.packedSize, self.path)
+
+  def __lt__(self, other):
+    if (sortByOnDiskSize):
+      return self.size < other.size
+    else:
+      return self.packedSize < other.packedSize
+
+  def csv_line(self):
+    return "{},{},{},{}".format(
+      self.size/1024, self.packedSize/1024, self.sha1, self.path)
+
+
 def main():
-	global sortByOnDiskSize
+  global sortByOnDiskSize
 
-	signal.signal(signal.SIGINT, signal_handler)
-	
-	args = parseArguments()
-	sortByOnDiskSize = args.sortByOnDiskSize
-	sizeLimit = 1024*args.filesExceeding
+  signal.signal(signal.SIGINT, signal_handler)
 
-	if args.filesExceeding > 0:
-		print "Finding objects larger than {}kB…".format(args.filesExceeding)
-	else:
-		print "Finding the {} largest objects…".format(args.matchCount)
+  args = parse_arguments()
+  sortByOnDiskSize = args.sortByOnDiskSize
+  sizeLimit = 1024*args.filesExceeding
 
-	blobs = getTopBlobs(args.matchCount, sizeLimit)
+  if args.filesExceeding > 0:
+    print("Finding objects larger than {}kB…".format(args.filesExceeding))
+  else:
+    print("Finding the {} largest objects…".format(args.matchCount))
 
-	populateBlobPaths(blobs)
-	printOutBlobs(blobs)
+  blobs = get_top_blobs(args.matchCount, sizeLimit)
 
-def getTopBlobs(count, sizeLimit):
-	sortColumn = 4
-	
-	if sortByOnDiskSize:
-		sortColumn = 3
-
-	verifyPack = "git verify-pack -v `git rev-parse --git-dir`/objects/pack/pack-*.idx | grep blob | sort -k{}nr".format(sortColumn)
-	output = check_output(verifyPack, shell=True).split("\n")[:-1]
-
-	blobs = dict()
-	compareBlob = Blob("a b {} {} c".format(sizeLimit, sizeLimit)) # use __lt__ to do the appropriate comparison
-
-	for objLine in output:
-		blob = Blob(objLine)
-
-		if sizeLimit > 0:
-			if compareBlob < blob:
-				blobs[blob.sha1] = blob
-			else:
-				break
-		else:
-			blobs[blob.sha1] = blob
-
-			if len(blobs) == count:
-				break
-
-	return blobs
+  populate_blob_paths(blobs)
+  print_out_blobs(blobs)
 
 
-def populateBlobPaths(blobs):
-	if len(blobs):
-		print "Finding object paths…"
+def get_top_blobs(count, sizeLimit):
+  """Get top blobs from git repository
 
-		# Only include revs which have a path. Other revs aren't blobs.
-		revList = "git rev-list --all --objects | awk '$2 {print}'"
-		allObjectLines = check_output(revList, shell=True).split("\n")[:-1]
+    Args:
+        count (int): How many items to return
+        sizeLimit (int): What is the size limit
 
-		outstandingKeys = blobs.keys()
+    Returns:
+        dict: Dictionary of Blobs
+  """
+  sortColumn = 4
 
-		for line in allObjectLines:
-			cols = line.split()
-			sha1, path = cols[0], " ".join(cols[1:])
+  if sortByOnDiskSize:
+    sortColumn = 3
 
-			if (sha1 in outstandingKeys):
-				outstandingKeys.remove(sha1)
-				blobs[sha1].path = path
+  verifyPack = "git verify-pack -v `git rev-parse --git-dir`/objects/pack/pack-*.idx | grep blob | sort -k{}nr".format(sortColumn)  # noqa: E501
+  output = check_output(verifyPack, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
 
-				# short-circuit the search if we're done
-				if not len(outstandingKeys):
-					break
+  blobs = dict()
+  # use __lt__ to do the appropriate comparison
+  compareBlob = Blob("a b {} {} c".format(sizeLimit, sizeLimit))
+  for objLine in output:
+    blob = Blob(objLine)
+
+    if sizeLimit > 0:
+      if compareBlob < blob:
+        blobs[blob.sha1] = blob
+      else:
+        break
+    else:
+      blobs[blob.sha1] = blob
+
+      if len(blobs) == count:
+        break
+
+  return blobs
 
 
-def printOutBlobs(blobs):
-	if len(blobs):
-		csvLines = ["size,pack,hash,path"]
+def populate_blob_paths(blobs):
+  """Populate blob paths that only have a path
 
-		for blob in sorted(blobs.values(), reverse=True):
-			csvLines.append(blob.csvLine())
+  Args:
+    blobs (Blob, dict): Dictionary of Blobs
+  """
+  if len(blobs):
+    print("Finding object paths…")
 
-		p = Popen(["column", "-t", "-s", "','"], stdin=PIPE, stdout=PIPE, stderr=PIPE)
-		stdout, stderr = p.communicate("\n".join(csvLines)+"\n")
+    # Only include revs which have a path. Other revs aren't blobs.
+    revList = "git rev-list --all --objects | awk '$2 {print}'"
+    all_object_lines = check_output(revList, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
+    outstanding_keys = list(blobs.keys())
 
-		print "\nAll sizes in kB. The pack column is the compressed size of the object inside the pack file.\n"
-		print stdout.rstrip('\n')
-	else:
-		print "No files found which match those criteria."
+    for line in all_object_lines:
+      cols = line.split()
+      sha1, path = cols[0], " ".join(cols[1:])
+
+      if (sha1 in outstanding_keys):
+        outstanding_keys.remove(sha1)
+        blobs[sha1].path = path
+
+        # short-circuit the search if we're done
+        if not len(outstanding_keys):
+          break
 
 
-def parseArguments():
-	parser = argparse.ArgumentParser(description='List the largest files in a git repository')
-	parser.add_argument('-c', '--match-count', dest='matchCount', type=int, default=10,
-						help='The number of files to return. Default is 10. Ignored if --files-exceeding is used.')
-	parser.add_argument('--files-exceeding', dest='filesExceeding', type=int, default=0,
-						help='The cutoff amount, in KB. Files with a pack size (or pyhsical size, with -p) larger than this will be printed.')
-	parser.add_argument('-p', '--physical-sort', dest='sortByOnDiskSize', action='store_true', default=False,
-						help='Sort by the on-disk size of the files. Default is to sort by the pack size.')
+def print_out_blobs(blobs):
+  if len(blobs):
+    csvLines = ["size,pack,hash,path"]
 
-	return parser.parse_args()
+    for blob in sorted(blobs.values(), reverse=True):
+      csvLines.append(blob.csv_line())
+
+    command = ["column", "-t", "-s", ","]
+    p = Popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+
+    # Encode the input as bytes
+    input_data = ("\n".join(csvLines) + "\n").encode()
+
+    stdout, _ = p.communicate(input_data)
+
+    print("\nAll sizes in kB. The pack column is the compressed size of the object inside the pack file.\n")  # noqa: E501
+
+    print(stdout.decode("utf-8").rstrip('\n'))
+  else:
+    print("No files found which match those criteria.")
+
+
+def parse_arguments():
+  parser = argparse.ArgumentParser(
+    description='List the largest files in a git repository'
+  )
+  parser.add_argument(
+    '-c', '--match-count', dest='matchCount', type=int, default=10,
+    help='Files to return. Default is 10. Ignored if --files-exceeding is used.'
+  )
+  parser.add_argument(
+    '--files-exceeding', dest='filesExceeding', type=int, default=0,
+    help='The cutoff amount, in KB. Files with a pack size (or physical size, with -p) larger than this will be printed.' # noqa: E501
+  )
+  parser.add_argument(
+    '-p', '--physical-sort', dest='sortByOnDiskSize',
+    action='store_true', default=False,
+    help='Sort by the on-disk size. Default is to sort by the pack size.'
+  )
+
+  return parser.parse_args()
 
 
 def signal_handler(signal, frame):
@@ -138,29 +197,6 @@ def signal_handler(signal, frame):
     sys.exit(0)
 
 
-class Blob(object):
-	sha1 = ''
-	size = 0
-	packedSize = 0
-	path = ''
-
-	def __init__(self, line):
-		cols = line.split()
-		self.sha1, self.size, self.packedSize = cols[0], int(cols[2]), int(cols[3])
-
-	def __repr__(self):
-		return '{} - {} - {} - {}'.format(self.sha1, self.size, self.packedSize, self.path)
-
-	def __lt__(self, other):
-		if (sortByOnDiskSize):
-			return self.size < other.size
-		else:
-			return self.packedSize < other.packedSize
-
-	def csvLine(self):
-		return "{},{},{},{}".format(self.size/1024, self.packedSize/1024, self.sha1, self.path)
-
-
 # Default function is main()
 if __name__ == '__main__':
-	main()
+  main()

local/bin/x-hr

@@ -10,9 +10,9 @@
 # Modified by Ismo Vuorinen <https://github.com/ivuorinen> 2023
 
 # Determine width of terminal
-hr_col_count="$( (tput cols - 4) )"
+hr_col_count="$( (tput cols - 4))"
 if [ -z "${hr_col_count+set}" ] || [ "$hr_col_count" -lt 1 ]; then
-    hr_col_count="${COLUMNS:-80}"
+  hr_col_count="${COLUMNS:-80}"
 fi
 
 # Colors
@@ -21,20 +21,21 @@ hr_color="${hr_color:=$CLR_RED}"
 hr_reset="\033[0m"
 
 # Prints the HR line
-hr_draw_char() {
-    local CHAR="$1"
-    local LINE=""
-    LINE=$(printf "%*s" "$((hr_col_count - 3))" " ")
-    LINE="${LINE// /${CHAR}}"
-    echo -e "${hr_color}${LINE:0:${hr_col_count}}${hr_reset}"
+hr_draw_char()
+{
+  local CHAR="$1"
+  local LINE=""
+  LINE=$(printf "%*s" "$((hr_col_count - 3))" " ")
+  LINE="${LINE// /${CHAR}}"
+  echo -e "${hr_color}${LINE:0:${hr_col_count}}${hr_reset}"
 }
 
 # Passes param and calls hr()
-hr() {
-    for WORD in "${@:--}"; do
-        hr_draw_char "$WORD"
-    done
+hr()
+{
+  for WORD in "${@:--}"; do
+    hr_draw_char "$WORD"
+  done
 }
 
 hr "$@"
-