chore: update cheat/tldr submodule

.gitmodules

@@ -52,3 +52,9 @@
 [submodule "tmux/tmux-mode-indicator"]
 	path = config/tmux/plugins/tmux-mode-indicator
 	url = https://github.com/MunifTanjim/tmux-mode-indicator.git
+[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

add-submodules.sh

@@ -13,6 +13,8 @@ git submodule add --name dotbot-pip \
 # 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 \
@@ -31,6 +33,8 @@ git submodule add --name tmux/tmux-window-name \
   -f https://github.com/ofirgall/tmux-window-name.git config/tmux/plugins/tmux-window-name
 git submodule add --name tmux/tmux-yank \
   -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank
+git submodule add --name tmux/tmux-current-pane-hostname \
+  -f https://github.com/soyuka/tmux-current-pane-hostname.git config/tmux/plugins/tmux-current-pane-hostname
 
 # 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

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

@@ -61,8 +61,8 @@ 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 brew && antigen bundle brew
+# x-have php && antigen bundle php
 x-have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
 
 # nvm is a strange beast
@@ -71,7 +71,7 @@ antigen bundle nvm
 # antigen bundle "$DOTFILES/config/zsh/plugins/nvm-auto-use"
 
 # nice to have stuff
-antigen bundle gcloud
+# antigen bundle gcloud
 
 # this needs to be the last item
 antigen bundle zsh-users/zsh-syntax-highlighting
@@ -81,24 +81,26 @@ antigen apply
 [ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
   && source "${DOTFILES}/config/fzf/fzf.zsh"
 
-x-have op && {
-  eval "$(op completion zsh)"
-  compdef _op op
-}
-
 x-have rbenv && {
   eval "$(rbenv init - zsh)"
 }
 
-# Autoupdate tmux window name
-TMUX_WINDOW_NAME_PLUGIN="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/rename_session_windows.py"
-[ -f "$TMUX_WINDOW_NAME_PLUGIN" ] && {
-  tmux-window-name()
-  {
-    ($TMUX_WINDOW_NAME_PLUGIN &)
+# Run only if tmux is active
+[[ -n "$TMUX" ]] && {
+  # Autoupdate tmux window name
+  TMUX_WINDOW_NAME_PLUGIN="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/rename_session_windows.py"
+  [ -f "$TMUX_WINDOW_NAME_PLUGIN" ] && {
+    tmux-window-name()
+    {
+      ($TMUX_WINDOW_NAME_PLUGIN &)
+    }
+    add-zsh-hook chpwd tmux-window-name
+    tmux-window-name
   }
-  add-zsh-hook chpwd tmux-window-name
 }
 
-eval "$(starship init zsh)"
+# eval "$(starship init zsh)"
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+}
 source "$DOTFILES/config/alias"

config/alias

@@ -75,6 +75,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"

config/amethyst/amethyst.yml

@@ -1,19 +1,23 @@
+---
 # Default settings for amethyst
 # Repo: `https://github.com/ianyh/Amethyst`
 #
 # Note due to issue 1419 (https://github.com/ianyh/Amethyst/issues/1419) some
 # config values may conflict and not work if they are the same as the default
-# values for amathyst. You can see these values on github at
+# values for amathyst. You can see these values on GitHub at
 # https://github.com/ianyh/Amethyst/blob/development/Amethyst/default.amethyst
 # If you're experiencing conflicts and the settings are the same as the default,
 # comment out the commands in this file.
 #
 # Move this file to: `~/.amethyst.yml`
 # In order to register changes restart Amethyst.
-# If you experience issues pulling in the changes you can also quit Amethyst and run: `defaults delete com.amethyst.Amethyst.plist`
-# This removes the current preferences and causes Amethyst to restart with default preferences and pull configs from this file.
+# If you experience issues pulling in the changes you can also
+# quit Amethyst and run: `defaults delete com.amethyst.Amethyst.plist`
+# This removes the current preferences and causes Amethyst to restart
+# with default preferences and pull configs from this file.
 
-# layouts - Ordered list of layouts to use by layout key (default tall, wide, fullscreen, and column).
+# layouts - Ordered list of layouts to use by layout key
+# (default tall, wide, fullscreen, and column).
 layouts:
   - bsp
   - tall
@@ -71,39 +75,49 @@ cycle-layout-backward:
   mod: mod2
   key: space
 
-# Shrink the main pane by a percentage of the screen dimension as defined by window-resize-step. Note that not all layouts respond to this command.
+# Shrink the main pane by a percentage of the screen
+# dimension as defined by window-resize-step.
+# Note that not all layouts respond to this command.
 shrink-main:
   mod: mod1
   key: h
 
-# Expand the main pane by a percentage of the screen dimension as defined by window-resize-step. Note that not all layouts respond to this command.
+# Expand the main pane by a percentage of the screen dimension
+# as defined by window-resize-step. Note that not all layouts
+# respond to this command.
 expand-main:
   mod: mod1
   key: l
 
-# Increase the number of windows in the main pane. Note that not all layouts respond to this command.
+# Increase the number of windows in the main pane.
+# Note that not all layouts respond to this command.
 increase-main:
   mod: mod1
   key: ','
 
-# Decrease the number of windows in the main pane. Note that not all layouts respond to this command.
+# Decrease the number of windows in the main pane.
+# Note that not all layouts respond to this command.
 decrease-main:
   mod: mod1
   key: '.'
 
-# General purpose command for custom layouts. Functionality is layout-dependent.
+# General purpose command for custom layouts.
+# Functionality is layout-dependent.
 # command1:
 #   mod: <NONE>
 #   key: <NONE>
-# General purpose command for custom layouts. Functionality is layout-dependent.
+# General purpose command for custom layouts.
+# Functionality is layout-dependent.
 # command2:
 #   mod: <NONE>
 #   key: <NONE>
-# General purpose command for custom layouts. Functionality is layout-dependent.
+# General purpose command for custom layouts.
+# Functionality is layout-dependent.
 # command3:
 #   mod: <NONE>
 #   key: <NONE>
-# General purpose command for custom layouts. Functionality is layout-dependent.
+# General purpose command for custom layouts.
+# Functionality is layout-dependent.
 # command4:
 #   mod: <NONE>
 #   key: <NONE>
@@ -133,42 +147,51 @@ focus-screen-cw:
   mod: mod1
   key: n
 
-# Move the currently focused window onto the next screen in the list going counter-clockwise.
+# Move the currently focused window onto the next
+# screen in the list going counter-clockwise.
 swap-screen-ccw:
   mod: mod2
   key: h
 
-# Move the currently focused window onto the next screen in the list going clockwise.
+# Move the currently focused window onto the next
+# screen in the list going clockwise.
 swap-screen-cw:
   mod: mod2
   key: l
 
-# Swap the position of the currently focused window with the next window in the list going counter-clockwise.
+# Swap the position of the currently focused window with
+# the next window in the list going counter-clockwise.
 swap-ccw:
   mod: mod2
   key: j
 
-# Swap the position of the currently focused window with the next window in the list going clockwise.
+# Swap the position of the currently focused window with
+# the next window in the list going clockwise.
 swap-cw:
   mod: mod2
   key: k
 
-# Swap the position of the currently focused window with the main window in the list.
+# Swap the position of the currently focused window
+# with the main window in the list.
 swap-main:
   mod: mod1
   key: enter
 
-# Move focus to the n-th screen in the list; e.g., focus-screen-3 will move mouse focus to the 3rd screen. Note that the main window in the given screen will be focused.
+# Move focus to the n-th screen in the list; e.g.,
+# focus-screen-3 will move mouse focus to the 3rd screen.
+# Note that the main window in the given screen will be focused.
 #focus-screen-n:
 # focus-screen-<screen-number>:
 #   mod: mod1
 #   key: y
-# Move the currently focused window to the n-th screen; e.g., throw-screen-3 will move the window to the 3rd screen.
+# Move the currently focused window to the n-th screen;
+# e.g., throw-screen-3 will move the window to the 3rd screen.
 # throw-screen-n:
 # throw-screen-<screen-number>:
 #   mod: mod1
 #   key: u
-# Move the currently focused window to the n-th space; e.g., throw-space-3 will move the window to the 3rd space.
+# Move the currently focused window to the n-th space;
+# e.g., throw-space-3 will move the window to the 3rd space.
 # throw-space-<screen-number>:
 #   mod: mod1
 #   key: i
@@ -203,7 +226,9 @@ throw-space-right:
   mod: mod2
   key: right
 
-# Toggle the floating state of the currently focused window; i.e., if it was floating make it tiled and if it was tiled make it floating.
+# Toggle the floating state of the currently focused window;
+# i.e., if it was floating make it tiled and if it was
+# tiled make it floating.
 toggle-float:
   mod: mod1
   key: t
@@ -236,10 +261,13 @@ relaunch-amethyst:
 # disable screen padding on builtin display
 disable-padding-on-builtin-display: false
 
-# Boolean flag for whether or not to add margins betwen windows (default false).
+# Boolean flag for whether to add margins between
+# windows (default false).
 window-margins: false
 
-# Boolean flag for whether or not to set window margins if there is only one window on the screen, assuming window margins are enabled (default false).
+# Boolean flag for whether to set window margins if there is
+# only one window on the screen, assuming window margins
+# are enabled (default false).
 smart-window-margins: true
 
 # # Add 10px margin between windows
@@ -248,39 +276,53 @@ smart-window-margins: true
 # The size of the margins between windows (in px, default 0).
 window-margin-size: 0
 
-# The max number of windows that may be visible on a screen at one time before
-# additional windows are minimized. A value of 0 disables the feature.
+# The max number of windows that may be visible on a screen
+# at one time before additional windows are minimized.
+# A value of 0 disables the feature.
 window-max-count: 0
 
-# The smallest height that a window can be sized to regardless of its layout frame (in px, default 0).
+# The smallest height that a window can be sized to
+# regardless of its layout frame (in px, default 0).
 window-minimum-height: 0
 
-# The smallest width that a window can be sized to regardless of its layout frame (in px, default 0)
+# The smallest width that a window can be sized to
+# regardless of its layout frame (in px, default 0)
 window-minimum-width: 0
 
-# List of bundle identifiers for applications to either be automatically floating or automatically tiled based on floating-is-blacklist (default []).
+# List of bundle identifiers for applications to either be automatically
+# floating or automatically tiled based on floating-is-blacklist (default []).
 floating: []
 
 # Boolean flag determining behavior of the floating list.
-# true if the applications should be floating and all others tiled. false if the applications should be tiled and all others floating (default true).
+# true if the applications should be floating and all others tiled.
+# false if the applications should be tiled and all others floating (default true).
 floating-is-blacklist: false
 
-# true if screen frames should exclude the status bar. false if the screen frames should include the status bar (default false).
+# true if screen frames should exclude the status bar.
+# false if the screen frames should include the status bar (default false).
 ignore-menu-bar: false
 
-# true if windows smaller than a 500px square should be floating by default (default true)
+# true if windows smaller than a 500px square should
+# be floating by default (default true)
 float-small-windows: true
 
-# true if the mouse should move position to the center of a window when it becomes focused (default false). Note that this is largely incompatible with focus-follows-mouse.
+# true if the mouse should move position to the center of a window
+# when it becomes focused (default false).
+# Note that this is largely incompatible with focus-follows-mouse.
 mouse-follows-focus: false
 
-# true if the windows underneath the mouse should become focused as the mouse moves (default false). Note that this is largely incompatible with mouse-follows-focus
+# true if the windows underneath the mouse should become focused as
+# the mouse moves (default false). Note that this is largely
+# incompatible with mouse-follows-focus
 focus-follows-mouse: false
 
-# true if dragging and dropping windows on to each other should swap their positions (default false).
+# true if dragging and dropping windows on to each other
+# should swap their positions (default false).
 mouse-swaps-windows: true
 
-# true if changing the frame of a window with the mouse should update the layout to accommodate the change (default false). Note that not all layouts will be able to respond to the change.
+# true if changing the frame of a window with the mouse should update the
+# layout to accommodate the change (default false).
+# Note that not all layouts will be able to respond to the change.
 mouse-resizes-windows: true
 
 # true to display the name of the layout when a new layout is selected (default true).
@@ -292,13 +334,15 @@ enables-layout-hud-on-space-change: true
 # true to get updates to beta versions of the software (default false).
 use-canary-build: false
 
-# true to insert new windows into the first position and false to insert new windows into the last position (default false).
+# true to insert new windows into the first position and
+# false to insert new windows into the last position (default false).
 new-windows-to-main: false
 
 # true to automatically move to a space when throwing a window to it (default true).
 follow-space-thrown-windows: true
 
-# The integer percentage of the screen dimension to increment and decrement main pane ratios by (default 5).
+# The integer percentage of the screen dimension to increment
+# and decrement main pane ratios by (default 5).
 window-resize-step: 5
 
 # Padding to apply between windows and the left edge of the screen (in px, default 0).

config/cheat/conf.yml

@@ -1,3 +1,4 @@
+---
 # The editor to use with 'cheat -e <sheet>'. Defaults to $EDITOR or $VISUAL.
 # editor: $EDITOR
 
@@ -37,7 +38,7 @@ pager: less -FRX
 #
 # This is very useful when you would like to maintain, for example, a
 # "pristine" repository of community cheatsheets on one cheatpath, and an
-# editable personal reponsity of cheatsheets on another cheatpath.
+# editable personal repository of cheatsheets on another cheatpath.
 #
 # Cheatpaths can be also configured to automatically apply tags to cheatsheets
 # on certain paths, which can be useful for querying purposes.
@@ -71,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-apps

@@ -24,6 +24,10 @@ export ANDROID_HOME="$XDG_DATA_HOME/android"
 # bob manages nvim versions
 export PATH="$XDG_DATA_HOME/bob/nvim-bin:$PATH"
 
+# bkt (shell command caching tool) configuration
+export BKT_TTL=1m
+
+# brew, https://docs.brew.sh/Manpage
 export HOMEBREW_NO_ENV_HINTS=true
 
 # composer, https://getcomposer.org/

config/gh-changelog/config.yaml

@@ -1,3 +1,4 @@
+---
 check_for_updates: true
 excluded_labels:
   - maintenance

config/gh/config.yml

@@ -1,2 +1,3 @@
+---
 git_protocol: https
 version: '1'

config/gh/hosts.yml

@@ -1,3 +1,4 @@
+---
 github.com:
   git_protocol: https
   users:

config/git/gitignore

@@ -18,3 +18,4 @@ composer.phar
 wp_*.sh
 auth.json
 dfm.sh
+.scannerwork

config/homebrew/Brewfile

@@ -9,6 +9,7 @@ tap "homebrew/bundle"
 tap "homebrew/cask-fonts"
 tap "homebrew/services"
 tap "jesseduffield/lazygit"
+tap "keith/formulae"
 tap "mongodb/brew"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
@@ -20,10 +21,6 @@ brew "act"
 brew "ca-certificates"
 # YAML Parser
 brew "libyaml"
-# Cryptography and SSL/TLS Toolkit
-brew "openssl@3"
-# Automate deployment, configuration, and upgrading
-brew "ansible"
 # Checks ansible playbooks for practices and behaviour
 brew "ansible-lint"
 # Generic-purpose lossless compression algorithm by Google
@@ -108,6 +105,10 @@ brew "dotenv-linter"
 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
@@ -158,8 +159,6 @@ brew "gpgme"
 brew "gpg-tui"
 # Image manipulation
 brew "netpbm"
-# OpenType text shaping engine
-brew "harfbuzz"
 # Framework for layout and rendering of i18n text
 brew "pango"
 # Library to render SVG files using Cairo
@@ -208,6 +207,8 @@ brew "mas"
 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
@@ -218,14 +219,14 @@ brew "nvm"
 brew "openjdk@11"
 # Generate clients, server & docs from an OpenAPI spec (v2, v3)
 brew "openapi-generator"
-# Development kit for the Java programming language
-brew "openjdk"
 # Swiss-army knife of markup format conversion
 brew "pandoc"
 # Highly capable, feature-rich programming language
 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
@@ -238,6 +239,8 @@ brew "pyenv-virtualenv"
 brew "python@3.10"
 # 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
@@ -306,16 +309,29 @@ brew "ddosify/tap/ddosify"
 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
@@ -384,13 +400,13 @@ cask "omnifocus"
 cask "postman"
 # Display image info and preview unsupported formats in QuickLook
 cask "qlimagesize"
-# QuickLook generator for Markdown files
+# Quick Look generator for Markdown files
 cask "qlmarkdown"
-# QuickLook plugin for plaintext files without an extension
+# Quick Look plugin for plaintext files without an extension
 cask "qlstephen"
-# QuickLook plugin for JSON files
+# Quick Look plugin for JSON files
 cask "quicklook-json"
-# QuickLook generator for Adobe Swatch Exchange files
+# Quick Look generator for Adobe Swatch Exchange files
 cask "quicklookase"
 # Automatically hides or quits apps after periods of inactivity
 cask "quitter"
@@ -424,95 +440,3 @@ cask "vlc"
 cask "voikkospellservice"
 # Rust-based terminal
 cask "warp"
-mas "1Password for Safari", id: 1569813296
-mas "Actions", id: 1586435171
-mas "Audiobook Builder", id: 1437681957
-mas "Ivory", id: 6444602274
-mas "Keynote", id: 409183694
-mas "LastPass", id: 926036361
-mas "Numbers", id: 409203825
-mas "Pages", id: 409201541
-mas "Pixelmator Pro", id: 1289583905
-mas "Final Cut Pro", id: 424389933
-mas "Tailscale", id: 1475387142
-mas "Xcode", id: 497799835
-vscode "4ops.terraform"
-vscode "adamiBs.terraform-live-graph"
-vscode "akamud.vscode-theme-onelight"
-vscode "amiralizadeh9480.laravel-extra-intellisense"
-vscode "andrewleedham.vscode-css-modules"
-vscode "andrewmcodes.tailwindcss-extension-pack"
-vscode "austenc.tailwind-docs"
-vscode "bmewburn.vscode-intelephense-client"
-vscode "Box-Of-Hats.bemhelper"
-vscode "bradlc.vscode-tailwindcss"
-vscode "christian-kohler.npm-intellisense"
-vscode "christian-kohler.path-intellisense"
-vscode "DavidAnson.vscode-markdownlint"
-vscode "dbaeumer.vscode-eslint"
-vscode "DotJoshJohnson.xml"
-vscode "eamodio.gitlens"
-vscode "EditorConfig.EditorConfig"
-vscode "esbenp.prettier-vscode"
-vscode "formulahendry.auto-close-tag"
-vscode "formulahendry.auto-rename-tag"
-vscode "formulahendry.code-runner"
-vscode "foxundermoon.shell-format"
-vscode "gencer.html-slim-scss-css-class-completion"
-vscode "GitHub.copilot"
-vscode "GitHub.copilot-chat"
-vscode "github.vscode-github-actions"
-vscode "GitHub.vscode-pull-request-github"
-vscode "GraphQL.vscode-graphql"
-vscode "GraphQL.vscode-graphql-execution"
-vscode "GraphQL.vscode-graphql-syntax"
-vscode "hashicorp.terraform"
-vscode "heybourn.headwind"
-vscode "JohnnyMorganz.stylua"
-vscode "jumpinjackie.vscode-map-preview"
-vscode "k--kato.intellij-idea-keybindings"
-vscode "liamhammett.inline-parameters"
-vscode "macieklad.tailwind-sass-syntax"
-vscode "MehediDracula.php-namespace-resolver"
-vscode "mikestead.dotenv"
-vscode "MisterJ.vue-volar-extention-pack"
-vscode "MrChetan.phpstorm-parameter-hints-in-vscode"
-vscode "mrorz.language-gettext"
-vscode "ms-azuretools.vscode-azureterraform"
-vscode "ms-azuretools.vscode-docker"
-vscode "ms-python.python"
-vscode "ms-python.vscode-pylance"
-vscode "ms-toolsai.jupyter"
-vscode "ms-toolsai.jupyter-renderers"
-vscode "ms-toolsai.vscode-jupyter-cell-tags"
-vscode "ms-toolsai.vscode-jupyter-slideshow"
-vscode "ms-vscode-remote.remote-containers"
-vscode "ms-vscode-remote.remote-wsl"
-vscode "ms-vscode.azure-account"
-vscode "ms-vscode.cpptools"
-vscode "msjsdiag.vscode-react-native"
-vscode "mtxr.sqltools"
-vscode "neilbrayfield.php-docblocker"
-vscode "nhoizey.gremlins"
-vscode "octref.vetur"
-vscode "oderwat.indent-rainbow"
-vscode "pflannery.vscode-versionlens"
-vscode "phiter.phpstorm-snippets"
-vscode "sibiraj-s.vscode-scss-formatter"
-vscode "SonarSource.sonarlint-vscode"
-vscode "stylelint.vscode-stylelint"
-vscode "sumneko.lua"
-vscode "syler.sass-indented"
-vscode "timonwong.shellcheck"
-vscode "tootone.org-mode"
-vscode "valeryanm.vscode-phpsab"
-vscode "Vue.volar"
-vscode "Vue.vscode-typescript-vue-plugin"
-vscode "WakaTime.vscode-wakatime"
-vscode "wix.vscode-import-cost"
-vscode "XadillaX.viml"
-vscode "xdebug.php-debug"
-vscode "xdebug.php-pack"
-vscode "yinfei.luahelper"
-vscode "yoavbls.pretty-ts-errors"
-vscode "ZainChen.json"

config/nvim/lazyvim.json

@@ -1,6 +1,7 @@
 {
   "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",
@@ -25,4 +26,4 @@
     "NEWS.md": "2123"
   },
   "version": 2
-}
+}

config/nvim/lua/config/keymaps.lua

@@ -1,19 +1,22 @@
 -- Keymaps are automatically loaded on the VeryLazy event
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
+local wk = require("which-key")
 
-local keymap = vim.keymap.set
-
---         ╭──────────────────────────────────────────────────────────╮
---         │                       Comment box                        │
---         ╰──────────────────────────────────────────────────────────╯
-local cb = require("comment-box")
-
--- left aligned fixed size box with left aligned text
-keymap({ "n", "v" }, "<Leader>bcb", cb.lbox, { desc = "Comment: Left aligned" })
--- centered adapted box with centered text
-keymap({ "n", "v" }, "<Leader>bcc", cb.ccbox, { desc = "Comment: Centered" })
-
--- centered line
-keymap("n", "<Leader>bcl", cb.cline, { desc = "Comment: Centered line" })
-keymap("i", "<M-l>", cb.cline, { desc = "Comment: Centered line" })
+-- ╭──────────────────────────────────────────────────────────╮
+-- │                       Comment box                        │
+-- ╰──────────────────────────────────────────────────────────╯
+wk.register({
+  ["<Leader>"] = {
+    b = {
+      c = {
+        name = "□ Comment boxes",
+        b = { "<Cmd>CBccbox<CR>", "Box Title" },
+        t = { "<Cmd>CBllline<CR>", "Titled Line" },
+        l = { "<Cmd>CBline<CR>", "Simple Line" },
+        m = { "<Cmd>CBllbox14<CR>", "Marked" },
+        d = { "<Cmd>CBd<CR>", "Remove a box" },
+      },
+    },
+  },
+})

config/nvim/lua/config/lazy.lua

@@ -40,8 +40,8 @@ require("lazy").setup({
     lazy = false,
     -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
     -- have outdated releases, which may break your Neovim install.
-    version = false, -- always use the latest git commit
-    -- version = "*", -- try installing the latest stable version for plugins that support semver
+    -- version = false, -- always use the latest git commit
+    version = "*", -- try installing the latest stable version for plugins that support semver
   },
   install = { colorscheme = { "tokyonight" } },
   checker = { enabled = true }, -- automatically check for plugin updates

config/nvim/lua/plugins/coding.lua

@@ -56,6 +56,15 @@ return {
       },
     },
   },
+  {
+    "laytan/tailwind-sorter.nvim",
+    dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-lua/plenary.nvim" },
+    build = "cd formatter && npm i && npm run build",
+    config = true,
+    opts = {
+      on_save_enabled = true,
+    },
+  },
   -- Describe the regexp under the cursor
   -- https://github.com/bennypowers/nvim-regexplainer
   {

config/nvim/lua/plugins/ui.lua

@@ -1,5 +1,8 @@
 -- luacheck: globals vim
 return {
+  -- Cloak allows you to overlay *'s over defined patterns in defined files.
+  -- https://github.com/laytan/cloak.nvim
+  { "laytan/cloak.nvim" },
   -- Not UFO in the sky, but an ultra fold in Neovim.
   -- https://github.com/kevinhwang91/nvim-ufo/
   {

config/oh-my-posh.omp.json

@@ -0,0 +1,150 @@
+{
+  "$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}}",
+  "blocks": [
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "foreground": "cyan",
+          "style": "powerline",
+          "template": "{{ .Icon }}",
+          "type": "os"
+        },
+        {
+          "type": "session",
+          "style": "plain",
+          "template": " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}"
+        },
+        {
+          "foreground": "cyan",
+          "properties": {
+            "style": "mixed"
+          },
+          "style": "plain",
+          "template": " {{ .Path }} ",
+          "type": "path",
+          "mapped_locations": {
+            "~/Code/*": "\uF09B"
+          }
+        },
+        {
+          "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 }}",
+          "properties": {
+            "fetch_status": true,
+            "fetch_upstream_icon": true,
+            "untracked_modes": {
+              "~/Code/oh-my-posh/": "no"
+            }
+          }
+        },
+        {
+          "type": "terraform",
+          "style": "plain",
+          "foreground": "#000000",
+          "background": "#ebcc34",
+          "template": "{{.WorkspaceName}}"
+        }
+      ],
+      "type": "prompt"
+    },
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "foreground": "#68a063",
+          "properties": {
+            "display_mode": "files",
+            "fetch_package_manager": true,
+            "fetch_version": true
+          },
+          "style": "plain",
+          "template": " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}",
+          "type": "node"
+        },
+        {
+          "foreground": "#4063D8",
+          "properties": {
+            "display_mode": "files",
+            "fetch_version": true
+          },
+          "style": "plain",
+          "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "type": "crystal"
+        },
+        {
+          "foreground": "#DE3F24",
+          "properties": {
+            "display_mode": "files",
+            "fetch_version": true
+          },
+          "style": "plain",
+          "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "type": "ruby"
+        },
+        {
+          "foreground": "#FED142",
+          "properties": {
+            "display_mode": "context",
+            "fetch_virtual_env": false
+          },
+          "style": "plain",
+          "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}",
+          "type": "python"
+        },
+        {
+          "type": "php",
+          "style": "plain",
+          "template": "  {{ .Full }} "
+        }
+      ],
+      "type": "prompt"
+    },
+    {
+      "alignment": "left",
+      "newline": true,
+      "segments": [
+        {
+          "background": "transparent",
+          "foreground": "lightGreen",
+          "foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
+          "properties": {
+            "always_enabled": true
+          },
+          "style": "plain",
+          "template": "\u279c",
+          "type": "status"
+        }
+      ],
+      "type": "prompt"
+    }
+  ],
+  "transient_prompt": {
+    "background": "transparent",
+    "foreground": "lightGreen",
+    "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

@@ -8,8 +8,8 @@
 #  │ Bindings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
 
-# Set <prefix> to Control + Space
-unbind C-b
+# Set <prefix> to Control + Space, keeping the default of C-b intact.
+# unbind C-b
 set -g prefix C-Space
 bind C-Space send-prefix
 
@@ -105,7 +105,7 @@ 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 "#S"
+set-option -g status-left "#{hostname_short}/#S"
 set-option -g status-right "%H:%M #{tmux_mode_indicator}"
 
 #  ╭──────────────────────────────────────────────────────────╮
@@ -120,12 +120,12 @@ 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 []
 
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'
@@ -152,4 +152,5 @@ run-shell ~/.dotfiles/config/tmux/plugins/tmux-sessionist/sessionist.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-mode-indicator/mode_indicator.tmux
 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
 

config/wtf/config.yml

@@ -1,3 +1,4 @@
+---
 wtf:
   colors:
     background: black

hosts/air/install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring air"

hosts/lakka/install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring lakka"

hosts/tunkki/install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring tunkki"

hosts/v/install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring v"

install.conf.yaml

@@ -1,3 +1,4 @@
+---
 - include: 'tools/dotbot-defaults.yaml'
 - clean:
     ~/:

local/bin/dfm

@@ -61,6 +61,7 @@ function section_install
       $0 install fonts
       $0 install antigen
       $0 brew install
+      $0 install ohmyposh
       $0 install ohmybash
       $0 install pip
       $0 install cargo
@@ -185,6 +186,11 @@ function section_install
       bash "$DOTFILES/scripts/install-ohmybash.sh" \
         && msg_yay "oh-my-bash installed!"
       ;;
+    ohmyposh)
+      msg "oh-my-posh install started..."
+      bash "$DOTFILES/scripts/install-ohmyposh.sh" \
+        && msg_yay "oh-my-posh installed!"
+      ;;
     pip)
       msg "pip install started..."
       bash "$DOTFILES/scripts/install-pip-packages.sh"

local/bin/x-git-largest-files.py

@@ -42,26 +42,26 @@ sortByOnDiskSize = False
 class Blob(object):
   sha1 = ''
   size = 0
-  packedSize = 0
+  packed_size = 0
   path = ''
 
   def __init__(self, line):
     cols = line.split()
-    self.sha1, self.size, self.packedSize = cols[0], int(cols[2]), int(cols[3])
+    self.sha1, self.size, self.packed_size = cols[0], int(cols[2]), int(cols[3])
 
   def __repr__(self):
     return '{} - {} - {} - {}'.format(
-      self.sha1, self.size, self.packedSize, self.path)
+      self.sha1, self.size, self.packed_size, self.path)
 
   def __lt__(self, other):
     if (sortByOnDiskSize):
       return self.size < other.size
     else:
-      return self.packedSize < other.packedSize
+      return self.packed_size < other.packed_size
 
   def csv_line(self):
     return "{},{},{},{}".format(
-      self.size/1024, self.packedSize/1024, self.sha1, self.path)
+      self.size/1024, self.packed_size/1024, self.sha1, self.path)
 
 
 def main():
@@ -71,45 +71,45 @@ def main():
 
   args = parse_arguments()
   sortByOnDiskSize = args.sortByOnDiskSize
-  sizeLimit = 1024*args.filesExceeding
+  size_limit = 1024*args.filesExceeding
 
   if args.filesExceeding > 0:
     print("Finding objects larger than {}kB…".format(args.filesExceeding))
   else:
     print("Finding the {} largest objects…".format(args.matchCount))
 
-  blobs = get_top_blobs(args.matchCount, sizeLimit)
+  blobs = get_top_blobs(args.matchCount, size_limit)
 
   populate_blob_paths(blobs)
   print_out_blobs(blobs)
 
 
-def get_top_blobs(count, sizeLimit):
+def get_top_blobs(count, size_limit):
   """Get top blobs from git repository
 
     Args:
         count (int): How many items to return
-        sizeLimit (int): What is the size limit
+        size_limit (int): What is the size limit
 
     Returns:
         dict: Dictionary of Blobs
   """
-  sortColumn = 4
+  sort_column = 4
 
   if sortByOnDiskSize:
-    sortColumn = 3
+    sort_column = 3
 
-  verifyPack = "git verify-pack -v `git rev-parse --git-dir`/objects/pack/pack-*.idx | grep blob | sort -k{}nr".format(sortColumn)  # noqa: E501
-  output = check_output(verifyPack, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
+  verify_pack = "git verify-pack -v `git rev-parse --git-dir`/objects/pack/pack-*.idx | grep blob | sort -k{}nr".format(sort_column)  # noqa: E501
+  output = check_output(verify_pack, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
 
   blobs = dict()
   # use __lt__ to do the appropriate comparison
-  compareBlob = Blob("a b {} {} c".format(sizeLimit, sizeLimit))
-  for objLine in output:
-    blob = Blob(objLine)
+  compare_blob = Blob("a b {} {} c".format(size_limit, size_limit))
+  for obj_line in output:
+    blob = Blob(obj_line)
 
-    if sizeLimit > 0:
-      if compareBlob < blob:
+    if size_limit > 0:
+      if compare_blob < blob:
         blobs[blob.sha1] = blob
       else:
         break
@@ -132,8 +132,8 @@ def populate_blob_paths(blobs):
     print("Finding object paths…")
 
     # Only include revs which have a path. Other revs aren't blobs.
-    revList = "git rev-list --all --objects | awk '$2 {print}'"
-    all_object_lines = check_output(revList, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
+    rev_list = "git rev-list --all --objects | awk '$2 {print}'"
+    all_object_lines = check_output(rev_list, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
     outstanding_keys = list(blobs.keys())
 
     for line in all_object_lines:
@@ -151,16 +151,16 @@ def populate_blob_paths(blobs):
 
 def print_out_blobs(blobs):
   if len(blobs):
-    csvLines = ["size,pack,hash,path"]
+    csv_lines = ["size,pack,hash,path"]
 
     for blob in sorted(blobs.values(), reverse=True):
-      csvLines.append(blob.csv_line())
+      csv_lines.append(blob.csv_line())
 
     command = ["column", "-t", "-s", ","]
     p = Popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE)
 
     # Encode the input as bytes
-    input_data = ("\n".join(csvLines) + "\n").encode()
+    input_data = ("\n".join(csv_lines) + "\n").encode()
 
     stdout, _ = p.communicate(input_data)
 

scripts/install-cargo-packages.sh

@@ -26,7 +26,7 @@ rustup default system
 packages=(
   "cargo-cache"
   # starship.rs
-  "starship"
+  # "starship"
   # An incremental parsing system for programming tools
   "tree-sitter-cli"
   # a subprocess caching utility

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

scripts/install-ohmyposh.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env zsh
+#
+# Install oh-my-posh
+#
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+curl -s https://ohmyposh.dev/install.sh | bash -s -- -d ~/.local/bin
+
+OHMYPOSH_CFG="$HOME/.dotfiles/config/oh-my-posh.omp.json"
+
+eval "$(oh-my-posh init zsh --config $OHMYPOSH_CFG)"
+
+#cd ~/.dotfiles || exit
+#oh-my-posh config export image \
+#  --config "$OHMYPOSH_CFG" \
+#  --output "~/.dotfiles/.github/screenshots/oh-my-posh.png" \
+#  --author "Ismo Vuorinen"

tools/dotbot-defaults.yaml

@@ -1,3 +1,4 @@
+---
 - defaults:
     create:
       mode: 0755