chore(config): tweak alacritty config

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

.gitmodules

@@ -58,3 +58,6 @@
 [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,6 +10,9 @@ 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

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
@@ -110,3 +104,11 @@ 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

@@ -332,7 +332,7 @@ mouse = "Middle"
 semantic_escape_chars = ",│`|:\"' ()[]{}<>"
 
 [window]
-decorations = "none"
+decorations = "Buttonless"
 dynamic_title = true
 opacity = 0.98
 

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
@@ -99,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/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

@@ -6,9 +6,7 @@ tap "gesquive/tap"
 tap "github/gh"
 tap "homebrew/autoupdate"
 tap "homebrew/bundle"
-tap "homebrew/cask"
 tap "homebrew/cask-fonts"
-tap "homebrew/core"
 tap "homebrew/services"
 tap "jesseduffield/lazygit"
 tap "keith/formulae"
@@ -37,14 +35,10 @@ brew "aom"
 brew "apr"
 # Mozilla CA certificate store
 brew "ca-certificates"
-# Cryptography and SSL/TLS Toolkit
-brew "openssl@3"
 # 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"
 # Spell checker with better logic than ispell
 brew "aspell"
 # Automatic configure script builder
@@ -53,8 +47,6 @@ brew "autoconf"
 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"
 # Software library to render fonts
@@ -65,6 +57,8 @@ brew "fontconfig"
 brew "gettext"
 # Core application library for C
 brew "glib"
+# Mozilla CA bundle for Python
+brew "certifi"
 # Human-friendly and fast alternative to cut and (sometimes) awk
 brew "choose-rust"
 # Cross-platform make
@@ -73,8 +67,6 @@ brew "cmake"
 brew "gmp"
 # GNU File, Shell, and Text utilities
 brew "coreutils"
-# Get, unpack, build, and install modules from CPAN
-brew "cpanminus"
 # Open source suite of directory software
 brew "openldap"
 # Get a file from an HTTP, HTTPS or FTP server
@@ -129,6 +121,8 @@ 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
@@ -157,14 +151,12 @@ brew "jq"
 brew "krb5"
 # Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
 brew "legitify"
+# Secure hashing function
+brew "libb2"
 # Postgres C API library
 brew "libpq"
-# Manage compile and link flags for libraries
-brew "pkg-config"
 # YAML Parser
 brew "libyaml"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.11"
 # Package manager for the Lua programming language
 brew "luarocks"
 # LZMA-based compression program similar to gzip or bzip2
@@ -175,22 +167,12 @@ brew "m-cli"
 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
-brew "nvm"
-# Development kit for the Java programming language
-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"
-# Highly capable, feature-rich programming language
-brew "perl"
+# Manage compile and link flags for libraries
+brew "pkg-config"
 # Coreutils progress viewer
 brew "progress"
 # Python version management
@@ -199,10 +181,12 @@ brew "pyenv"
 brew "pyenv-pip-migrate"
 # Pyenv plugin to manage virtualenv
 brew "pyenv-virtualenv"
+# Cryptographic recipes and primitives for Python
+brew "python-cryptography"
+# 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
@@ -215,8 +199,6 @@ brew "shfmt"
 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
@@ -243,45 +225,15 @@ brew "watch"
 brew "wget"
 # 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"
-# 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"
 brew "keith/formulae/reminders-cli"
-# 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"
 # 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
@@ -290,8 +242,6 @@ cask "dbeaver-community"
 cask "dbngin"
 # 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
@@ -344,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
@@ -370,7 +314,5 @@ cask "visual-studio-code"
 cask "vlc"
 # Spell-checking service for Finnish
 cask "voikkospellservice"
-# Rust-based terminal
-cask "warp"
 # Application for generating TOTP and HOTP codes
 cask "yubico-authenticator"

config/nvim/lazyvim.json

@@ -2,11 +2,10 @@
   "extras": [
     "lazyvim.plugins.extras.coding.copilot",
     "lazyvim.plugins.extras.coding.yanky",
-    "lazyvim.plugins.extras.editor.aerial",
     "lazyvim.plugins.extras.editor.leap",
-    "lazyvim.plugins.extras.editor.symbols-outline",
     "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",
@@ -20,10 +19,12 @@
     "lazyvim.plugins.extras.ui.edgy",
     "lazyvim.plugins.extras.ui.mini-animate",
     "lazyvim.plugins.extras.util.dot",
-    "lazyvim.plugins.extras.vscode"
+    "lazyvim.plugins.extras.vscode",
+    "lazyvim.plugins.extras.editor.aerial",
+    "lazyvim.plugins.extras.editor.outline"
   ],
   "news": {
-    "NEWS.md": "2123"
+    "NEWS.md": "3314"
   },
-  "version": 2
+  "version": 3
 }

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

@@ -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
 }

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/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"
 }