chore(nvim): update nvim-kickstart submodule

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

.gitmodules

@@ -41,7 +41,7 @@
 	ignore = dirty
 [submodule "tmux/tmux-window-name"]
 	path = config/tmux/plugins/tmux-window-name
-	url = https://github.com/ofirgall/tmux-window-name.git
+	url = https://github.com/ivuorinen/tmux-window-name.git
 	ignore = dirty
 [submodule "dotbot-pip"]
 	path = tools/dotbot-pip
@@ -55,3 +55,9 @@
 [submodule "tmux/tmux-current-pane-hostname"]
 	path = config/tmux/plugins/tmux-current-pane-hostname
 	url = https://github.com/soyuka/tmux-current-pane-hostname.git
+[submodule "cheat-tldr"]
+	path = config/cheat/cheatsheets/tldr
+	url = https://github.com/ivuorinen/cheatsheet-tldr.git
+[submodule "nvim-kickstart"]
+	path = config/nvim-kickstart
+	url = https://github.com/ivuorinen/kickstart.nvim

add-submodules.sh

@@ -10,9 +10,14 @@ git submodule add --name dotbot-include \
 git submodule add --name dotbot-pip \
   -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip
 
+git submodule add --name nvim-kickstart \
+  -f https://github.com/ivuorinen/kickstart.nvim config/nvim-kickstart
+
 # other repos
 git submodule add --name cheat-community \
   -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
+git submodule add --name cheat-tldr \
+  -f https://github.com/ivuorinen/cheatsheet-tldr.git config/cheat/cheatsheets/tldr
 
 # tmux plugin manager and plugins
 git submodule add --name tmux/tmux-continuum \
@@ -28,7 +33,7 @@ git submodule add --name tmux/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
+  -f https://github.com/ivuorinen/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/tmux-current-pane-hostname \

base/bashrc

@@ -34,5 +34,8 @@ x-have rbenv && {
   eval "$(rbenv init - bash)"
 }
 
-eval "$(starship init bash)"
+# eval "$(starship init bash)"
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init bash --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+}
 source "$DOTFILES/config/alias"

base/huskyrc

@@ -1,6 +1,6 @@
 #!/bin/env bash
 
-export NVM_DIR="$HOME/.nvm"
+[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.config/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
 

base/zshrc

@@ -61,17 +61,11 @@ antigen bundle jreese/zsh-titles
 antigen bundle zsh-users/zsh-completions
 
 # these should be available if there's need
-# x-have brew && antigen bundle brew
-# x-have php && antigen bundle php
 x-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
@@ -85,6 +79,12 @@ x-have rbenv && {
   eval "$(rbenv init - zsh)"
 }
 
+x-have pyenv && {
+  [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+  eval "$(pyenv init -)"
+  eval "$(pyenv virtualenv-init -)"
+}
+
 # Run only if tmux is active
 [[ -n "$TMUX" ]] && {
   # Autoupdate tmux window name
@@ -100,5 +100,15 @@ x-have rbenv && {
 }
 
 # eval "$(starship init zsh)"
-eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+}
 source "$DOTFILES/config/alias"
+
+# Herd checks for a few environment variables to inject PHP binaries and configurations.
+# Herd injected PHP binary.
+# export PATH="/Users/ivuorinen/Library/Application Support/Herd/bin/":$PATH
+# Herd injected PHP 8.3 configuration.
+# export HERD_PHP_83_INI_SCAN_DIR="/Users/ivuorinen/Library/Application Support/Herd/config/php/83/"
+# Herd injected PHP 7.4 configuration.
+# export HERD_PHP_74_INI_SCAN_DIR="/Users/ivuorinen/Library/Application Support/Herd/config/php/74/"

config/alacritty/alacritty.toml

@@ -324,21 +324,26 @@ chars = "\u0002/"
 key = "F"
 mods = "Command"
 
+[mouse]
+hide_when_typing = true
+
 [[mouse.bindings]]
 action = "PasteSelection"
 mouse = "Middle"
 
 [selection]
 semantic_escape_chars = ",│`|:\"' ()[]{}<>"
+save_to_clipboard = true
 
 [window]
-decorations = "none"
+decorations = "Full"
 dynamic_title = true
 opacity = 0.98
+blur = true
 
 [window.dimensions]
 columns = 200
-lines = 100
+lines = 75
 
 [window.padding]
 x = 5

config/alias

@@ -51,6 +51,10 @@ alias tmux='tmux new-session -A -s main'
 # tmux: attach or create new session
 alias ta='tmux attach || tmux'
 
+# nvim
+alias nvim-ks='NVIM_APPNAME="nvim-kickstart" nvim'
+alias ks='NVIM_APPNAME="nvim-kickstart" nvim'
+
 # watch with: differences, precise, beep and color
 alias watchx='watch -dpbc'
 # delete .DS_Store files
@@ -75,6 +79,8 @@ alias code_scanner='docker run
   registry.gitlab.com/gitlab-org/ci-cd/codequality:"${CODEQUALITY_VERSION:-latest}"
   /code'
 
+alias trivy_scan='docker run -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/Library/Caches:/root/.cache/ aquasec/trivy'
+
 alias zedit='$EDITOR ~/.dotfiles'
 
 alias irssi="irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_CONFIG_HOME/irssi"
@@ -97,7 +103,8 @@ if [[ $(uname) == 'Darwin' ]]; then
   # Also, clear Apple's System Logs to improve shell startup speed
   alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
 
-  x-set-php-aliases
+  # Using herd for php now, so this is not needed anymore
+  # x-set-php-aliases
 fi
 
 # Alacritty preexec hook to update dynamic title

config/cheat/conf.yml

@@ -72,7 +72,7 @@ cheatpaths:
     tags: [pure-bash-bible]
     readonly: true
   - name: tldr
-    path: ~/.dotfiles/config/cheat/cheatsheets/tldr
+    path: ~/.dotfiles/config/cheat/cheatsheets/tldr/tldr
     tags: [tldr]
     readonly: true
 # While it requires no configuration here, it's also worth noting that

config/exports

@@ -52,5 +52,9 @@ have_brew()
   fi
 }
 
+if [[ -f "$DOTFILES/config/exports-secret" ]]; then
+  source "$DOTFILES/config/exports-secret"
+fi
+
 source "$DOTFILES/config/exports-shell"
 source "$DOTFILES/config/exports-apps"

config/exports-apps

@@ -29,6 +29,8 @@ export BKT_TTL=1m
 
 # brew, https://docs.brew.sh/Manpage
 export HOMEBREW_NO_ENV_HINTS=true
+export HOMEBREW_BUNDLE_MAS_SKIP=true
+export HOMEBREW_BUNDLE_FILE="$XDG_CONFIG_HOME/homebrew/Brewfile"
 
 # composer, https://getcomposer.org/
 export COMPOSER_HOME="$XDG_STATE_HOME/composer"
@@ -52,6 +54,17 @@ export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export GOPATH="$XDG_DATA_HOME/go"
 export GOBIN="$XDG_BIN_HOME"
 
+# Herd, herd.laravel.com
+# Herd injected PHP binary.
+export PATH="$HOME/Library/Application Support/Herd/bin/":$PATH
+
+x-have herd && {
+  # Herd injected PHP 8.3 configuration.
+  export HERD_PHP_83_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/83/"
+  # Herd injected PHP 7.4 configuration.
+  export HERD_PHP_74_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/74/"
+}
+
 # nb, https://xwmx.github.io/nb/
 export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
 export NB_DIR="$XDG_STATE_HOME/nb"
@@ -70,8 +83,8 @@ export OP_CACHE="$XDG_STATE_HOME/1password"
 # pyenv, python environments
 export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
 export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
+export PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
 x-have pyenv && {
-  export PATH="$PYENV_ROOT/shims:$PATH"
   eval "$(pyenv init -)"
 }
 

config/homebrew/Brewfile

@@ -15,14 +15,6 @@ tap "shivammathur/extensions"
 tap "shivammathur/php"
 tap "teamookla/speedtest"
 tap "xwmx/taps"
-# Run your GitHub Actions locally
-brew "act"
-# Mozilla CA certificate store
-brew "ca-certificates"
-# YAML Parser
-brew "libyaml"
-# Checks ansible playbooks for practices and behaviour
-brew "ansible-lint"
 # Generic-purpose lossless compression algorithm by Google
 brew "brotli"
 # Library and utilities for processing GIFs
@@ -41,36 +33,22 @@ brew "jpeg-xl"
 brew "aom"
 # Apache Portable Runtime library
 brew "apr"
+# Mozilla CA certificate store
+brew "ca-certificates"
 # Companion library to apr, the Apache Portable Runtime library
 brew "apr-util"
 # Password hashing library and CLI utility
 brew "argon2"
-# Open Source Kubernetes Marketplace
-brew "arkade"
-# Automatic configure script builder
-brew "autoconf"
-# GNU multiple precision arithmetic library
-brew "gmp"
-# GNU File, Shell, and Text utilities
-brew "coreutils"
-# Extendable version manager with support for Ruby, Node.js, Erlang & more
-brew "asdf"
 # Spell checker with better logic than ispell
 brew "aspell"
-# Interpreted, interactive, object-oriented programming language
+# Automatic configure script builder
-brew "python@3.11"
+brew "autoconf"
-# Official Amazon AWS command-line interface
-brew "awscli"
 # Bourne-Again SHell, a UNIX command interpreter
 brew "bash"
 # Clone of cat(1) with syntax highlighting and Git integration
 brew "bat"
-# 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
-brew "brew-php-switcher"
 # Software library to render fonts
 brew "freetype"
 # XML-based font configuration API for X Windows
@@ -79,40 +57,26 @@ brew "fontconfig"
 brew "gettext"
 # Core application library for C
 brew "glib"
-# Manage compile and link flags for libraries
+# Mozilla CA bundle for Python
-brew "pkg-config"
+brew "certifi"
 # Human-friendly and fast alternative to cut and (sometimes) awk
 brew "choose-rust"
 # Cross-platform make
 brew "cmake"
-# Get, unpack, build, and install modules from CPAN
+# GNU multiple precision arithmetic library
-brew "cpanminus"
+brew "gmp"
+# GNU File, Shell, and Text utilities
+brew "coreutils"
 # Open source suite of directory software
 brew "openldap"
 # Get a file from an HTTP, HTTPS or FTP server
 brew "curl"
-# Diff that understands syntax
-brew "difftastic"
-# Tool for exploring each layer in a docker image
-brew "dive"
 # Lightweight DNS forwarder and DHCP server
 brew "dnsmasq"
-# Command-line DNS client
-brew "dog"
 # Lightning-fast linter for .env files written in Rust
 brew "dotenv-linter"
-# Tool to verify that your files are in harmony with your .editorconfig
-brew "editorconfig-checker", link: false
-# Useful examples at the command-line
-brew "eg-examples"
-# OpenType text shaping engine
-brew "harfbuzz"
-# Development kit for the Java programming language
-brew "openjdk"
 # Spellchecker wrapping library
 brew "enchant"
-# Run arbitrary commands when files change
-brew "entr"
 # Perl lib for reading and writing EXIF metadata
 brew "exiftool"
 # Simple, fast and user-friendly alternative to find
@@ -128,7 +92,7 @@ brew "fzf"
 # Graphics library to dynamically manipulate images
 brew "gd"
 # Disk usage analyzer with console interface written in Go
-brew "gdu", link: false
+brew "gdu"
 # GitHub command-line tool
 brew "gh"
 # Distributed revision control system
@@ -139,8 +103,6 @@ brew "git-crypt"
 brew "git-extras"
 # See your latest local git branches, formatted real fancy
 brew "git-recent"
-# Open-source GitLab command-line tool
-brew "glab"
 # Render markdown on the CLI
 brew "glow"
 # GNU implementation of the famous stream editor
@@ -159,6 +121,10 @@ 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
@@ -173,10 +139,6 @@ brew "gzip"
 brew "hadolint"
 # Improved top (interactive process viewer)
 brew "htop"
-# Website copier/offline browser
-brew "httrack"
-# Configurable static site generator
-brew "hugo"
 # ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
 brew "libheif"
 # Tools and libraries to manipulate images in many formats
@@ -187,80 +149,56 @@ brew "irssi"
 brew "jq"
 # Network authentication protocol
 brew "krb5"
-# Lazier way to manage everything docker
+# Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
-brew "lazydocker"
+brew "legitify"
+# Secure hashing function
+brew "libb2"
 # Postgres C API library
 brew "libpq"
-# Linguistic software and Finnish dictionary
+# YAML Parser
-brew "libvoikko"
+brew "libyaml"
-# Rainbows and unicorns in your console!
-brew "lolcat"
 # Package manager for the Lua programming language
 brew "luarocks"
 # LZMA-based compression program similar to gzip or bzip2
 brew "lzip"
 # Swiss Army Knife for macOS
 brew "m-cli"
-# Mac App Store command-line interface
-brew "mas"
 # Mongrel of mail user agents (part elm, pine, mush, mh, etc.)
 brew "mutt"
 # NCurses Disk Usage
 brew "ncdu"
-# Ambitious Vim-fork focused on extensibility and agility
-brew "neovim"
 # HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
 brew "nginx"
 # Port scanning utility for large networks
 brew "nmap"
-# Manage multiple Node.js versions
+# Manage compile and link flags for libraries
-brew "nvm"
+brew "pkg-config"
-# Development kit for the Java programming language
-brew "openjdk@11"
-# Generate clients, server & docs from an OpenAPI spec (v2, v3)
-brew "openapi-generator"
-# Swiss-army knife of markup format conversion
-brew "pandoc"
-# Highly capable, feature-rich programming language
-brew "perl"
-# General-purpose scripting language
-brew "php@8.1"
 # Coreutils progress viewer
 brew "progress"
-# Simple Python style checker in one Python file
-brew "pycodestyle"
 # Python version management
 brew "pyenv"
 # Migrate pip packages from one Python version to another
 brew "pyenv-pip-migrate"
 # Pyenv plugin to manage virtualenv
 brew "pyenv-virtualenv"
-# Interpreted, interactive, object-oriented programming language
+# Cryptographic recipes and primitives for Python
-brew "python@3.10"
+brew "python-cryptography"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.8"
 # Install various Ruby versions and implementations
 brew "ruby-build"
 # Ruby version manager
 brew "rbenv"
-# RC file (dotfile) management
-brew "rcm"
 # Search tool like grep and The Silver Searcher
 brew "ripgrep"
+# Safe, concurrent, practical language
+brew "rust"
 # Static analysis and lint tool, for (ba)sh scripts
 brew "shellcheck"
 # Autoformat shell script source code
 brew "shfmt"
-# Support CI generation of SBOMs via golang tooling
-brew "spdx-sbom-generator"
-# Version control system designed to be a better CVS
-brew "subversion"
 # Feature-rich console based todo list manager
 brew "task"
 # Terminal user interface for taskwarrior
 brew "taskwarrior-tui"
-# Very fast implementation of tldr in Rust
-brew "tealdeer"
 # Send macOS User Notifications from the command-line
 brew "terminal-notifier"
 # Thin wrapper for Terraform e.g. for locking state
@@ -273,91 +211,37 @@ brew "tfenv"
 brew "tflint"
 # Static analysis security scanner for your terraform code
 brew "tfsec"
-# Programmatically correct mistyped console commands
-brew "thefuck"
 # Terminal multiplexer
 brew "tmux"
 # Display directories as trees (with optional color/HTML output)
 brew "tree"
-# Vulnerability scanner for container images, file systems, and Git repos
-brew "trivy"
-# Modern watch command
-brew "viddy"
 # Tool for creating isolated virtual python environments
 brew "virtualenv"
 # Command-line interface to the WakaTime api
 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
-brew "wtfutil"
 # Check your $HOME for unwanted files and directories
 brew "xdg-ninja", args: ["HEAD"]
-# Hackable, minimal, fast TUI file explorer
-brew "xplr"
 # JavaScript package manager
 brew "yarn"
-# A vulnerability scanner for container images and filesystems
-brew "anchore/grype/grype"
-# High-performance load testing tool, written in Golang.
-brew "ddosify/tap/ddosify"
 # lets you quickly switch between multiple git user profiles
 brew "gesquive/tap/git-user"
-# A simple terminal UI for git commands, written in Go
-brew "jesseduffield/lazygit/lazygit"
 brew "keith/formulae/reminders-cli"
-# High-performance, schema-free, document-oriented database
-brew "mongodb/brew/mongodb-community"
-# Imagick PHP extension
-brew "shivammathur/extensions/imagick@8.2"
-# Imagick PHP extension
-brew "shivammathur/extensions/imagick@8.3"
-# Mcrypt PHP extension
-brew "shivammathur/extensions/mcrypt@8.3"
-# PCOV PHP extension
-brew "shivammathur/extensions/pcov@8.3"
-# Redis PHP extension
-brew "shivammathur/extensions/redis@8.3"
-# Uuid PHP extension
-brew "shivammathur/extensions/uuid@8.3"
-# Xdebug PHP extension
-brew "shivammathur/extensions/xdebug@7.4"
-# Xdebug PHP extension
-brew "shivammathur/extensions/xdebug@8.0"
-# Xdebug PHP extension
-brew "shivammathur/extensions/xdebug@8.1"
-# Yaml PHP extension
-brew "shivammathur/extensions/yaml@8.3"
-# General-purpose scripting language
-brew "shivammathur/php/php"
-# General-purpose scripting language
-brew "shivammathur/php/php@7.4"
-# General-purpose scripting language
-brew "shivammathur/php/php@8.0"
-# Ookla Speedtest
-brew "teamookla/speedtest/speedtest"
 # Command-line interface for 1Password
 cask "1password-cli"
 # GPU-accelerated terminal emulator
 cask "alacritty"
-# Automatic tiling window manager similar to xmonad
-cask "amethyst"
-# Turn audio CDs and files into audiobooks
-cask "audiobook-builder"
 # Text editor
 cask "coda"
 # Universal database tool and SQL client
 cask "dbeaver-community"
 # Database version management tool
 cask "dbngin"
-# App to build and share containerized applications and microservices
+# App to build and share containerised applications and microservices
 cask "docker"
-# UI toolkit for building applications for mobile, web and desktop
-cask "flutter"
 # Unofficial overcast.fm podcast app
 cask "fog"
 # Typeface made for developers
@@ -376,8 +260,6 @@ cask "font-source-serif-pro"
 cask "fontplop"
 # GIT client
 cask "fork"
-# Set of tools to manage resources and applications hosted on Google Cloud
-cask "google-cloud-sdk"
 # HTTP and GraphQL Client
 cask "insomnia"
 # JetBrains tools manager
@@ -394,7 +276,7 @@ cask "ngrok"
 cask "notunes"
 # Knowledge base that works on top of a local folder of plain text Markdown files
 cask "obsidian"
-# Scheduling application focusing on organization
+# Scheduling application focusing on organisation
 cask "omnifocus"
 # Collaboration platform for API development
 cask "postman"
@@ -412,12 +294,6 @@ cask "quicklookase"
 cask "quitter"
 # Control your tools with a few keystrokes
 cask "raycast"
-# Move and resize windows using keyboard shortcuts or snap areas
-cask "rectangle"
-# GUI for rsync
-cask "rsyncosx"
-# GUI for rsync
-cask "rsyncui"
 # MySQL/MariaDB database management
 cask "sequel-ace"
 # Plugin for AWS CLI to start and end sessions that connect to managed instances
@@ -438,5 +314,5 @@ cask "visual-studio-code"
 cask "vlc"
 # Spell-checking service for Finnish
 cask "voikkospellservice"
-# Rust-based terminal
+# Application for generating TOTP and HOTP codes
-cask "warp"
+cask "yubico-authenticator"

config/nvim/lazyvim.json

@@ -3,10 +3,13 @@
     "lazyvim.plugins.extras.coding.copilot",
     "lazyvim.plugins.extras.coding.yanky",
     "lazyvim.plugins.extras.editor.aerial",
+    "lazyvim.plugins.extras.editor.outline",
+    "lazyvim.plugins.extras.editor.harpoon2",
     "lazyvim.plugins.extras.editor.leap",
-    "lazyvim.plugins.extras.editor.symbols-outline",
+    "lazyvim.plugins.extras.editor.refactoring",
     "lazyvim.plugins.extras.formatting.black",
     "lazyvim.plugins.extras.formatting.prettier",
+    "lazyvim.plugins.extras.lang.ansible",
     "lazyvim.plugins.extras.lang.docker",
     "lazyvim.plugins.extras.lang.go",
     "lazyvim.plugins.extras.lang.json",
@@ -15,15 +18,18 @@
     "lazyvim.plugins.extras.lang.tailwind",
     "lazyvim.plugins.extras.lang.terraform",
     "lazyvim.plugins.extras.lang.typescript",
+    "lazyvim.plugins.extras.lang.vue",
     "lazyvim.plugins.extras.lang.yaml",
     "lazyvim.plugins.extras.linting.eslint",
     "lazyvim.plugins.extras.ui.edgy",
     "lazyvim.plugins.extras.ui.mini-animate",
     "lazyvim.plugins.extras.util.dot",
-    "lazyvim.plugins.extras.vscode"
+    "lazyvim.plugins.extras.util.mini-hipatterns",
+    "lazyvim.plugins.extras.editor.aerial",
+    "lazyvim.plugins.extras.editor.outline"
   ],
   "news": {
-    "NEWS.md": "2123"
+    "NEWS.md": "5204"
   },
-  "version": 2
+  "version": 6
 }

config/nvim/lua/plugins/ui.lua

@@ -1,5 +1,24 @@
 -- luacheck: globals vim
 return {
+  -- Neotree configuration
+  {
+    "nvim-neo-tree/neo-tree.nvim",
+    opts = {
+      filesystem = {
+        filtered_items = {
+          always_show = {
+            ".github",
+            ".gitignore",
+            ".editorconfig",
+            ".python-version",
+            ".nvmrc",
+            ".env",
+            ".env.example",
+          },
+        },
+      },
+    },
+  },
   -- Cloak allows you to overlay *'s over defined patterns in defined files.
   -- https://github.com/laytan/cloak.nvim
   { "laytan/cloak.nvim" },

config/oh-my-posh.omp.json

@@ -34,7 +34,7 @@
           "type": "git",
           "style": "plain",
           "foreground": "lightGreen",
-          "template": "git({{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }})",
+          "template": "{{ .UpstreamIcon }}{{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uF046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}){{ end }}",
           "properties": {
             "fetch_status": true,
             "fetch_upstream_icon": true,
@@ -130,21 +130,5 @@
     "foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
     "template": "\u279c "
   },
-  "tooltips": [
-    {
-      "type": "git",
-      "tips": ["git", "g"],
-      "style": "diamond",
-      "foreground": "#193549",
-      "background": "#fffb38",
-      "leading_diamond": "",
-      "trailing_diamond": "",
-      "template": "{{ .HEAD }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}",
-      "properties": {
-        "fetch_status": true,
-        "fetch_upstream_icon": true
-      }
-    }
-  ],
   "version": 2
 }

config/tmux/tmux.conf

@@ -47,6 +47,7 @@ bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
 bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
 bind '"' split-window -v -c "#{pane_current_path}"
 bind '!' split-window -h -c "#{pane_current_path}"
+bind '^' switch-client -t'{marked}'
 
 # synchronize all panes in a window
 bind y setw synchronize-panes
@@ -70,9 +71,22 @@ bind p paste-buffer
 # Setting status on
 set -g status "on"
 
+# Hide clock
+set -g display-time 0
+
+# Activity Monitoring (for when something happens in another pain)
+set -g monitor-activity on
+set -g visual-activity on
+
 # Expose window title
 set-option -g set-titles on
 
+# Set bigger history limit
+set -g history-limit 20000
+
+# Keep Tmux alive when the initial command is finished
+set -g remain-on-exit off
+
 # Mouse support
 set -g mouse on
 
@@ -92,21 +106,21 @@ set-window-option -g mode-keys vi
 #  │ Theme                                                    │
 #  ╰──────────────────────────────────────────────────────────╯
 
-# Make sure status sides are long enough and centered is in the middle
+set -g status-left-length "0"
-set -g status-left-length "30"
 set -g status-right-length "30"
 
 set-option -g status-position "bottom"
 set-option -g status-style 'bg=default,fg=#ffffff'
-set-option -g status-justify centre
+set-option -g status-justify left
-set-option -g status-left '#h '
+set-option -g status-left ''
 set-window-option -g window-status-style 'fg=#ffffff,bg=default'
 set-option -g window-status-format ' #I:#W '
 set-window-option -g window-status-current-style 'fg=#111111,bg=#7aa2f7'
 set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag,  , } '
 
-set-option -g status-left "#{?#{pane_ssh_connected},#{hostname_short}/,}#S"
+set-option -g status-right "#{hostname_short}/#S #{tmux_mode_indicator}"
-set-option -g status-right "%H:%M #{tmux_mode_indicator}"
+
+set -g message-style 'fg=colour2 bg=colour0 bold'
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins related configurations                           │
@@ -120,19 +134,20 @@ set -g @suspend_key 'F12'
 ##  A plugin to name your tmux windows smartly.
 ## https://github.com/ofirgall/tmux-window-name
 ### Maximum name length of a window
-set -g @tmux_window_name_max_name_len "30"
+set -g @tmux_window_name_max_name_len "20"
 ### Replace $HOME with ~ in window names
 set -g @tmux_window_name_use_tilde "True"
 set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']"
 set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
-set -g @tmux_window_name_ignored_programs "['sqlite3']" # Default is []
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases']" # Default is []
+set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3')]"
 
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'
 
 ## https://github.com/tmux-plugins/tmux-resurrect
 set -g @resurrect-strategy-nvim 'session'
-set -g @resurrect-dir '$HOME/.local/state/tmux/tmux-resurrect'
+set -g @resurrect-dir '~/.local/state/tmux/tmux-resurrect'
 
 ## https://github.com/MunifTanjim/tmux-mode-indicator
 set -g @mode_indicator_prefix_mode_style 'bg=default,fg=#7aa2f7'

local/bin/dfm

@@ -213,6 +213,8 @@ function section_brew
     "update:Updates and upgrades brew packages"
     "updatebundle:Updates Brewfile with descriptions"
     "autoupdate:Setups brew auto-update and runs it immediately"
+    "leaves:List brew leaves (installed on request)"
+    "clean:Clean up brew packages"
   )
 
   x-have brew && {
@@ -225,12 +227,18 @@ function section_brew
         msg_yay "Done!"
         ;;
       updatebundle)
-        # Updates .dotfiles/Brewfile with descriptions
+        # Updates .dotfiles/homebrew/Brewfile with descriptions
         brew bundle dump \
           --force \
           --file="$BREWFILE" \
           --describe && msg_yay "Done!"
         ;;
+      leaves)
+        brew leaves --installed-on-request
+        ;;
+      clean)
+        brew bundle cleanup --file="$BREWFILE" && msg_yay "Done!"
+        ;;
       autoupdate)
         brew autoupdate delete
         brew autoupdate start 43200 --upgrade --cleanup --immediate

local/bin/python

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

local/bin/x-gh-get-latest-release-targz

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+REPO=$1
+
+if [ -z "$REPO" ]; then
+  echo "Usage: $0 <repo> (e.g. ivuorinen/dotfiles)"
+  exit 1
+fi
+
+LOCATION=$(curl -s "https://api.github.com/repos/${REPO}/releases/latest" \
+  | sed -Ene '/^[[:blank:]]+"tarball_url":[[:blank:]]"(https:[^"]+)",/s//\1/p')
+
+echo "Downloading and extracting from: $LOCATION"
+
+curl --location --silent "$LOCATION" | tar --extract --gzip --file=-
+
+# vim: set ts=2 sw=2 ft=sh et:

local/bin/x-gh-get-latest-version

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+REPO=$1
+
+if [ -z "$REPO" ]; then
+  echo "Usage: $0 <repo> (e.g. ivuorinen/dotfiles)"
+  exit 1
+fi
+
+VERSION=$(
+  curl -s "https://api.github.com/repos/${REPO}/releases/latest" \
+    | grep "tag_name" \
+    | awk '{print substr($2, 2, length($2)-3)}'
+)
+
+echo "$VERSION"
+
+# vim: set ts=2 sw=2 ft=sh et:

package.json

@@ -29,5 +29,6 @@
   "homepage": "https://github.com/ivuorinen/dotfiles#readme",
   "devDependencies": {
     "@ivuorinen/base-configs": "^1.1.0"
-  }
+  },
+  "packageManager": "yarn@1.22.22"
 }

scripts/install-cheat-tldr.sh

@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2231,SC2034,SC2181,SC2068
-# shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
-
-TLDR_REQUIRED_TOOLS=(git cheat)
-for t in ${TLDR_REQUIRED_TOOLS[@]}; do
-  ! x-have "$t" && echo "(!) $t is missing, can't continue..." && exit 1
-done
-
-TLDR_GIT="https://github.com/tldr-pages/tldr.git"
-TLDR_SOURCE="source: $TLDR_GIT"
-TLDR_SYNTAX="syntax: markdown"
-
-TLDR_TEMP_PREFIX=$(basename "$0")
-TLDR_TEMP_DIR="$XDG_CACHE_HOME/cheat/tldr"
-
-# If there's no .git, clone the folder
-if [ ! -d "$TLDR_TEMP_DIR/.git" ]; then
-  msg_run "Starting to clone $TLDR_GIT"
-  git clone --depth 1 --single-branch -q "$TLDR_GIT" "$TLDR_TEMP_DIR" \
-    && msg_done "Cloned $TLDR_GIT"
-else
-  # Update the repo
-  msg_run "Starting to update $TLDR_GIT"
-  git -C "$TLDR_TEMP_DIR" reset --hard origin/main
-  git -C "$TLDR_TEMP_DIR" pull -q --depth 2 \
-    && msg_done "Updated $TLDR_GIT"
-fi
-
-msg_run "Removing non-english translation files"
-rm -rf "$TLDR_TEMP_DIR/pages.*"
-
-# Fetch the destination directory from cheat defined directories.
-TLDR_CHEAT_DEST="$(cheat -d | grep tldr | head -1 | awk '{print $2}')"
-
-[ "$TLDR_CHEAT_DEST" = "" ] \
-  && msg_err "cheat doesn't know about the destination" \
-  && exit 1
-
-if [ ! -d "$TLDR_CHEAT_DEST" ]; then
-  mkdir -p "$TLDR_CHEAT_DEST"
-fi
-
-for d in "$TLDR_TEMP_DIR"/pages/*; do
-  DIRNAME=$(basename "$d")
-  # echo "-> $DIRNAME ($d)"
-
-  SECTION_DIR="${TLDR_CHEAT_DEST}/$DIRNAME"
-
-  [ "$DIRNAME" = "common" ] && SECTION_DIR="${TLDR_CHEAT_DEST}"
-
-  TLDR_TAGS="tags: [$DIRNAME]"
-
-  if [ ! -d "$SECTION_DIR" ]; then
-    mkdir -p "$SECTION_DIR"
-  fi
-
-  for FILE in $d/*.md; do
-    BASENAME=$(basename "$FILE" .md)
-    FILENAME="${BASENAME%%.*}"
-    # echo "-> $FILE = $FILENAME"
-    TLDR_FILE="$SECTION_DIR/${BASENAME}"
-    # echo "-> dest: $TLDR_FILE"
-
-    # Update the original file for making the replacable value comparable
-    if [ -f "$FILE" ] && [ '---' != "$(head -1 < "$FILE")" ]; then
-      echo -e "---\n$TLDR_SYNTAX\n$TLDR_TAGS\n$TLDR_SOURCE\n---\n$(cat "$FILE")" > "$FILE"
-    fi
-
-    replacable "$FILE" "$TLDR_FILE"
-    override=$?
-    if [ "$override" -ne 0 ]; then
-      cp "$FILE" "$TLDR_FILE" && msg_run "Updated: $TLDR_FILE"
-    fi
-
-  done
-done

ssh/config

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

ssh/shared.d/demons

@@ -0,0 +1,15 @@
+Host vine
+  User ubuntu
+  HostName vine.antiprocess.net
+  IdentityFile ~/.ssh/keys/vine.pem
+
+Host purson
+  User ubuntu
+  HostName purson.antiprocess.net
+  IdentityFile ~/.ssh/id_rsa
+
+Host paimon
+  User ivuorinen
+  HostName paimon.antiprocess.net
+  IdentityFile ~/.ssh/id_rsa
+