chore(git): Update submodules (automated)

tmux/tmux-dark-notify v0.1.0

.gitmodules

@@ -58,3 +58,9 @@
 [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
+[submodule "tmux/tmux-dark-notify"]
+	path = config/tmux/plugins/tmux-dark-notify
+	url = https://github.com/erikw/tmux-dark-notify.git

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
@@ -35,6 +38,8 @@ 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 \
   -f https://github.com/soyuka/tmux-current-pane-hostname.git config/tmux/plugins/tmux-current-pane-hostname
+git submodule add --name tmux/tmux-dark-notify \
+  -f https://github.com/erikw/tmux-dark-notify.git config/tmux/plugins/tmux-dark-notify
 
 # Takes submodules and sets them to ignore all changes
 for MODULE in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }'); do

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/zshenv

@@ -17,3 +17,5 @@ export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_RUNTIME_DIR="$HOME/.local/run"
 
 source "$DOTFILES/config/exports"
+source "$DOTFILES/config/alias"
+

config/alacritty/alacritty.toml

@@ -324,21 +324,26 @@ chars = "\u0002/"
 key = "F"
 mods = "Command"
 
+[mouse]
+hide_when_typing = false
+
 [[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

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

@@ -83,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

@@ -1,5 +1,6 @@
 tap "1password/tap"
 tap "anchore/grype"
+tap "cormacrelf/tap"
 tap "ddosify/tap"
 tap "dm3ch/tap"
 tap "gesquive/tap"
@@ -9,12 +10,18 @@ tap "homebrew/bundle"
 tap "homebrew/cask-fonts"
 tap "homebrew/services"
 tap "jesseduffield/lazygit"
+tap "k8sgpt-ai/k8sgpt"
 tap "keith/formulae"
 tap "mongodb/brew"
+tap "reviewdog/tap"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
 tap "teamookla/speedtest"
 tap "xwmx/taps"
+# Run your GitHub Actions locally
+brew "act"
+# Simple, modern, secure file encryption
+brew "age"
 # Generic-purpose lossless compression algorithm by Google
 brew "brotli"
 # Library and utilities for processing GIFs
@@ -35,6 +42,8 @@ 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
@@ -67,6 +76,8 @@ brew "cmake"
 brew "gmp"
 # GNU File, Shell, and Text utilities
 brew "coreutils"
+# Cryptographic recipes and primitives for Python
+brew "cryptography"
 # Open source suite of directory software
 brew "openldap"
 # Get a file from an HTTP, HTTPS or FTP server
@@ -139,6 +150,8 @@ brew "gzip"
 brew "hadolint"
 # Improved top (interactive process viewer)
 brew "htop"
+# Portable abstraction of the hierarchical topology of modern architectures
+brew "hwloc"
 # ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
 brew "libheif"
 # Tools and libraries to manipulate images in many formats
@@ -147,6 +160,8 @@ brew "imagemagick"
 brew "irssi"
 # Lightweight and flexible command-line JSON processor
 brew "jq"
+# Scanning your k8s clusters, diagnosing, and triaging issues in simple English
+brew "k8sgpt"
 # Network authentication protocol
 brew "krb5"
 # Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
@@ -155,6 +170,8 @@ brew "legitify"
 brew "libb2"
 # Postgres C API library
 brew "libpq"
+# Multi-platform support library with a focus on asynchronous I/O
+brew "libuv"
 # YAML Parser
 brew "libyaml"
 # Package manager for the Lua programming language
@@ -171,6 +188,8 @@ brew "ncdu"
 brew "nginx"
 # Port scanning utility for large networks
 brew "nmap"
+# General-purpose scripting language
+brew "php"
 # Manage compile and link flags for libraries
 brew "pkg-config"
 # Coreutils progress viewer
@@ -181,8 +200,8 @@ brew "pyenv"
 brew "pyenv-pip-migrate"
 # Pyenv plugin to manage virtualenv
 brew "pyenv-virtualenv"
-# Cryptographic recipes and primitives for Python
-brew "python-cryptography"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.11"
 # Install various Ruby versions and implementations
 brew "ruby-build"
 # Ruby version manager
@@ -227,9 +246,13 @@ brew "wget"
 brew "xdg-ninja", args: ["HEAD"]
 # JavaScript package manager
 brew "yarn"
+# Watcher for macOS 10.14+ light/dark mode changes
+brew "cormacrelf/tap/dark-notify"
 # lets you quickly switch between multiple git user profiles
 brew "gesquive/tap/git-user"
 brew "keith/formulae/reminders-cli"
+# Automated code review tool integrated with any code analysis tools regardless of programming language.
+brew "reviewdog/tap/reviewdog"
 # Command-line interface for 1Password
 cask "1password-cli"
 # GPU-accelerated terminal emulator
@@ -308,6 +331,8 @@ cask "soundsource"
 cask "suspicious-package"
 # Quicklook extension for source files
 cask "syntax-highlight"
+# Configuration application for the Ultimate Hacking Keyboard
+cask "uhk-agent"
 # Open-source code editor
 cask "visual-studio-code"
 # Multimedia player

config/nvim/lazyvim.json

@@ -3,27 +3,33 @@
     "lazyvim.plugins.extras.coding.copilot",
     "lazyvim.plugins.extras.coding.yanky",
     "lazyvim.plugins.extras.editor.aerial",
+    "lazyvim.plugins.extras.editor.aerial",
+    "lazyvim.plugins.extras.editor.harpoon2",
     "lazyvim.plugins.extras.editor.leap",
     "lazyvim.plugins.extras.editor.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",
     "lazyvim.plugins.extras.lang.markdown",
+    "lazyvim.plugins.extras.lang.php",
     "lazyvim.plugins.extras.lang.python",
     "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"
   ],
   "news": {
-    "NEWS.md": "2123"
+    "NEWS.md": "5204"
   },
-  "version": 3
-}
+  "version": 6
+}

config/nvim/lua/plugins/lang-php.lua

@@ -12,6 +12,7 @@ return {
     opts = function(_, opts)
       vim.list_extend(opts.ensure_installed, {
         "phpactor",
+        "intelephense",
       })
     end,
   },

config/nvim/lua/plugins/ui.lua

@@ -55,7 +55,7 @@ return {
     end,
     opts = {
       open_fold_hl_timeout = 150,
-      close_fold_kinds = { "imports", "comment" },
+      close_fold_kinds_for_ft = { "imports", "comment" },
       preview = {
         win_config = {
           border = { "", "─", "", "", "", "─", "", "" },

config/nvim/stylua.toml

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

config/tmux/theme-dark.conf

@@ -0,0 +1,5 @@
+set-option -g status-style 'bg=default,fg=#cad3f5'
+set-window-option -g window-status-style 'fg=#cad3f5,bg=default'
+set-window-option -g window-status-current-style 'fg=#cad3f5,bg=#24273a'
+set -g message-style 'fg=#c6a0f6 bg=#24273a bold'
+

config/tmux/theme-light.conf

@@ -0,0 +1,5 @@
+set-option -g status-style 'bg=#eff1f5,fg=#4c4f69'
+set-window-option -g window-status-style 'fg=#4c4f69,bg=#eff1f5'
+set-window-option -g window-status-current-style 'fg=#4c4f69,bg=#7aa2f7'
+set -g message-style 'fg=#8839ef bg=#e6e9ef bold' # fg magenta, bg black
+

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
@@ -67,12 +68,29 @@ bind p paste-buffer
 #  │ Settings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
 
+set -g default-terminal "tmux-256color"
+set -ag terminal-overrides ",xterm-256color:RGB"
+
 # 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 off
+set -g visual-bell off
+
 # 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 +110,20 @@ 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 "30"
+set -g status-left-length "0"
 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-left '#h '
-set-window-option -g window-status-style 'fg=#ffffff,bg=default'
+set-option -g status-justify left
+set-option -g status-left ''
 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 "#{hostname_short}/#S"
-set-option -g status-right "%H:%M #{tmux_mode_indicator}"
+set-option -g status-right "#{hostname_short}/#S #{tmux_mode_indicator}"
+
+# https://github.com/erikw/tmux-dark-notify
+set -g @dark-notify-theme-path-light '~/.dotfiles/config/tmux/theme-light.conf'
+set -g @dark-notify-theme-path-dark  '~/.dotfiles/config/tmux/theme-dark.conf'
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins related configurations                           │
@@ -126,6 +143,7 @@ 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', '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'
@@ -153,4 +171,5 @@ run-shell ~/.dotfiles/config/tmux/plugins/tmux-mode-indicator/mode_indicator.tmu
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-suspend/suspend.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-yank/yank.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-current-pane-hostname/current_pane_hostname.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-dark-notify/main.tmux
 

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 && {
@@ -231,6 +233,12 @@ function section_brew
           --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"
 }

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
+