chore(zsh): tweak config

tmux/tmux-dark-notify v0.1.1

.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/bashrc

@@ -30,6 +30,10 @@ x-load-configs
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null
 
+x-have antidot && {
+  eval "$(antidot init)"
+}
+
 x-have rbenv && {
   eval "$(rbenv init - bash)"
 }
@@ -38,4 +42,3 @@ x-have rbenv && {
 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/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"
+

base/zshrc

@@ -18,6 +18,10 @@ export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOM
 
 x-load-configs
 
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/omp/own.toml)"
+}
+
 export COMPLETION_WAITING_DOTS=true
 
 if type brew &> /dev/null; then
@@ -39,12 +43,6 @@ ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
 # antigen is present
 antigen use oh-my-zsh
 
-export ZSH_TMUX_AUTOSTART=true
-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
-
 export NVM_DIR="$XDG_CONFIG_HOME/nvm"
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
 
@@ -53,25 +51,15 @@ 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 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
@@ -81,10 +69,6 @@ antigen apply
 [ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
   && source "${DOTFILES}/config/fzf/fzf.zsh"
 
-x-have rbenv && {
-  eval "$(rbenv init - zsh)"
-}
-
 x-have pyenv && {
   [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
   eval "$(pyenv init -)"
@@ -105,8 +89,16 @@ x-have pyenv && {
   }
 }
 
-# eval "$(starship init zsh)"
-x-have oh-my-posh && {
-  eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+x-have antidot && {
+  eval "$(antidot init)"
 }
+
 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 = 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
@@ -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

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

@@ -1,22 +1,40 @@
 tap "1password/tap"
 tap "anchore/grype"
+tap "cormacrelf/tap"
 tap "ddosify/tap"
 tap "dm3ch/tap"
+tap "doron-cohen/tap"
 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 "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"
+# Mozilla CA certificate store
+brew "ca-certificates"
+# Mozilla CA bundle for Python
+brew "certifi"
+# Cryptographic recipes and primitives for Python
+brew "cryptography"
+# YAML Parser
+brew "libyaml"
+# Automate deployment, configuration, and upgrading
+brew "ansible"
+# 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
@@ -35,26 +53,28 @@ brew "jpeg-xl"
 brew "aom"
 # Apache Portable Runtime library
 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
 brew "autoconf"
+# Collection of over 500 reusable autoconf macros
+brew "autoconf-archive"
+# GNU multiple precision arithmetic library
+brew "gmp"
+# Manage compile and link flags for libraries
+brew "pkg-config"
+# Automated text file generator
+brew "autogen"
+# Tool for generating GNU Standards-compliant Makefiles
+brew "automake"
 # 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"
 # Software library to render fonts
@@ -69,12 +89,8 @@ brew "glib"
 brew "choose-rust"
 # Cross-platform make
 brew "cmake"
-# GNU multiple precision arithmetic library
-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 +145,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
@@ -145,6 +163,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
@@ -153,44 +173,40 @@ brew "imagemagick"
 brew "irssi"
 # Lightweight and flexible command-line JSON processor
 brew "jq"
+# JSON parser for C
+brew "json-c"
+# 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
 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"
+# Multi-platform support library with a focus on asynchronous I/O
+brew "libuv"
 # 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"
+# Collection of tools that nobody wrote when UNIX was young
+brew "moreutils"
 # 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
-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"
+# ISO-C API and CLI for generating UUIDs
+brew "ossp-uuid"
+# General-purpose scripting language
+brew "php"
 # Coreutils progress viewer
 brew "progress"
 # Python version management
@@ -199,10 +215,12 @@ brew "pyenv"
 brew "pyenv-pip-migrate"
 # Pyenv plugin to manage virtualenv
 brew "pyenv-virtualenv"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.11"
+# 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 +233,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 +259,21 @@ 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"
+# Watcher for macOS 10.14+ light/dark mode changes
+brew "cormacrelf/tap/dark-notify"
+# Cleans up your $HOME from those pesky dotfiles
+brew "doron-cohen/tap/antidot"
 # 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"
+# 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
 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 +282,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 +334,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
@@ -364,13 +348,13 @@ 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
 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

@@ -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.symbols-outline",
+    "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": 2
-}
+  "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

@@ -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" },
@@ -36,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/omp/own.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
 }

config/omp/own.toml

@@ -0,0 +1,120 @@
+"$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
+final_space = true
+shell_integration = true
+console_title_template = "{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}"
+version = 2
+
+[[blocks]]
+alignment = "left"
+type = "prompt"
+
+  [[blocks.segments]]
+  foreground = "cyan"
+  style = "powerline"
+  template = "{{ .Icon }}"
+  type = "os"
+
+  [[blocks.segments]]
+  type = "session"
+  style = "plain"
+  template = " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}"
+
+  [[blocks.segments]]
+  foreground = "cyan"
+  style = "plain"
+  template = " {{ .Path }} "
+  type = "path"
+
+    [blocks.segments.properties]
+    style = "mixed"
+
+    [blocks.segments.mapped_locations]
+    "~/Code/*" = ""
+
+  [[blocks.segments]]
+  type = "git"
+  style = "plain"
+  foreground = "lightGreen"
+  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 }}"
+
+    [blocks.segments.properties]
+    fetch_status = true
+    fetch_upstream_icon = true
+
+      [blocks.segments.properties.untracked_modes]
+      "~/Code/oh-my-posh/" = "no"
+
+  [[blocks.segments]]
+  type = "terraform"
+  style = "plain"
+  foreground = "#000000"
+  background = "#ebcc34"
+  template = "{{.WorkspaceName}}"
+
+[[blocks]]
+alignment = "left"
+type = "prompt"
+
+  [[blocks.segments]]
+  foreground = "#68a063"
+  style = "plain"
+  template = " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}"
+  type = "node"
+
+    [blocks.segments.properties]
+    display_mode = "files"
+    fetch_package_manager = true
+    fetch_version = true
+
+  [[blocks.segments]]
+  foreground = "#4063D8"
+  style = "plain"
+  template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
+  type = "crystal"
+
+    [blocks.segments.properties]
+    display_mode = "files"
+    fetch_version = true
+
+  [[blocks.segments]]
+  foreground = "#DE3F24"
+  style = "plain"
+  template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
+  type = "ruby"
+
+    [blocks.segments.properties]
+    display_mode = "files"
+    fetch_version = true
+
+  [[blocks.segments]]
+  foreground = "#FED142"
+  style = "plain"
+  template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
+  type = "python"
+
+    [blocks.segments.properties]
+    display_mode = "context"
+    fetch_virtual_env = false
+
+[[blocks]]
+  alignment = "left"
+  newline = true
+  type = "prompt"
+
+  [[blocks.segments]]
+  background = "transparent"
+  foreground = "lightGreen"
+  foreground_templates = [ "{{ if gt .Code 0 }}red{{ end }}" ]
+  style = "plain"
+  template = "➜"
+  type = "status"
+
+    [blocks.segments.properties]
+    always_enabled = true
+
+[transient_prompt]
+background = "transparent"
+foreground = "lightGreen"
+foreground_templates = [ "{{ if gt .Code 0 }}red{{ end }}" ]
+template = "➜ "
+

config/omp/zen.toml

@@ -0,0 +1,74 @@
+#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
+
+version = 2
+final_space = true
+console_title_template = '{{ .Shell }} in {{ .Folder }}'
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    type = 'path'
+    style = 'plain'
+    background = 'transparent'
+    foreground = 'blue'
+    template = '{{ .Path }}'
+
+    [blocks.segments.properties]
+      style = 'full'
+
+  [[blocks.segments]]
+    type = 'git'
+    style = 'plain'
+    foreground = 'p:grey'
+    background = 'transparent'
+    template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} <cyan>{{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}</>'
+
+    [blocks.segments.properties]
+      branch_icon = ''
+      commit_icon = '@'
+      fetch_status = true
+
+[[blocks]]
+  type = 'rprompt'
+  overflow = 'hidden'
+
+  [[blocks.segments]]
+    type = 'executiontime'
+    style = 'plain'
+    foreground = 'yellow'
+    background = 'transparent'
+    template = '{{ .FormattedMs }}'
+
+    [blocks.segments.properties]
+      threshold = 5000
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    type = 'text'
+    style = 'plain'
+    foreground_templates = [
+      "{{if gt .Code 0}}red{{end}}",
+      "{{if eq .Code 0}}magenta{{end}}",
+    ]
+    background = 'transparent'
+    template = '❯'
+
+[transient_prompt]
+  foreground_templates = [
+    "{{if gt .Code 0}}red{{end}}",
+    "{{if eq .Code 0}}magenta{{end}}",
+  ]
+  background = 'transparent'
+  template = '❯ '
+
+[secondary_prompt]
+  foreground = 'magenta'
+  background = 'transparent'
+  template = '❯❯ '

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,25 @@ 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}"
+
+set-option -g status-style 'fg=#cad3f5,bg=default'
+set-window-option -g window-status-style 'fg=#cad3f5,bg=default'
+set-window-option -g window-status-current-style 'fg=#c6a0f6,bg=#24273a'
+set -g message-style 'fg=#c6a0f6 bg=#24273a bold'
+
+# 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                           │
@@ -123,9 +145,10 @@ set -g @suspend_key 'F12'
 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_name_shells "['bash', 'fish', 'sh', 'zsh', 'oh-my-posh']"
 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_ignored_programs "['sqlite3', 'x-set-php-aliases', 'oh-my-posh']" # Default is []
+set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local')]"
 
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'
@@ -153,4 +176,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 && {
@@ -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"
 }

scripts/install-go-packages.sh

@@ -29,6 +29,8 @@ packages=(
   github.com/rhysd/actionlint/cmd/actionlint@latest
   # simple terminal UI for git commands
   github.com/jesseduffield/lazygit@latest
+  # Cleans up your $HOME from those pesky dotfiles
+  github.com/doron-cohen/antidot@latest
 )
 
 for pkg in "${packages[@]}"; do
@@ -49,6 +51,11 @@ x-have git-profile && {
     && msg_ok "Installed completions for git-profile"
 }
 
+x-have antidot && {
+  antidot update \
+    &&  msg_ok "Updated antidot database"
+}
+
 echo ""
 
 msg_run "Clearing go cache"

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
+

ssh/shared.d/turingpi

@@ -0,0 +1,17 @@
+Host t1
+  User ubuntu
+  HostName t1.home.antiprocess.net
+  IdentityFile ~/.ssh/id_rsa
+Host t2
+  User ubuntu
+  HostName t2.home.antiprocess.net
+  IdentityFile ~/.ssh/id_rsa
+Host t3
+  User ubuntu
+  HostName t3.home.antiprocess.net
+  IdentityFile ~/.ssh/id_rsa
+Host t4
+  User ubuntu
+  HostName t4.home.antiprocess.net
+  IdentityFile ~/.ssh/id_rsa
+