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/*]
+[{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

@@ -5,14 +5,14 @@ jobs:
   debug-changelog:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Create changelog text
         id: changelog
         uses: loopwerk/tag-changelog@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config_file: .github/tag-changelog-config.js
-      - name: "Echo results"
+      - name: 'Echo results'
         id: output-changelog
         run: |
           echo "${{ steps.changelog.outputs.changes }}"

.github/workflows/linters.yml

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

.github/workflows/new-release.yml

@@ -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:
@@ -12,7 +12,7 @@ jobs:
       created: ${{ steps.daily-version.outputs.created }}
       version: ${{ steps.daily-version.outputs.version }}
     steps:
-      - uses: actions/checkout@v3 # Checkout our working repository
+      - uses: actions/checkout@v4 # Checkout our working repository
       - name: Create tag if necessary
         uses: fregante/daily-version-action@v2
         id: daily-version

.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
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0

.gitignore

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

.gitmodules

@@ -26,24 +26,12 @@
 [submodule "tmux/catppuccin"]
 	path = config/tmux/plugins/tmux
 	url = https://github.com/catppuccin/tmux.git
-[submodule "tmux/tmux-1password"]
-	path = config/tmux/plugins/tmux-1password
-	url = https://github.com/yardnsm/tmux-1password.git
-[submodule "tmux/tmux-autoreload"]
-	path = config/tmux/plugins/tmux-autoreload
-	url = https://github.com/b0o/tmux-autoreload.git
 [submodule "tmux/tmux-continuum"]
 	path = config/tmux/plugins/tmux-continuum
 	url = https://github.com/tmux-plugins/tmux-continuum
-[submodule "tmux/tmux-fzf"]
-	path = config/tmux/plugins/tmux-fzf
-	url = https://github.com/sainnhe/tmux-fzf.git
 [submodule "tmux/tmux-menus"]
 	path = config/tmux/plugins/tmux-menus
 	url = https://github.com/jaclu/tmux-menus.git
-[submodule "tmux/tmux-notify"]
-	path = config/tmux/plugins/tmux-notify
-	url = https://github.com/ChanderG/tmux-notify.git
 [submodule "tmux/tmux-resurrect"]
 	path = config/tmux/plugins/tmux-resurrect
 	url = https://github.com/tmux-plugins/tmux-resurrect
@@ -53,12 +41,18 @@
 [submodule "tmux/tmux-sessionist"]
 	path = config/tmux/plugins/tmux-sessionist
 	url = https://github.com/tmux-plugins/tmux-sessionist.git
-[submodule "tmux/tmux-suspend"]
-	path = config/tmux/plugins/tmux-suspend
-	url = https://github.com/MunifTanjim/tmux-suspend.git
 [submodule "tmux/tmux-yank"]
 	path = config/tmux/plugins/tmux-yank
 	url = https://github.com/tmux-plugins/tmux-yank.git
-[submodule "tmux/vim-tmux-navigator"]
-	path = config/tmux/plugins/vim-tmux-navigator
-	url = https://github.com/christoomey/vim-tmux-navigator.git
+[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',
+      },
+    },
+  ],
+}

.shellcheckrc

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

.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,37 +1,39 @@
 #!/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 \
   -f https://github.com/tmux-plugins/tpm.git config/tmux/plugins/tpm
 git submodule add --name tmux/catppuccin \
   -f https://github.com/catppuccin/tmux.git config/tmux/plugins/tmux
-git submodule add --name tmux/tmux-1password \
-  -f https://github.com/yardnsm/tmux-1password.git config/tmux/plugins/tmux-1password
-git submodule add --name tmux/tmux-autoreload \
-  -f https://github.com/b0o/tmux-autoreload.git config/tmux/plugins/tmux-autoreload
 git submodule add --name tmux/tmux-continuum \
   -f https://github.com/tmux-plugins/tmux-continuum config/tmux/plugins/tmux-continuum
-git submodule add --name tmux/tmux-fzf \
-  -f https://github.com/sainnhe/tmux-fzf.git config/tmux/plugins/tmux-fzf
 git submodule add --name tmux/tmux-menus \
   -f https://github.com/jaclu/tmux-menus.git config/tmux/plugins/tmux-menus
-git submodule add --name tmux/tmux-notify \
-  -f https://github.com/ChanderG/tmux-notify.git config/tmux/plugins/tmux-notify
 git submodule add --name tmux/tmux-resurrect \
   -f https://github.com/tmux-plugins/tmux-resurrect config/tmux/plugins/tmux-resurrect
 git submodule add --name tmux/tmux-sensible \
   -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible
 git submodule add --name tmux/tmux-sessionist \
   -f https://github.com/tmux-plugins/tmux-sessionist.git config/tmux/plugins/tmux-sessionist
-git submodule add --name tmux/tmux-suspend \
-  -f https://github.com/MunifTanjim/tmux-suspend.git config/tmux/plugins/tmux-suspend
+git submodule add --name tmux/tmux-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
-git submodule add --name tmux/vim-tmux-navigator \
-  -f https://github.com/christoomey/vim-tmux-navigator.git config/tmux/plugins/vim-tmux-navigator
-

base/bashrc

@@ -3,22 +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
-        [ -r "$file" ] && source "$file"
-        [ -r "$file-secret" ] && source "$file-secret"
-        [ -r "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-        [ -r "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
-    done
+  # Load the shell dotfiles, and then some:
+  for file in $DOTFILES/config/{exports,alias,functions}; do
+    HOST="$(hostname -s)"
+    # global (exports|alias|functions) file for all hosts
+    # shellcheck source=../config/exports
+    [ -r "$file" ] && source "$file"
+    # global secret file, git ignored
+    # shellcheck source=../config/exports-secret
+    [ -r "$file-secret" ] && source "$file-secret"
+    # host specific (exports|alias|functions) file
+    # shellcheck source=../config/exports
+    [ -r "$file-$HOST" ] && source "$file-$HOST"
+    # host specific (exports|alias|functions) file, git ignored
+    # shellcheck source=../config/exports
+    [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
+  done
 }
 x-load-configs
 
 # Import ssh keys in keychain
-ssh-add -A 2>/dev/null;
+ssh-add -A 2> /dev/null
 
 # shellcheck source=../config/fzf/fzf.bash
 [ -f "${DOTFILES}/config/fzf/fzf.bash" ] \

base/vuerc

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

base/zshrc

@@ -1,15 +1,9 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
+export DOTFILES_SHARED_LOADED=""
 # shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
 
@@ -20,57 +14,90 @@ function x-load-configs()
 {
   # Load the shell dotfiles, and then some:
   for file in $DOTFILES/config/{exports,alias,functions}; do
+    HOST="$(hostname -s)"
+    # global (exports|alias|functions) file for all hosts
+    # shellcheck source=../config/exports
     [ -r "$file" ] && source "$file"
+    # global secret file, git ignored
+    # shellcheck source=../config/exports-secret
     [ -r "$file-secret" ] && source "$file-secret"
-    [ -r "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-    [ -r "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-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
 
-export HISTFILE="$XDG_STATE_HOME"/zsh/history
-
-autoload -U colors zsh/terminfo
-colors
-setopt correct
-
 export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
 x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
 
 # Add completion scripts to zsh path
 FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
-autoload -Uz compinit
 
-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"
-
-# Import ssh keys in keychain
-ssh-add -A 2>/dev/null;
-
 # 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" ] \
   && source "${DOTFILES}/config/fzf/fzf.zsh"
 
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-# shellcheck source=config/zsh/p10k.zsh
-export P10K_LOCATION="$XDG_CONFIG_HOME/zsh/p10k.zsh"
-[[ ! -f $P10K_LOCATION ]] || source "$P10K_LOCATION"
-
+# Start starship
+eval "$(starship init zsh)"

config/alacritty/alacritty.yml

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

config/alias

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

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

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

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# shellcheck shell=zsh
+# shellcheck shell=bash
 # vim: filetype=zsh
 
 export DOTFILES="$HOME/.dotfiles"
@@ -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,39 +18,28 @@ 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"
 
+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"
 
@@ -69,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"
@@ -98,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 -)"
 }
 
@@ -113,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"
 
@@ -136,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,33 +71,3 @@ scheduler()
     sleep 60
   done
 }
-
-# Defines default antigen bundles
-x-default-antigen-bundles()
-{
-  export ZSH_TMUX_AUTOSTART=true
-  export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
-  export ZSH_TMUX_UNICODE=true
-
-  # 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
-
-  # the theme to use
-  antigen theme romkatv/powerlevel10k
-}

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

@@ -66,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
@@ -104,6 +106,10 @@ brew "dotenv-linter"
 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
@@ -411,8 +413,10 @@ mas "Actions", id: 1586435171
 mas "Audiobook Builder", id: 1437681957
 mas "Ivory", id: 6444602274
 mas "Keynote", id: 409183694
+mas "LastPass", id: 926036361
 mas "Numbers", id: 409203825
 mas "Pages", id: 409201541
+mas "Pixelmator Pro", id: 1289583905
 mas "Tailscale", id: 1475387142
 mas "Xcode", id: 497799835
 vscode "akamud.vscode-theme-onelight"
@@ -434,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"
@@ -472,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"
@@ -480,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,6 +1,8 @@
-tags
-test.sh
-.luarc.json
-nvim
-lazy-lock.json
-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,30 +1,2 @@
-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)
-
--- Filetype specialties.
-require("filetype")
-
--- Global, windows options of neovim:
-require("options")
-
--- 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

@@ -0,0 +1,69 @@
+{
+  "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" },
+  "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" },
+  "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" },
+  "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-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-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" },
+  "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" },
+  "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }
+}

config/nvim/lua/autocmd.lua

@@ -1,31 +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)

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,279 +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.
---]]
-
-local key = vim.api.nvim_set_keymap
-local remap = { noremap = true, silent = true }
-
-local wk = require("which-key")
-
---  ╭──────────────────────────────────────────────────────────╮
---  │ Register keybindings                                     │
---  ╰──────────────────────────────────────────────────────────╯
-
--- Register in all modes, prefix <leader>
-wk.register({
-  b = {
-    name = "Buffer",
-    n = {
-      "<cmd>tabnew<cr>",
-      "New tab",
-    },
-    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",
-      },
-    },
-  },
-  D = {
-    name = "[D]iagnostics (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" },
-  },
-  f = {
-    name = "[f]ind",
-    -- 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 = "[h]arpoon",
-    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 = "[H]elp/Conceal/Telescope",
-    c = {
-      name = "[c]onceal",
-      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" },
-    },
-  },
-  p = {
-    name = "[p]lugins",
-    i = { function() require("lazy").install() end, "[p]lugins [i]nstall" },
-    s = { function() require("lazy").home() end, "[p]lugins [s]tatus" },
-    S = { function() require("lazy").sync() end, "[p]lugins [S]ync" },
-    u = { function() require("lazy").check() end, "[p]lugins Check [u]pdates" },
-    U = { function() require("lazy").update() end, "[p]lugins [U]pdate" },
-  },
-  q = {
-    name = "[q]uit",
-    q = { ":qa<cr>", "[q]uit: [q]uit all" },
-    f = { ":qa!<cr>", "[q]uit: all with [f]orce" },
-  },
-  t = {
-    name = "[t]elescope",
-    -- Find recursively TODOs, NOTEs, FIXITs, ... across the root folder subfiles.
-    t = { ":TodoTelescope<cr>", "[t]elescope: [t]odo" },
-  },
-  x = { ":Bdelete<CR>", "[x]: 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>" })
-
--- Go to the next block.
---key('n', '<C-Down>', 'g%', remap )
-
--- Loop through brackets blocks.
---key('n', '<C-Up>', 'z%', remap )
-
--- Do just End on CTRL + End.
-key("i", "<C-End>", "<End>", remap)
-key("n", "<C-End>", "<End>", remap)
-
--- Do just Home on CTRL + Home.
-key("i", "<C-Home>", "<End>", remap)
-
--- Highlight the word after pressing enter.
-key(
-  "n",
-  "<CR>",
-  [[:let searchTerm = '\v<'.expand("<cword>").'>' <bar> let @/ = searchTerm <bar> echo '/'.@/ <bar> call histadd("search", searchTerm) <bar> set hls<cr>]],
-  remap
-)
-
--- Highlight the visual selection after pressing enter.
-key(
-  "v",
-  "<CR>",
-  [["*y:silent! let searchTerm = '\V'.substitute(escape(@*, '\/'), "\n", '\\n', "g") <bar> let @/ = searchTerm <bar> echo '/'.@/ <bar> call histadd("search", searchTerm) <bar> set hls<cr>]],
-  remap
-)
-
--- Toggle highlight of search
-key("n", "<C-c>", ":set hlsearch!<CR>", remap)
-
--- Toggle the sidebar tree of the root folder.
-key("n", "<leader>e", "", {
-  noremap = true,
-  silent = true,
-  desc = "Open NeoTree without warnings",
-  callback = function() vim.cmd("Neotree toggle source=filesystem position=left") end,
-})
-
--- Try to correct the current word.
-key("i", "<C-b>", "ea<C-x><C-s>", remap)
-
--- Toggle built-in nvim spell checking.
-key("n", "<F5>", ":setlocal spell!<CR>", 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 })
-
--- Set 'CTRL + v' as 'paster'
--- key('', '<C-v>', 'map"_d<Esc>i', remap )
-key("v", "<C-v>", "p", remap)
-
--- Set 'CTRL + x' as 'cut'
-key("v", "<C-x>", "mad`ai<Right>", { silent = true })
-
--- Set 'CTRL + c' as 'copier'
-key("v", "<C-c>", "may`ai", remap)
-key("i", "<C-v>", "<Esc>:Registers<CR>", remap)
-
--- Set 'CTRL + s as save'
-key("n", "<C-s>", "<cmd>w<cr>", remap)
-
--- Create mark.
-key("n", "'", "`", remap)
-
--- 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)
-
--- Set 'SHIFT + special-keys' as 'select' like a modern text editor.
-key("i", "<S-Home>", "<Esc>v<Home>", remap)
-key("i", "<S-End>", "<C-o>v<End><Left>", remap)
-key("n", "<S-Home>", "v<Home>", remap)
-key("n", "<S-End>", "v<End><Left>", remap)
-key("n", "<S-PageUp>", "", remap)
-key("n", "<S-PageDown>", "<Esc>:call Visual_Scroll_Down()<CR>i<Right><Left>", 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)
-
----
-
--- Barbar keymappings
-
-local map = vim.api.nvim_set_keymap
-local opts = { noremap = true, silent = true }
-
--- Move to previous/next
-map("n", "<C-,>", "<Cmd>BufferPrevious<CR>", opts)
-map("n", "<C-.>", "<Cmd>BufferNext<CR>", opts)
--- Re-order to previous/next
-map("n", "<C-<>", "<Cmd>BufferMovePrevious<CR>", opts)
-map("n", "<C->>", "<Cmd>BufferMoveNext<CR>", opts)
--- Goto buffer in position...
-map("n", "<C-1>", "<Cmd>BufferGoto 1<CR>", opts)
-map("n", "<C-2>", "<Cmd>BufferGoto 2<CR>", opts)
-map("n", "<C-3>", "<Cmd>BufferGoto 3<CR>", opts)
-map("n", "<C-4>", "<Cmd>BufferGoto 4<CR>", opts)
-map("n", "<C-5>", "<Cmd>BufferGoto 5<CR>", opts)
-map("n", "<C-6>", "<Cmd>BufferGoto 6<CR>", opts)
-map("n", "<C-7>", "<Cmd>BufferGoto 7<CR>", opts)
-map("n", "<C-8>", "<Cmd>BufferGoto 8<CR>", opts)
-map("n", "<C-9>", "<Cmd>BufferGoto 9<CR>", opts)
-map("n", "<C-0>", "<Cmd>BufferLast<CR>", opts)
--- Pin/unpin buffer
-map("n", "<C-p>", "<Cmd>BufferPin<CR>", opts)
-
--- Close buffer
--- map('n', '<C-c>', '<Cmd>BufferClose<CR>', opts)
-
--- Wipeout buffer
---                 :BufferWipeout
--- Close commands
---                 :BufferCloseAllButCurrent
---                 :BufferCloseAllButPinned
---                 :BufferCloseAllButCurrentOrPinned
---                 :BufferCloseBuffersLeft
---                 :BufferCloseBuffersRight
--- Magic buffer-picking mode
-map("n", "<C-p>", "<Cmd>BufferPick<CR>", opts)
--- Sort automatically by...
-map("n", "<Space>bb", "<Cmd>BufferOrderByBufferNumber<CR>", opts)
-map("n", "<Space>bd", "<Cmd>BufferOrderByDirectory<CR>", opts)
-map("n", "<Space>bl", "<Cmd>BufferOrderByLanguage<CR>", opts)
-map("n", "<Space>bw", "<Cmd>BufferOrderByWindowNumber<CR>", opts)
-
--- Other:
--- :BarbarEnable - enables barbar (enabled by default)
--- :BarbarDisable - very bad command, should never be used

config/nvim/lua/lsp.lua

@@ -1,146 +0,0 @@
--- Completion for snippets.
-CAPABILITIES = vim.lsp.protocol.make_client_capabilities()
-CAPABILITIES = require("cmp_nvim_lsp").default_capabilities(CAPABILITIES)
-CAPABILITIES.textDocument.completion.completionItem.snippetSupport = true
-
---CAPABILITIES.offsetEncoding = 'utf-8'
-
--- [[ 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 = {
-      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()
-capabilities = require("cmp_nvim_lsp").default_capabilities(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,
-})
-
--- Bash Language Server
-require("lsp.bash")
-
--- eslint_d + prettierd
--- require 'lsp.eslint_d_prettierd'
-
--- HTML
-require("lsp.html")
-
--- JSON
-require("lsp.json")
-
--- Python
-require("lsp.python")
-
--- CSS + Less + SCSS
-require("lsp.scss")
-
--- rome
-require("lsp.rome")
-
--- Typescript + Javascript
-require("lsp.typescript")

config/nvim/lua/lsp/bash.lua

@@ -1,8 +0,0 @@
-require("lspconfig").bashls.setup({
-  cmd = {
-    "bash-language-server",
-    "start",
-  },
-  filetypes = { "sh", "zsh" },
-  capabilities = CAPABILITIES,
-})

config/nvim/lua/lsp/eslint_d_prettierd.lua

@@ -1,25 +0,0 @@
-local eslint = require("eslint")
-local null_ls = require("null-ls")
--- local sources = { null_ls.builtins.formatting.prettierd }
-
-null_ls.setup()
-
-eslint.setup({
-  bin = "eslint_d",
-  code_actions = {
-    enable = true,
-    apply_on_save = {
-      enable = true,
-      types = { "directive", "problem", "suggestion", "layout" },
-    },
-    disable_rule_comment = {
-      enable = true,
-      location = "separate_line", -- or `same_line`
-    },
-  },
-  diagnostics = {
-    enable = true,
-    report_unused_disable_directives = false,
-    run_on = "type", -- or `save`
-  },
-})

config/nvim/lua/lsp/html.lua

@@ -1 +0,0 @@
-require("lspconfig").html.setup({ capabilities = CAPABILITIES })

config/nvim/lua/lsp/json.lua

@@ -1,9 +0,0 @@
-require("lspconfig").jsonls.setup({
-  settings = {
-    json = {
-      schemas = require("schemastore").json.schemas(),
-      validate = { enable = true },
-    },
-  },
-  capabilities = CAPABILITIES,
-})

config/nvim/lua/lsp/python.lua

@@ -1 +0,0 @@
-require("lspconfig").pylsp.setup({})

config/nvim/lua/lsp/rome.lua

@@ -1,31 +0,0 @@
-local util = require("lspconfig.util")
--- local config = require 'lspconfig.configs'
-
--- This duplicate exec is just a workaruond, if don't execute at first,
--- the nvim will stuck when you first init rome socket
--- local rome_cmd = { 'rome', 'lsp-proxy' }
-
--- local merged_table = vim.tbl_extend("keep", {
---   textDocument = {
---     formatting = {
---       dynamicRegistration = true
---     }
---   }
--- }, capabilities);
---
-require("lspconfig").rome.setup({
-  -- cmd = rome_cmd,
-  -- filetypes = {
-  --   'javascript',
-  --   'javascriptreact',
-  --   'typescript',
-  --   'typescriptreact',
-  --   'json'
-  -- },
-  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,
-})

config/nvim/lua/lsp/scss.lua

@@ -1,22 +0,0 @@
--- CSS + Less + SASS Language Server
-require("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,
-})

config/nvim/lua/lsp/typescript.lua

@@ -1,6 +0,0 @@
-require("lspconfig").tsserver.setup({
-  capabilities = CAPABILITIES,
-  on_attach = function(client, bufnr)
-    if client.server_capabilities.documentSymbolProvider then require("nvim-navic").attach(client, bufnr) end
-  end,
-})

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 = false, -- 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,153 +0,0 @@
-local option = vim.api.nvim_set_option
-local set = vim.api.nvim_set_var
-
--- Fix moving through lines 'gk' and 'gj'
-vim.wo.linebreak = true
-
--- Enable break indent
-vim.o.breakindent = true
-
--- Use the new FileType system of Neovim.
--- let g:do_filetype_lua = 1
-
--- Save undo history
-vim.o.undofile = true
-
--- Show lines number (hybrid)
-vim.wo.number = true
-vim.wo.relativenumber = true
-
--- Keep signcolumn on by default
-vim.wo.signcolumn = "yes"
-
--- Case-insensitive searching UNLESS \C or capital in search
-vim.o.ignorecase = true
-vim.o.smartcase = true
-
--- To have a extra line :)
-vim.o.cmdheight = 0
-
--- Set wrap for words
-vim.wo.wrap = true
-
--- Always show tabs
-vim.o.showtabline = 2
-
--- Show xtra spaces
-vim.opt.list = true
-
--- Set wildmenu for later use
-vim.o.wildmenu = true
-
--- Highlighting search
-vim.o.hlsearch = true
-
--- Set ruler for better look
-vim.o.ruler = true
-
--- No nice message
-vim.o.hidden = true
-
--- Partial commands only in the screen
-vim.o.showcmd = true
-
--- Match braces when inserting new ones :)
-vim.o.showmatch = true
-
--- Cursor line
----- Cursor column
-vim.o.cursorline = true
-vim.wo.cursorline = true
-vim.o.cursorcolumn = true
-vim.wo.cursorcolumn = true
-
--- Off scroll when moving through the buffer
-vim.o.scrolloff = 40
-
--- For terminal RGB colours
-vim.go.termguicolors = true
-
--- Colours, I believe
-vim.go.t_Co = "256"
-vim.go.t_ut = ""
-
--- Space for tabs
-vim.o.laststatus = 3
-
--- Space for tabs
-vim.o.softtabstop = 2
-
--- Expand tab to use spaces instead
-vim.o.expandtab = true
-
---  Space for tabs
-vim.o.tabstop = 2
-
--- Space for tabs
-vim.bo.shiftwidth = 2
-
--- Space for tabs
-vim.o.shiftwidth = 2
-
--- Format options to not create new lines with comments
-vim.o.formatoptions = "tqj"
-
--- Mouse working with neovim
-vim.o.mouse = "a"
-
--- 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"
-
--- Global statusline.
-vim.opt.laststatus = 3
-
--- 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
-
--- Columns line "limit"
--- vim.o.cc = '85'
-
--- 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"
-
--- Menu Transparency.
-vim.go.pumblend = 10
-
---------------------Variables-----------------
-
-set("one_allow_itali:set cursorlinec:set cursorlines", 1)
-set("do_filetype_lua", 1)
-set("MRU_File", "~/.cache/vim_mru_files")
-
---------------------API------------------------
-
--- Change title accordingly.
--- option('title', true)
-
--- Set clipboard to be global across the system
-option("clipboard", "unnamedplus")
-
--- Basic fold column
-option("foldcolumn", "1")
-
--- Set dictionary to language spell
-option("dictionary", "/usr/share/dict/words")
-
--- Wildignore for when opening files :0
-option("wildignore", "*/tmp*/,*/node_modules/*,_site,*/__pycache__/,*/venv/*,*/target/*,*/.vim$,~$,*/.log")
-
--- Folding
-option("foldmethod", "syntax")
-
--- File format for neovim reading
-option("fileformat", "unix")

config/nvim/lua/plugin-manager.lua

@@ -1,21 +0,0 @@
--- Package manager https://github.com/folke/lazy.nvim
--- :help lazy.nvim.txt
-
--- 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)
-
--- Plugins start here:
-require("lazy").setup("plugins")

config/nvim/lua/plugins/barbecue.lua

@@ -1,90 +0,0 @@
--- Winbar with context.
-return {
-  "utilyre/barbecue.nvim",
-  dependencies = {
-    "neovim/nvim-lspconfig",
-    "SmiteshP/nvim-navic",
-    "kyazdani42/nvim-web-devicons", -- Optional
-  },
-  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/close-buffers.lua

@@ -1 +0,0 @@
-return { "kazhala/close-buffers.nvim" }

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/commentbox.lua

@@ -1,4 +0,0 @@
-return {
-  "LudoPinelli/comment-box.nvim",
-  opts = {},
-}

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/fold-preview.lua

@@ -1,29 +0,0 @@
-return {
-  "anuvyklack/fold-preview.nvim",
-  dependencies = { "anuvyklack/keymap-amend.nvim", "ray-x/lsp_signature.nvim" },
-  config = function()
-    local fp = require("fold-preview")
-    local map = require("fold-preview").mapping
-    local keymap = vim.keymap
-    keymap.amend = require("keymap-amend")
-
-    fp.setup({
-      default_keybindings = false,
-      -- another settings
-    })
-
-    keymap.amend("n", "K", function(original)
-      if not fp.show_preview() then original() end
-      -- or
-      -- if not fp.toggle_preview() then original() end
-      -- to close preview on second press on K.
-    end)
-    keymap.amend("n", "h", map.close_preview_open_fold)
-    keymap.amend("n", "l", map.close_preview_open_fold)
-    keymap.amend("n", "zo", map.close_preview)
-    keymap.amend("n", "zO", map.close_preview)
-    keymap.amend("n", "zc", map.close_preview_without_defer)
-    keymap.amend("n", "zR", map.close_preview)
-    keymap.amend("n", "zM", map.close_preview_without_defer)
-  end,
-}

config/nvim/lua/plugins/gitsigns.lua

@@ -1,87 +0,0 @@
--- Show signs of GIT written in lua
-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>hs", gs.stage_hunk, { desc = "Stage Hunk" })
-      map("n", "<leader>hr", gs.reset_hunk, { desc = "Reset Hunk" })
-      map("v", "<leader>hs", function() gs.stage_hunk({ vim.fn.line("."), vim.fn.line("v") }) end)
-      map("v", "<leader>hr", function() gs.reset_hunk({ vim.fn.line("."), vim.fn.line("v") }) end)
-      map("n", "<leader>hS", gs.stage_buffer, { desc = "Stage Buffer" })
-      map("n", "<leader>hu", gs.undo_stage_hunk, { desc = "Undo Stage Hunk" })
-      map("n", "<leader>hR", gs.reset_buffer, { desc = "Reset Buffer" })
-      map("n", "<leader>hp", gs.preview_hunk, { desc = "Preview Hunk" })
-      map("n", "<leader>hb", function() gs.blame_line({ full = true }) end, { desc = "Blame Line" })
-      map("n", "<leader>tb", gs.toggle_current_line_blame, { desc = "Toggle Current Line Blame" })
-      map("n", "<leader>hd", gs.diffthis, { desc = "Diff This" })
-      map("n", "<leader>hD", function() gs.diffthis("~") end)
-      map("n", "<leader>td", 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/harpoon.lua

@@ -1 +0,0 @@
-return { "ThePrimeagen/harpoon" }

config/nvim/lua/plugins/incline.lua

@@ -1,70 +0,0 @@
--- Floating statuslines for Neovim
--- https://github.com/b0o/incline.nvim
---
--- Lightweight floating statuslines, best used with
--- Neovim's global statusline (set laststatus=3).
-
-return {
-  "b0o/incline.nvim",
-  config = {
-    debounce_threshold = {
-      falling = 50,
-      rising = 0,
-    },
-    hide = {
-      cursorline = true,
-      focused_win = false,
-      only_win = true,
-    },
-    highlight = {
-      groups = {
-        InclineNormal = {
-          default = true,
-          group = "NormalFloat",
-        },
-        InclineNormalNC = {
-          default = true,
-          group = "NormalFloat",
-        },
-      },
-    },
-    ignore = {
-      buftypes = "special",
-      filetypes = {},
-      floating_wins = true,
-      unlisted_buffers = true,
-      wintypes = "special",
-    },
-    render = "basic",
-    window = {
-      margin = {
-        horizontal = 1,
-        vertical = 1,
-      },
-      options = {
-        signcolumn = "no",
-        wrap = false,
-      },
-      padding = 1,
-      padding_char = " ",
-      placement = {
-        horizontal = "right",
-        vertical = "top",
-      },
-      width = "fit",
-      winhighlight = {
-        active = {
-          EndOfBuffer = "None",
-          Normal = "InclineNormal",
-          Search = "None",
-        },
-        inactive = {
-          EndOfBuffer = "None",
-          Normal = "InclineNormalNC",
-          Search = "None",
-        },
-      },
-      zindex = 10,
-    },
-  },
-}

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,98 +0,0 @@
-return {
-  --
-  -- Menu
-  --
-  -- Icons on menu
-  "onsails/lspkind-nvim",
-
-  -- Restore folds and cursor position
-  "senderle/restoreview",
-
-  --
-  -- Appearance
-  --
-
-  -- 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 = {
-          dim_dirname = true, -- directory name is dimmed by default
-          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,
-        nvimtree = false,
-        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"
-        },
-        ts_rainbow = true,
-        treesitter = true,
-        lsp_trouble = true,
-        which_key = true,
-      },
-    },
-  },
-
-  "rcarriga/nvim-notify",
-
-  -- Status information for LSP.
-  "j-hui/fidget.nvim",
-
-  -- Close buffer without messing up with the window.
-  "famiu/bufdelete.nvim",
-
-  "nyoom-engineering/oxocarbon.nvim",
-
-  -- JSONLS
-  "b0o/schemastore.nvim",
-}

config/nvim/lua/plugins/legendary.lua

@@ -1,9 +0,0 @@
-return {
-  "mrjones2014/legendary.nvim",
-  -- since legendary.nvim handles all your keymaps/commands,
-  -- its recommended to load legendary.nvim before other plugins
-  priority = 10000,
-  lazy = false,
-  -- sqlite is only needed if you want to use frecency sorting
-  -- dependencies = { 'kkharji/sqlite.lua' }
-}

config/nvim/lua/plugins/marks.lua

@@ -1,36 +0,0 @@
--- Signs for built-in marks.
-
-return {
-  "chentoast/marks.nvim",
-  config = {
-    -- whether to map keybinds or not. default true
-    default_mappings = true,
-    -- which builtin marks to show. default {}
-    builtin_marks = { ".", "<", ">", "^" },
-    -- whether movements cycle back to the beginning/end of buffer. default true
-    cyclic = true,
-    -- whether the shada file is updated after modifying uppercase marks. default false
-    force_write_shada = false,
-    -- how often (in ms) to redraw signs/recompute mark positions.
-    -- higher values will have better performance but may cause visual lag,
-    -- while lower values may cause performance penalties. default 150.
-    refresh_interval = 250,
-    -- sign priorities for each type of mark - builtin marks, uppercase marks, lowercase
-    -- marks, and bookmarks.
-    -- can be either a table with all/none of the keys, or a single number, in which case
-    -- the priority applies to all marks.
-    -- default 10.
-    sign_priority = { lower = 10, upper = 15, builtin = 8, bookmark = 20 },
-    -- disables mark tracking for specific filetypes. default {}
-    excluded_filetypes = {},
-    -- marks.nvim allows you to configure up to 10 bookmark groups, each with its own
-    -- sign/virttext. Bookmarks can be used to group together positions and quickly move
-    -- across multiple buffers. default sign is '!@#$%^&*()' (from 0 to 9), and
-    -- default virt_text is "".
-    bookmark_0 = {
-      sign = "⚑",
-      virt_text = "hello world",
-    },
-    mappings = {},
-  },
-}

config/nvim/lua/plugins/mini.lua

@@ -1,131 +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()
-
-    -- 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()
-
-    -- 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,415 +0,0 @@
--- File-tree manager.
-
--- 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", -- not strictly required, but recommended
-    "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_if_last_window = true,    -- Close Neo-tree if it is the last window left in the tab
-      popup_border_style = "rounded", -- "double", "none", "rounded", "shadow", "single" or "solid"
-      enable_git_status = true,
-      enable_diagnostics = true,
-      enable_normal_mode_for_inputs = false,                             -- Enable normal mode for input dialogs.
-
-      open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes
-
-      -- 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,
-      log_level = "info",               -- "trace", "debug", "info", "warn", "error", "fatal"
-      log_to_file = false,              -- true, false, "/path/to/file.log", use :NeoTreeLogs to show the file
-      open_files_in_last_window = true, -- false                                                                = open files in top left window
-      resize_timer_interval = 100,      -- in ms, needed for containers to redraw right aligned and faded content
-      sort_case_insensitive = true,     -- used when sorting files and directories in the tree
-      use_popups_for_input = false,     -- If false, inputs will use vim.ui.input() instead of custom floats.
-      sort_function = nil,              -- use a custom function for sorting files and directories in the tree
-
-      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,
-          padding = 1, -- extra padding on left hand side
-          -- indent guides
-          with_markers = true,
-          indent_marker = "│",
-          last_indent_marker = "└",
-          highlight = "NeoTreeIndentMarker",
-          -- expander config, needed for nesting files
-          with_expanders = true, -- if nil and file nesting is enabled, will enable expanders
-          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 = "˖", -- or "✚", but this is redundant info if you use git_status_colors on the name
-            modified = "±", -- or "", but this is redundant info if you use git_status_colors on the name
-            deleted = "✕", -- this can only be used in the git_status source
-            renamed = "↪", -- this can only be used in the git_status source
-            -- Status type
-            untracked = "?",
-            ignored = "⍨",
-            unstaged = "·",
-            staged = "✓",
-            conflict = "",
-          },
-        },
-      },
-      renderers = {
-        directory = {
-          { "indent" },
-          { "icon" },
-          { "current_filter" },
-          {
-            "container",
-            width = "100%",
-            right_padding = 0,
-            --max_width   = 60,
-            content = {
-              { "name",        zindex = 10 },
-              -- {
-              --   "symlink_target",
-              --   zindex = 10,
-              --   highlight = "NeoTreeSymbolicLinkTarget",
-              -- },
-              { "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" }, --> This is what actually adds the component in where you want it
-              { "modified",    zindex = 20, align = "right" },
-              { "diagnostics", zindex = 20, align = "right" },
-              { "git_status",  zindex = 20, align = "right" },
-            },
-          },
-        },
-      },
-      -- 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.
-        position = "left", -- left, right, float, current
-        width = 40,        -- applies to left and right positions
-        mapping_options = {
-          noremap = true,
-          nowait = true,
-        },
-        popup = { -- settings that apply to float position only
-          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",
-            nowait = false, -- disable `nowait` if you have existing combos starting with this char that you want to use
-          },
-          ["<2-LeftMouse>"] = "open",
-          ["<cr>"] = "open",
-          ["<esc>"] = "cancel", -- close preview or floating neo-tree window
-          ["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",
-          --["P"] = "toggle_preview", -- enter preview mode, which shows the current node without focusing
-          ["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 = {
-              show_path = "none", -- "none", "relative", "absolute"
-            },
-          },
-          ["A"] = "add_directory", -- also accepts the optional config.show_path option like "add". this also supports BASH style brace expansion.
-          ["d"] = "delete",
-          ["r"] = "rename",
-          ["y"] = "copy_to_clipboard",
-          ["x"] = "cut_to_clipboard",
-          ["p"] = "paste_from_clipboard",
-          ["c"] = "copy", -- takes text input for destination, also accepts the optional config.show_path option like "add":
-          -- ["c"] = {
-          --  "copy",
-          --  config = {
-          --    show_path = "none" -- "none", "relative", "absolute"
-          --  }
-          --}
-          ["m"] = "move", -- takes text input for destination, also accepts the optional config.show_path option like "add".
-          ["q"] = "close_window",
-          ["R"] = "refresh",
-          ["?"] = "show_help",
-          ["<"] = "prev_source",
-          [">"] = "next_source",
-        },
-      },
-      nesting_rules = {},
-      filesystem = {
-        commands = {}, -- Add a custom command or override a global one using the same function name
-        components = {
-          harpoon_index = function(config, node, state)
-            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,
-        },
-        filtered_items = {
-          visible = false, -- when true, they will just be displayed differently than normal items
-          hide_dotfiles = false,
-          hide_gitignored = false,
-          hide_hidden = true, -- only works on Windows for hidden files/directories
-          hide_by_name = {
-            ".git",
-            ".DS_Store",
-            "thumbs.db",
-            ".idea",
-            ".mypy_cache",
-            "node_modules",
-          },
-          hide_by_pattern = { -- uses glob style patterns
-            --"*.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,
-        group_empty_dirs = false,               -- when true, empty folders will be grouped together
-        bind_to_cwd = false,                    -- true creates a 2-way binding between vim's cwd and neo-tree's root
-        search_limit = 50,                      -- max number of search results when using filters
-        follow_current_file = {
-          enabled = false,                      -- This will find and focus the file in the active buffer every time
-          --               -- the current file is changed while the tree is open.
-          leave_dirs_open = false,              -- `false` closes auto expanded dirs, such as with `:Neotree reveal`
-        },
-        hijack_netrw_behavior = "open_default", -- 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
-        use_libuv_file_watcher = false, -- This will use the OS level file watchers to detect changes
-        -- instead of relying on nvim autocmd events.
-        window = {
-          mappings = {
-            ["."] = "set_root",
-            ["/"] = "fuzzy_finder",
-            ["#"] = "fuzzy_sorter", -- fuzzy sorting using the fzy algorithm
-            ["<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",
-          },
-          fuzzy_finder_mappings = { -- define keymaps for filter popup window in fuzzy_finder_mode
-            ["<down>"] = "move_cursor_down",
-            ["<C-n>"] = "move_cursor_down",
-            ["<up>"] = "move_cursor_up",
-            ["<C-p>"] = "move_cursor_up",
-          },
-        },
-      },
-      buffers = {
-        follow_current_file = {
-          enabled = true,         -- This will find and focus the file in the active buffer every time
-          --              -- the current file is changed while the tree is open.
-          leave_dirs_open = true, -- `false` closes auto expanded dirs, such as with `:Neotree reveal`
-        },
-        group_empty_dirs = true,  -- when true, empty folders will be grouped together
-        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,20 +0,0 @@
-local prefix = "<leader>a"
-return {
-  "danymat/neogen",
-  cmd = "Neogen",
-  opts = {
-    snippet_engine = "luasnip",
-    languages = {
-      lua = { template = { annotation_convention = "ldoc" } },
-      typescript = { template = { annotation_convention = "tsdoc" } },
-      typescriptreact = { template = { annotation_convention = "tsdoc" } },
-    },
-  },
-  keys = {
-    { prefix .. "<cr>", function() require("neogen").generate({ type = "current" }) end, desc = "Current" },
-    { prefix .. "c", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
-    { prefix .. "f", function() require("neogen").generate({ type = "func" }) end, desc = "Function" },
-    { prefix .. "t", function() require("neogen").generate({ type = "type" }) end, desc = "Type" },
-    { prefix .. "F", 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-cmp.lua

@@ -1,257 +0,0 @@
--- Completion menu.
-
--- Icons to display.
-local icons = {
-  Text = "  ",
-  Method = "  ",
-  Function = "  ",
-  Constructor = "  ",
-  Field = " ﰠ ",
-  Variable = "  ",
-  Class = " ﴯ ",
-  Interface = "  ",
-  Module = "  ",
-  Property = " ﰠ ",
-  Unit = " 塞 ",
-  Value = "  ",
-  Enum = "  ",
-  Keyword = "  ",
-  Snippet = "  ",
-  Color = "  ",
-  File = "  ",
-  Reference = "  ",
-  Folder = "  ",
-  EnumMember = "  ",
-  Constant = "  ",
-  Struct = " פּ ",
-  Event = "  ",
-  Operator = "  ",
-  TypeParameter = " T ",
-  Book = "  ",
-}
-
--- Load loaders from VSCode.
---require("luasnip.loaders.from_vscode").lazy_load({
---  paths = { "~/.local/share/lazy/friendly-snippets" }
---})
-
-return {
-  "hrsh7th/nvim-cmp",
-  dependencies = {
-    { "octaltree/cmp-look" },
-    --
-    { "hrsh7th/cmp-nvim-lsp" },
-    --
-    { "hrsh7th/cmp-nvim-lua" },
-    -- Buffer words.
-    { "hrsh7th/cmp-buffer" },
-    -- Path autocompletion.
-    { "hrsh7th/cmp-path" },
-    --
-    { "hrsh7th/cmp-cmdline" },
-    --
-    { "saadparwaiz1/cmp_luasnip" },
-    --
-    { "hrsh7th/vim-vsnip" },
-    --
-    { "rafamadriz/friendly-snippets" },
-    -- Snippets for lua.
-    { "L3MON4D3/LuaSnip" }, --config = "luasnip" },
-    --
-    { "hrsh7th/cmp-vsnip" },
-    --
-    -- Signature for functions.
-    --{ 'hrsh7th/cmp-nvim-lsp-signature-help' },
-    --
-    { "hrsh7th/vim-vsnip-integ" },
-    -- Make arimathetic operations.
-    { "hrsh7th/cmp-calc" },
-    -- Emoji.
-    { "hrsh7th/cmp-emoji" },
-  },
-  config = function()
-    local cmp = require("cmp")
-    local luasnip = require("luasnip")
-    require("luasnip.loaders.from_vscode").lazy_load()
-    luasnip.config.setup({})
-
-    -- Load specialities from LuaSnip.
-    -- Set it with VSCode-like mode.
-    luasnip.config.set_config({
-      history = true,
-      updateevents = "TextChanged,TextChangedI",
-    })
-
-    cmp.setup({
-
-      -- Window documentation, for defining its dimensions.
-      window = {
-        -- Max 10 items on display for documentation.
-        max_height = 10,
-        completion = {
-          side_padding = 0,
-          col_offset = 1,
-        },
-      },
-
-      -- Snippet support.
-      snippet = {
-        expand = function(args) require("luasnip").lsp_expand(args.body) end,
-      },
-
-      -- How the match works based on the input.
-      matching = {
-        -- Whethever we allow fuzzy matching or not.
-        disallow_fuzzy_matching = false,
-      },
-
-      -- Mapping each keybind.
-      mapping = {
-        ["<C-n>"] = cmp.mapping.select_next_item(),
-        ["<C-p>"] = cmp.mapping.select_prev_item(),
-
-        ["<C-d>"] = cmp.mapping.scroll_docs(-4),
-        ["<C-f>"] = cmp.mapping.scroll_docs(4),
-        ["<C-Space>"] = cmp.mapping.complete(),
-        ["<C-e>"] = cmp.mapping.close(),
-        ["<CR>"] = cmp.mapping.confirm({
-          behavior = cmp.ConfirmBehavior.Replace,
-          select = true,
-        }),
-        ["<Tab>"] = function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-          elseif require("luasnip").expand_or_jumpable() then
-            vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
-          else
-            fallback()
-          end
-        end,
-        ["<S-Tab>"] = function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif require("luasnip").jumpable(-1) then
-            vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "")
-          else
-            fallback()
-          end
-        end,
-      },
-
-      -- Formatting the menu display.
-      formatting = {
-        fields = { "kind", "abbr", "menu" },
-        format = function(_, vim_item)
-          vim_item.menu = vim_item.kind
-
-          -- load lspkind icons
-          --vim_item.kind = string.format(
-          --  "%s %s",
-          --  icons[vim_item.kind],
-          --  vim_item.kind
-          --)
-          vim_item.kind = icons[vim_item.kind]
-
-          --vim_item.menu = string.format(
-          --  "%s %s",
-          --  ({
-          --      nvim_lsp = "力",
-          --      nvim_lua = "",
-          --      luasnip  = icons.Color,
-          --      path     = "﫶",
-          --      buffer   = "﬘ ",
-          --      look     = icons.Book,
-          --      emoji    = "😎",
-          --  })[entry.source.name],
-          --  name
-          --)
-
-          return vim_item
-        end,
-      },
-
-      -- Experimental features.
-      experimental = {
-
-        -- It will type a shadow text of the intended completion.
-        ghost_text = { hl_group = "Comment" },
-      },
-
-      -- Sources for completion, since it is modular; cmp accepts
-      -- Multiple modules.
-      sources = {
-
-        -- Simple signature, normally outside an object.
-        --{ name = 'nvim_lsp_signature_help', priority = 15 },
-
-        -- More snippets.
-        -- For all types of languages.
-        {
-          name = "friendly-snippets",
-          priority = 11,
-        },
-
-        -- For the Nvim lua specifics commands.
-        {
-          name = "nvim_lua",
-          priority = 8,
-        },
-
-        -- Support with the current active LSP.
-        -- Anything that LSP supports and can share with CMP.
-        {
-          name = "nvim_lsp",
-          priority = 11,
-          --max_item_count = 10,
-        },
-
-        -- Snippets in general to facilitate life.
-        -- Type a often typed methods, like for in C.
-        -- { name = "luasnip",  priority = 6 },
-
-        -- Show path based on the backslashes.
-        -- Type any path, relatively or globally.
-        {
-          name = "path",
-          priority = 9,
-        },
-
-        -- Words from buffer.
-        {
-          name = "buffer",
-          priority = 4,
-        },
-
-        -- Max item count.
-
-        -- Dictionary for words.
-        -- Type any word that is on the /usr/share/dict/words
-        --{
-        --  name           = 'look',
-        --  priority       = 1,
-        --  keyword_length = 3,
-        --  max_item_count = 4,
-        --  option = {
-        --    convert_case = true,
-        --    loud = true,
-        --    dict = '/usr/share/dict/words'
-        --  },
-        --},
-
-        -- Emoji.
-        -- Activate with ":".
-        { name = "emoji", priority = 2, option = { insert = true } },
-
-        -- Calculate expressions based on the current line.
-        -- Activate with something like "4 + 5".
-        {
-          name = "calc",
-          priority = 10,
-        },
-      },
-    })
-  end,
-}
-
--- The line beneath this is called `modeline`. See `:help modeline`
--- vim: ts=2 sts=2 sw=2 et

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

@@ -1,92 +0,0 @@
---
--- Shows how to use the DAP plugin to debug your code.
---
--- Primarily focused on configuring the debugger for Go, but can
--- be extended to other languages as well. That's why it's called
--- kickstart.nvim and not kitchen-sink.nvim ;)
-
-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",
-        "js",
-        "php",
-        "python",
-      },
-    })
-
-    -- Basic debugging keymaps, feel free to change to your liking!
-    vim.keymap.set("n", "<F5>", dap.continue, { desc = "Debug: Start/Continue" })
-    vim.keymap.set("n", "<F1>", dap.step_into, { desc = "Debug: Step Into" })
-    vim.keymap.set("n", "<F2>", dap.step_over, { desc = "Debug: Step Over" })
-    vim.keymap.set("n", "<F3>", dap.step_out, { desc = "Debug: Step Out" })
-    vim.keymap.set("n", "<leader>Db", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" })
-    vim.keymap.set(
-      "n",
-      "<leader>DB",
-      function() dap.set_breakpoint(vim.fn.input("Breakpoint condition: ")) end,
-      { desc = "Debug: Set Breakpoint" }
-    )
-
-    -- 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 = "⏏",
-        },
-      },
-    })
-
-    -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
-    vim.keymap.set("n", "<F7>", dapui.toggle, { desc = "Debug: See last session result." })
-
-    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,81 +1,20 @@
 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({})`
-    { "j-hui/fidget.nvim", 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-origami.lua

@@ -1,9 +0,0 @@
-return {
-  "chrisgrieser/nvim-origami",
-  event = "BufReadPost", -- later or on keypress would prevent saving folds
-  opts = {
-    keepFoldsAcrossSessions = true,
-    pauseFoldsOnSearch = true,
-    setupFoldKeymaps = true,
-  },
-}

config/nvim/lua/plugins/nvim-regexplainer.lua

@@ -1,5 +0,0 @@
-return {
-  "bennypowers/nvim-regexplainer",
-  opts = {},
-  ft = { "html", "javascript", "javascriptreact", "typescript", "typescriptreact" },
-}

config/nvim/lua/plugins/nvim-surround.lua

@@ -1,17 +0,0 @@
---[[
-    Old text                    Command         New text
---------------------------------------------------------------------------------
-    surround_words              ysiw)           (surround_words)
-    make strings               ys$"            "make strings"
-    [delete ar*ound me!]        ds]             delete around me!
-    "change quot*es"            cs'"            "change quotes"
-    <b>or tag* types</b>        csth1<CR>       <h1>or tag types</h1>
-    delete(functi*on calls)     dsf             function calls
-]]
-
-return {
-  "kylechui/nvim-surround",
-  version = "*", -- Use for stability; omit to use `main` branch for the latest features
-  event = "VeryLazy",
-  config = function() require("nvim-surround").setup() end,
-}

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

@@ -1,9 +0,0 @@
-return {
-  "nvim-treesitter/nvim-treesitter-context",
-  lazy = false,
-  enabled = true,
-  opts = {
-    enable = true,
-    mode = "cursor", -- cursor, or topline
-  },
-}

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

@@ -1,110 +0,0 @@
--- Treesitter (more highlight for syntax_on).
-
-return {
-  "nvim-treesitter/nvim-treesitter",
-  build = ":TSUpdate",
-  config = function()
-    require("nvim-treesitter.configs").setup({
-      -- Add languages to be installed here that you want installed for treesitter
-      ensure_installed = {
-        "bash",
-        "c",
-        "cmake",
-        "comment",
-        "diff",
-        "dockerfile",
-        "gitignore",
-        "go",
-        "graphql",
-        "html",
-        "javascript",
-        "json",
-        "json5",
-        "latex",
-        "lua",
-        "markdown",
-        "php",
-        "phpdoc",
-        "python",
-        "regex",
-        "scss",
-        "terraform",
-        "todotxt",
-        "toml",
-        "tsx",
-        "typescript",
-        "vim",
-        "vimdoc",
-        "vue",
-        "yaml",
-      },
-
-      -- Autoinstall languages that are not installed.
-      auto_install = true,
-
-      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,
-          lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
-          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,
-          set_jumps = true, -- whether to set jumps in the jumplist
-          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,
-}

config/nvim/lua/plugins/pretty-fold.lua

@@ -1,55 +0,0 @@
--- Fold code.
-
-return {
-  "anuvyklack/pretty-fold.nvim",
-  config = {
-    fill_char = "•",
-    sections = {
-      left = {
-        "content",
-      },
-      right = {
-        " ",
-        "number_of_folded_lines",
-        ": ",
-        "percentage",
-        " ",
-        function(config) return config.fill_char:rep(3) end,
-      },
-    },
-
-    remove_fold_markers = false,
-
-    -- Keep the indentation of the content of the fold string.
-    keep_indentation = true,
-
-    -- Possible values:
-    -- "delete" : Delete all comment signs from the fold string.
-    -- "spaces" : Replace all comment signs with equal number of spaces.
-    -- false    : Do nothing with comment signs.
-    process_comment_signs = "spaces",
-
-    -- Comment signs additional to the value of `&commentstring` option.
-    comment_signs = {
-      { "/**", "*/" }, -- multiline comment
-      { "<!--", "-->" }, -- multiline comment
-      { "%--[[", "--]]" }, -- multiline comment
-    },
-
-    -- List of patterns that will be removed from content foldtext section.
-    stop_words = {
-      "@brief%s*", -- (for C++) Remove '@brief' and all spaces after.
-    },
-
-    add_close_pattern = true,
-    matchup_patterns = {
-      { "{", "}" },
-      { "%(", ")" }, -- % to escape lua pattern char
-      { "%[", "]" }, -- % to escape lua pattern char
-      { "if%s", "end" },
-      { "do%s", "end" },
-      { "for%s", "end" },
-      { "function%s*%(", "end" }, -- 'function(' or 'function ('
-    },
-  },
-}

config/nvim/lua/plugins/project.lua

@@ -1,14 +0,0 @@
-return {
-  {
-    "jay-babu/project.nvim",
-    name = "project_nvim",
-    event = "VeryLazy",
-    opts = { ignore_lsp = { "lua_ls" } },
-  },
-  {
-    "nvim-telescope/telescope.nvim",
-    optional = true,
-    dependencies = { "project_nvim" },
-    opts = function() require("telescope").load_extension("projects") end,
-  },
-}

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

@@ -1,97 +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/smartcolumn.lua

@@ -1,7 +0,0 @@
-return {
-  "m4xshen/smartcolumn.nvim",
-  opts = {
-    colorcolumn = { "80", "100", "120" },
-    disabled_filetypes = { "help", "text", "markdown", "json", "lazy", "starter", "neo-tree" },
-  },
-}