chore(config): update irssi config

.gitignore

@@ -13,6 +13,6 @@ ssh/local.d/*
 !ssh/local.d/.gitkeep
 !.gitkeep
 .env
-local/share/fonts/NerdFonts
+local/share/fonts/*
 node_modules
-
+.nfs*

.gitmodules

@@ -19,40 +19,36 @@
 	url = https://github.com/cheat/cheatsheets.git
 	ignore = dirty
 
-[submodule "tmux/tpm"]
-	path = config/tmux/plugins/tpm
-	url = https://github.com/tmux-plugins/tpm.git
-	ignore = dirty
-[submodule "tmux/catppuccin"]
-	path = config/tmux/plugins/tmux
-	url = https://github.com/catppuccin/tmux.git
 [submodule "tmux/tmux-continuum"]
 	path = config/tmux/plugins/tmux-continuum
 	url = https://github.com/tmux-plugins/tmux-continuum
-[submodule "tmux/tmux-menus"]
+	ignore = dirty
-	path = config/tmux/plugins/tmux-menus
-	url = https://github.com/jaclu/tmux-menus.git
 [submodule "tmux/tmux-resurrect"]
 	path = config/tmux/plugins/tmux-resurrect
 	url = https://github.com/tmux-plugins/tmux-resurrect
+	ignore = dirty
 [submodule "tmux/tmux-sensible"]
 	path = config/tmux/plugins/tmux-sensible
 	url = https://github.com/tmux-plugins/tmux-sensible.git
+	ignore = dirty
 [submodule "tmux/tmux-sessionist"]
 	path = config/tmux/plugins/tmux-sessionist
 	url = https://github.com/tmux-plugins/tmux-sessionist.git
+	ignore = dirty
 [submodule "tmux/tmux-yank"]
 	path = config/tmux/plugins/tmux-yank
 	url = https://github.com/tmux-plugins/tmux-yank.git
+	ignore = dirty
 [submodule "tmux/tmux-window-name"]
 	path = config/tmux/plugins/tmux-window-name
 	url = https://github.com/ofirgall/tmux-window-name.git
-[submodule "dotbot-crontab"]
+	ignore = dirty
-	path = tools/dotbot-crontab
-	url = https://github.com/codekansas/dotbot-crontab.git
-[submodule "dotbot-snap"]
-	path = tools/dotbot-snap
-	url = https://github.com/DrDynamic/dotbot-snap.git
 [submodule "dotbot-pip"]
 	path = tools/dotbot-pip
 	url = https://github.com/sobolevn/dotbot-pip.git
+[submodule "tmux/tmux-suspend"]
+	path = config/tmux/plugins/tmux-suspend
+	url = https://github.com/MunifTanjim/tmux-suspend.git
+[submodule "tmux/tmux-mode-indicator"]
+	path = config/tmux/plugins/tmux-mode-indicator
+	url = https://github.com/MunifTanjim/tmux-mode-indicator.git

add-submodules.sh

@@ -7,10 +7,6 @@ git submodule add --name dotbot-brew \
   -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew
 git submodule add --name dotbot-include \
   -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include
-git submodule add --name dotbot-crontab \
-  -f https://github.com/codekansas/dotbot-crontab.git tools/dotbot-crontab
-git submodule add --name dotbot-snap \
-  -f https://github.com/DrDynamic/dotbot-snap.git tools/dotbot-snap
 git submodule add --name dotbot-pip \
   -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip
 
@@ -19,21 +15,30 @@ git submodule add --name cheat-community \
   -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
 
 # tmux plugin manager and plugins
-git submodule add --name tmux/tpm \
-  -f https://github.com/tmux-plugins/tpm.git config/tmux/plugins/tpm
-git submodule add --name tmux/catppuccin \
-  -f https://github.com/catppuccin/tmux.git config/tmux/plugins/tmux
 git submodule add --name tmux/tmux-continuum \
   -f https://github.com/tmux-plugins/tmux-continuum config/tmux/plugins/tmux-continuum
-git submodule add --name tmux/tmux-menus \
+git submodule add --name tmux/tmux-mode-indicator \
-  -f https://github.com/jaclu/tmux-menus.git config/tmux/plugins/tmux-menus
+  -f https://github.com/MunifTanjim/tmux-mode-indicator.git config/tmux/plugins/tmux-mode-indicator
 git submodule add --name tmux/tmux-resurrect \
   -f https://github.com/tmux-plugins/tmux-resurrect config/tmux/plugins/tmux-resurrect
 git submodule add --name tmux/tmux-sensible \
   -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible
 git submodule add --name tmux/tmux-sessionist \
   -f https://github.com/tmux-plugins/tmux-sessionist.git config/tmux/plugins/tmux-sessionist
+git submodule add --name tmux/tmux-suspend \
+  -f https://github.com/MunifTanjim/tmux-suspend.git config/tmux/plugins/tmux-suspend
 git submodule add --name tmux/tmux-window-name \
   -f https://github.com/ofirgall/tmux-window-name.git config/tmux/plugins/tmux-window-name
 git submodule add --name tmux/tmux-yank \
   -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank
+
+for MODULE in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }'); do
+  git config "submodule.${MODULE}.ignore" all
+done
+
+# remove old submodules
+[ -d "config/tmux/plugins/tpm" ] && rm -rf config/tmux/plugins/tpm
+[ -d "config/tmux/plugins/tmux" ] && rm -rf config/tmux/plugins/tmux
+[ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus
+[ -d "tools/dotbot-crontab" ] && rm -rf tools/dotbot-crontab
+[ -d "tools/dotbot-snap" ] && rm -rf tools/dotbot-snap

base/bashrc

@@ -3,35 +3,20 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
-export DOTFILES_SHARED_LOADED=""
+export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$PATH"
 # shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
 
-# Run x-load-configs in your terminal to reload the files.
+# Explicitly set XDG folders
-function x-load-configs()
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-{
+export XDG_CONFIG_HOME="$HOME/.config"
-  # Load the shell dotfiles, and then some:
+export XDG_DATA_HOME="$HOME/.local/share"
-  for file in $DOTFILES/config/{exports,alias,functions}; do
+export XDG_STATE_HOME="$HOME/.local/state"
-    HOST="$(hostname -s)"
+
-    # global (exports|alias|functions) file for all hosts
+# custom variables
-    # shellcheck source=../config/exports
+export XDG_BIN_HOME="$HOME/.local/bin"
-    [ -r "$file" ] && source "$file"
+export XDG_CACHE_HOME="$HOME/.cache"
-    # global secret file, git ignored
+export XDG_RUNTIME_DIR="$HOME/.local/run"
-    # shellcheck source=../config/exports-secret
-    [ -r "$file-secret" ] && source "$file-secret"
-    # host specific (exports|alias|functions) file
-    # shellcheck source=../config/exports
-    [ -r "$file-$HOST" ] && source "$file-$HOST"
-    # host specific (exports|alias|functions) file, git ignored
-    # shellcheck source=../config/exports
-    [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
-  done
-}
-x-load-configs
 
 # Import ssh keys in keychain
-ssh-add -A 2> /dev/null
+ssh-add -A 2>/dev/null
-
-# shellcheck source=../config/fzf/fzf.bash
-[ -f "${DOTFILES}/config/fzf/fzf.bash" ] \
-  && source "${DOTFILES}/config/fzf/fzf.bash"

base/zshrc

@@ -3,33 +3,39 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
-export DOTFILES_SHARED_LOADED=""
 # shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
+export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$PATH"
+
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
 
 export COMPLETION_WAITING_DOTS=true
 
-# Run x-load-configs in your terminal to reload the files.
+path_append "/opt/homebrew/bin"
-function x-load-configs()
+if type brew &> /dev/null; then
-{
+  eval "$(brew shellenv)"
-  # Load the shell dotfiles, and then some:
+  FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
-  for file in $DOTFILES/config/{exports,alias,functions}; do
+fi
-    HOST="$(hostname -s)"
+
-    # global (exports|alias|functions) file for all hosts
+path_append "/usr/local/bin"
-    # shellcheck source=../config/exports
+path_prepend "$XDG_DATA_HOME/cargo/bin"
-    [ -r "$file" ] && source "$file"
+path_prepend "$XDG_BIN_HOME"
-    # global secret file, git ignored
+path_prepend "$HOME/.local/go/bin"
-    # shellcheck source=../config/exports-secret
+path_prepend "$XDG_DATA_HOME/bob/nvim-bin"
-    [ -r "$file-secret" ] && source "$file-secret"
+
-    # host specific (exports|alias|functions) file
+source "$DOTFILES/config/exports-shell"
-    # shellcheck source=../config/exports
+source "$DOTFILES/config/exports-apps"
-    [ -r "$file-$HOST" ] && source "$file-$HOST"
+source "$DOTFILES/config/alias"
-    # host specific (exports|alias|functions) file, git ignored
+source "$DOTFILES/config/functions"
-    # shellcheck source=../config/exports
-    [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
-  done
-}
-x-load-configs
 
 export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
 x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
@@ -37,10 +43,6 @@ x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
 # Add completion scripts to zsh path
 FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
 
-if type brew &> /dev/null; then
-  FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
-fi
-
 # Try to load antigen, if present
 ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
 # shellcheck source=../../.local/bin/antigen.zsh
@@ -49,7 +51,7 @@ ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
 # antigen is present
 antigen use oh-my-zsh
 
-export ZSH_TMUX_AUTOSTART=false
+export ZSH_TMUX_AUTOSTART=true
 export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
 export ZSH_TMUX_UNICODE=true
 export ZSH_TMUX_AUTOQUIT=false
@@ -71,13 +73,6 @@ antigen bundle jreese/zsh-titles
 antigen bundle unixorn/autoupdate-antigen.zshplugin
 antigen bundle zsh-users/zsh-completions
 
-# prettier history search
-antigen bundle zsh-history-substring-search
-bindkey "${terminfo[kcuu1]}" history-substring-search-up
-bindkey "${terminfo[kcud1]}" history-substring-search-down
-bindkey -M vicmd 'k' history-substring-search-up
-bindkey -M vicmd 'j' history-substring-search-down
-
 # these should be available if there's need
 have brew && antigen bundle brew
 have php && antigen bundle php

config/alacritty/alacritty.yml

@@ -75,144 +75,39 @@ font:
 # Should display the render timer
 debug.render_timer: false
 
-# https://github.com/catppuccin/alacritty
+# TokyoNight Alacritty Colors (storm)
 colors:
+  # Default colors
   primary:
-    background: '#1E1E2E' # base
+    background: '0x24283b'
-    foreground: '#CDD6F4' # text
+    foreground: '0xc0caf5'
-    # Bright and dim foreground colors
-    dim_foreground: '#CDD6F4' # text
-    bright_foreground: '#CDD6F4' # text
-
-  # Cursor colors
-  cursor:
-    text: '#1E1E2E' # base
-    cursor: '#F5E0DC' # rosewater
-  vi_mode_cursor:
-    text: '#1E1E2E' # base
-    cursor: '#B4BEFE' # lavender
-
-  # Search colors
-  search:
-    matches:
-      foreground: '#1E1E2E' # base
-      background: '#A6ADC8' # subtext0
-    focused_match:
-      foreground: '#1E1E2E' # base
-      background: '#A6E3A1' # green
-    footer_bar:
-      foreground: '#1E1E2E' # base
-      background: '#A6ADC8' # subtext0
-
-  # Keyboard regex hints
-  hints:
-    start:
-      foreground: '#1E1E2E' # base
-      background: '#F9E2AF' # yellow
-    end:
-      foreground: '#1E1E2E' # base
-      background: '#A6ADC8' # subtext0
-
-  # Selection colors
-  selection:
-    text: '#1E1E2E' # base
-    background: '#F5E0DC' # rosewater
 
   # Normal colors
   normal:
-    black: '#45475A' # surface1
+    black: '0x1d202f'
-    red: '#F38BA8' # red
+    red: '0xf7768e'
-    green: '#A6E3A1' # green
+    green: '0x9ece6a'
-    yellow: '#F9E2AF' # yellow
+    yellow: '0xe0af68'
-    blue: '#89B4FA' # blue
+    blue: '0x7aa2f7'
-    magenta: '#F5C2E7' # pink
+    magenta: '0xbb9af7'
-    cyan: '#94E2D5' # teal
+    cyan: '0x7dcfff'
-    white: '#BAC2DE' # subtext1
+    white: '0xa9b1d6'
 
   # Bright colors
   bright:
-    black: '#585B70' # surface2
+    black: '0x414868'
-    red: '#F38BA8' # red
+    red: '0xf7768e'
-    green: '#A6E3A1' # green
+    green: '0x9ece6a'
-    yellow: '#F9E2AF' # yellow
+    yellow: '0xe0af68'
-    blue: '#89B4FA' # blue
+    blue: '0x7aa2f7'
-    magenta: '#F5C2E7' # pink
+    magenta: '0xbb9af7'
-    cyan: '#94E2D5' # teal
+    cyan: '0x7dcfff'
-    white: '#A6ADC8' # subtext0
+    white: '0xc0caf5'
-
-  # Dim colors
-  dim:
-    black: '#45475A' # surface1
-    red: '#F38BA8' # red
-    green: '#A6E3A1' # green
-    yellow: '#F9E2AF' # yellow
-    blue: '#89B4FA' # blue
-    magenta: '#F5C2E7' # pink
-    cyan: '#94E2D5' # teal
-    white: '#BAC2DE' # subtext1
 
   indexed_colors:
-    - { index: 16, color: '#FAB387' }
+    - { index: 16, color: '0xff9e64' }
-    - { index: 17, color: '#F5E0DC' }
+    - { index: 17, color: '0xdb4b4b' }
 
-# Visual Bell
-#
-# Any time the BEL code is received, Alacritty "rings" the visual bell. Once
-# rung, the terminal background will be set to white and transition back to the
-# default background color. You can control the rate of this transition by
-# setting the `duration` property (represented in milliseconds). You can also
-# configure the transition function by setting the `animation` property.
-#
-# Possible values for `animation`
-# `Ease`
-# `EaseOut`
-# `EaseOutSine`
-# `EaseOutQuad`
-# `EaseOutCubic`
-# `EaseOutQuart`
-# `EaseOutQuint`
-# `EaseOutExpo`
-# `EaseOutCirc`
-# `Linear`
-#
-# To completely disable the visual bell, set its duration to 0.
-#
-# visual_bell:
-#   animation: EaseOutExpo
-#   duration: 0
-
-# Key bindings
-#
-# Each binding is defined as an object with some properties. Most of the
-# properties are optional. All of the alphabetical keys should have a letter for
-# the `key` value such as `V`. Function keys are probably what you would expect
-# as well (F1, F2, ..). The number keys above the main keyboard are encoded as
-# `Key1`, `Key2`, etc. Keys on the number pad are encoded `Number1`, `Number2`,
-# etc.  These all match the glutin::VirtualKeyCode variants.
-#
-# Possible values for `mods`
-# `Command`, `Super` refer to the super/command/windows key
-# `Control` for the control key
-# `Shift` for the Shift key
-# `Alt` and `Option` refer to alt/option
-#
-# mods may be combined with a `|`. For example, requiring control and shift
-# looks like:
-#
-# mods: Control|Shift
-#
-# The parser is currently quite sensitive to whitespace and capitalization -
-# capitalization must match exactly, and piped items must not have whitespace
-# around them.
-#
-# Either an `action`, `chars`, or `command` field must be present.
-#   `action` must be one of `Paste`, `PasteSelection`, `Copy`, or `Quit`.
-#   `chars` writes the specified string every time that binding is activated.
-#     These should generally be escape sequences, but they can be configured to
-#     send arbitrary strings of bytes.
-#   `command` must be a map containing a `program` string, and `args` array of
-#     strings. For example:
-#     - { ... , command: { program: "alacritty", args: ["-e", "vttest"] } }
 key_bindings:
   - { key: V, mods: Command, action: Paste }
   - { key: C, mods: Command, action: Copy }

config/alias

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck source="../scripts/shared.sh"
 # shellcheck disable=1091,2139
-source "$DOTFILES/scripts/shared.sh"
+DOTFILES="$HOME/.dotfiles"
 
 # Get installed php versions from brew and setup aliases
 function x-set-php-aliases
@@ -106,9 +106,6 @@ alias updatedb="sudo /usr/libexec/locate.updatedb"
 # Always return full history
 alias history="history 1"
 
-alias pip="pip3 "
-alias python="python3 "
-
 # tmux: automatically attach or create session with name 'main'
 alias tmux='tmux new-session -A -s main'
 # tmux: attach or create new session
@@ -140,8 +137,7 @@ alias code_scanner='docker run
 
 alias zedit='$EDITOR ~/.dotfiles'
 
-have irssi \
+alias irssi="irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_CONFIG_HOME/irssi"
-  && alias irssi="irssi --config='$IRSSI_CONFIG_FILE' --home='$IRSSI_CONFIG_HOME'"
 
 if [[ -f "$HOME/.aliases.local" ]]; then
   # shellcheck disable=SC1091
@@ -150,3 +146,69 @@ fi
 
 alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
 alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
+
+# Alacritty preexec hook to update dynamic title
+preexec()
+{
+  print -Pn "\e]0;$1%~\a"
+}
+
+# Update dotfiles
+dfu()
+{
+  (
+    cd "$DOTFILES" && git pull --ff-only && ./install -q
+  )
+}
+
+# Weather in Tampere, or other city
+weather()
+{
+  # https://github.com/chubin/wttr.in#usage
+  local city="${1:-Tampere}"
+  curl "http://wttr.in/${city// /+}?2nFQM&lang=fi"
+}
+
+# Docker
+ssh-docker()
+{
+  docker exec -it "$@" bash
+}
+
+# All the dig info
+digga()
+{
+  dig +nocmd "$1" any +multiline +noall +answer
+}
+
+# Rector project to php version 8.2 by default.
+rector()
+{
+  local php="${1:-82}"
+  docker run -v "$(pwd)":/project rector/rector:latest process \
+    "/project/$1" \
+    --set "php${php}" \
+    --autoload-file /project/vendor/autoload.php
+}
+
+# Commit everything
+commit()
+{
+  commitMessage="$*"
+
+  if [ "$commitMessage" = "" ]; then
+    commitMessage="Automated commit"
+  fi
+
+  git add .
+  eval "git commit -a -m '${commitMessage}'"
+}
+
+scheduler()
+{
+  while :; do
+    php artisan schedule:run
+    echo "Sleeping 60 seconds..."
+    sleep 60
+  done
+}

config/alias-tunkki

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Setting aliases for tunkki
-
-alias nvim="/snap/nvim/current/usr/bin/nvim"

config/exports

@@ -3,8 +3,6 @@
 # vim: filetype=zsh
 
 export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/scripts/shared.sh"
-path_append "$DOTFILES/local/bin"
 
 # Explicitly set XDG folders
 # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -17,12 +15,6 @@ export XDG_BIN_HOME="$HOME/.local/bin"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_RUNTIME_DIR="$HOME/.local/run"
 
-path_append "/opt/homebrew/bin"
-have brew && eval "$(brew shellenv)"
-
-path_append "/usr/local/bin"
-path_append "$XDG_BIN_HOME"
-
 source "$DOTFILES/config/exports-shell"
 source "$DOTFILES/config/exports-apps"
 

config/exports-apps

@@ -2,10 +2,7 @@
 # shellcheck shell=bash
 # shellcheck enable=external-sources
 # shellcheck disable=1091,2139
-# vim: filetype=zsh
+# vim: filetype=bash
-
-export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/scripts/shared.sh"
 
 # Antigen configuration
 # https://github.com/zsh-users/antigen/wiki/Configuration
@@ -23,6 +20,10 @@ x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
 
 export ANDROID_HOME="$XDG_DATA_HOME/android"
 
+# bob manages nvim versions
+path_prepend "$XDG_DATA_HOME/bob/nvim-bin"
+have nvim && export EDITOR="nvim"
+
 export HOMEBREW_NO_ENV_HINTS=true
 
 # composer, https://getcomposer.org/
@@ -47,14 +48,6 @@ export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export GOPATH="$XDG_DATA_HOME/go"
 export GOBIN="$XDG_BIN_HOME"
 
-# irssi
-have irssi && {
-  # These variables are used in ./alias with --config and --home
-  export IRSSI_CONFIG_HOME="$XDG_CONFIG_HOME/irssi"
-  export IRSSI_CONFIG_FILE="$IRSSI_CONFIG_HOME/config"
-  x-dc "$IRSSI_CONFIG_HOME"
-}
-
 # nb, https://xwmx.github.io/nb/
 export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
 export NB_DIR="$XDG_STATE_HOME/nb"
@@ -68,8 +61,10 @@ have node && {
 # op (1Password cli) is present
 export OP_CACHE="$XDG_STATE_HOME/1password"
 have op && {
-  eval "$(op completion zsh)"
+  [ "$DOTFILES_CURRENT_SHELL" = "zsh" ] && {
-  compdef _op op
+    eval "$(op completion zsh)"
+    compdef _op op
+  }
 }
 
 # Python
@@ -93,7 +88,10 @@ export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
 export RBENV_ROOT="$XDG_STATE_HOME/rbenv"
 x-dc "$RBENV_ROOT"
 have gem && path_append "${GEM_HOME}/bin"
-have rbenv && eval "$(rbenv init - zsh)"
+have rbenv && {
+  [ "$DOTFILES_CURRENT_SHELL" = "zsh" ] && eval "$(rbenv init - zsh)"
+  [ "$DOTFILES_CURRENT_SHELL" = "bash" ] && eval "$(rbenv init - bash)"
+}
 
 # Rust / cargo
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"

config/exports-lakka

@@ -3,5 +3,18 @@
 ## LUA
 have luarocks && $(luarocks path --bin)
 
-path_append "$HOME/.local/go/bin"
+path_prepend "$HOME/.local/go/bin"
+
+alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state'
+alias nano='nano -wS -$'
+alias gpg=gpg2
+
+ACME_PATH="$HOME/.acme.sh"
+# shellcheck source=$HOME/.acme.sh/acme.sh.env
+[[ -s "$ACME_PATH/acme.sh.env" ]] && . "$ACME_PATH/acme.sh.env"
+
+export RVM_PATH="$HOME/.rvm"
+export PATH="$RVM_PATH/bin:$PATH"
+# shellcheck source=$HOME/.rvm/scripts/rvm
+[[ -s "$RVM_PATH/scripts/rvm" ]] && source "$RVM_PATH/scripts/rvm" # Load RVM into a shell session *as a function*
 

config/exports-shell

@@ -1,10 +1,20 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # shellcheck disable=1091,2046
-# vim: filetype=zsh
+# vim: filetype=bash
 
 export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/scripts/shared.sh"
+
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
 
 export LC_ALL=fi_FI.UTF-8
 
@@ -44,33 +54,32 @@ export GREP_OPTIONS="--color=auto"
 # update the values of LINES and COLUMNS.
 hash shopt 2> /dev/null && shopt -s checkwinsize
 
-# Load iterm2 shell integration
-# https://iterm2.com/documentation-shell-integration.html
-[[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] \
-  && source "$XDG_BIN_HOME/iterm2_shell_integration.zsh"
-
 # Set dircolors based on the file, if it exists
 have dircolors && eval $(dircolors "$XDG_CONFIG_HOME/dircolors")
 
 # If we are using zsh, color our dir lists and such
-if [ "$SHELL" = "$(which zsh)" ]; then
+if [ "$DOTFILES_CURRENT_SHELL" = "-zsh" ]; then
-  autoload -U colors zsh/terminfo compinit
+  [[ $ZSH_VERSION != "" ]] && {
-  colors
+    autoload -U colors zsh/terminfo compinit
-  compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+    colors
+    compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
 
-  x-dc "$XDG_CACHE_HOME/zsh"
+    x-dc "$XDG_CACHE_HOME/zsh"
-  x-dc "$XDG_STATE_HOME/zsh"
+    x-dc "$XDG_STATE_HOME/zsh"
-  export HISTFILE="$XDG_STATE_HOME/zsh/history"
+    export HISTFILE="$XDG_STATE_HOME/zsh/history"
-  zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
+    zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
-  zstyle ':completion:*' list-colors "$LS_COLORS"
+    zstyle ':completion:*' list-colors "$LS_COLORS"
 
-  # fzf
+    # Load iterm2 shell integration
-  [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
+    # https://iterm2.com/documentation-shell-integration.html
-    && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
+    [[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] \
+      && source "$XDG_BIN_HOME/iterm2_shell_integration.zsh"
+  }
 fi
 
 # If we are using bash
-if [ "$SHELL" = "$(which bash)" ]; then
+if [ "$DOTFILES_CURRENT_SHELL" = "bash" ]; then
-  [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ] \
+  # shellcheck source=../config/fzf/fzf.bash
-    && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
+  [ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
+    source "${DOTFILES}/config/fzf/fzf.bash"
 fi

config/functions

@@ -1,73 +1,3 @@
 #!/usr/bin/env bash
 #
 # shell functions
-#
-# shellcheck source="../scripts/shared.sh"
-export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/scripts/shared.sh"
-
-# Alacritty preexec hook to update dynamic title
-preexec()
-{
-  print -Pn "\e]0;$1%~\a"
-}
-
-# Update dotfiles
-dfu()
-{
-  (
-    cd "$DOTFILES" && git pull --ff-only && ./install -q
-  )
-}
-
-# Weather in Tampere, or other city
-weather()
-{
-  # https://github.com/chubin/wttr.in#usage
-  local city="${1:-Tampere}"
-  curl "http://wttr.in/${city// /+}?2nFQM&lang=fi"
-}
-
-# Docker
-ssh-docker()
-{
-  docker exec -it "$@" bash
-}
-
-# All the dig info
-digga()
-{
-  dig +nocmd "$1" any +multiline +noall +answer
-}
-
-# Rector project to php version 8.2 by default.
-rector()
-{
-  local php="${1:-82}"
-  docker run -v "$(pwd)":/project rector/rector:latest process \
-    "/project/$1" \
-    --set "php${php}" \
-    --autoload-file /project/vendor/autoload.php
-}
-
-# Commit everything
-commit()
-{
-  commitMessage="$*"
-
-  if [ "$commitMessage" = "" ]; then
-    commitMessage="Automated commit"
-  fi
-
-  git add .
-  eval "git commit -a -m '${commitMessage}'"
-}
-
-scheduler()
-{
-  while :; do
-    php artisan schedule:run
-    echo "Sleeping 60 seconds..."
-    sleep 60
-  done
-}

config/irssi/config

@@ -0,0 +1,328 @@
+# vim:noext ft=conf;
+servers = (
+  {
+    address = "irc.cc.tut.fi";
+    chatnet = "IRCNet";
+    port = "6667";
+    own_host = "kapsi.fi";
+    family = "inet";
+    autoconnect = "no";
+  },
+  { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
+  {
+    address = "ssl.efnet.org";
+    chatnet = "EFNet";
+    port = "9999";
+    use_tls = "yes";
+    tls_verify = "no";
+  },
+  {
+    address = "irc.esper.net";
+    chatnet = "EsperNet";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "yes";
+  },
+  {
+    address = "irc.libera.chat";
+    chatnet = "liberachat";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "yes";
+  },
+  {
+    address = "irc.gamesurge.net";
+    chatnet = "GameSurge";
+    port = "6667";
+  },
+  {
+    address = "ssl.ircnet.ovh";
+    chatnet = "IRCnet";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "yes";
+  },
+  { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
+  {
+    address = "irc.ircsource.net";
+    chatnet = "IRCSource";
+    port = "6667";
+  },
+  { address = "irc.netfuze.net"; chatnet = "NetFuze"; port = "6667"; },
+  {
+    address = "irc.oftc.net";
+    chatnet = "OFTC";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "yes";
+  },
+  {
+    address = "irc.quakenet.org";
+    chatnet = "QuakeNet";
+    port = "6667";
+  },
+  {
+    address = "irc.rizon.net";
+    chatnet = "Rizon";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "yes";
+  },
+  { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; },
+  {
+    address = "irc.undernet.org";
+    chatnet = "Undernet";
+    port = "6667";
+  }
+);
+
+chatnets = {
+  DALnet = {
+    type = "IRC";
+    max_kicks = "4";
+    max_msgs = "20";
+    max_whois = "30";
+  };
+  EFNet = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "4";
+    max_whois = "1";
+  };
+  EsperNet = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "4";
+    max_whois = "1";
+  };
+  liberachat = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "4";
+    max_whois = "1";
+  };
+  GameSurge = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "1";
+    max_whois = "1";
+  };
+  IRCnet = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "1";
+    max_whois = "1";
+  };
+  IRCSource = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "4";
+    max_whois = "1";
+  };
+  NetFuze = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "1";
+    max_whois = "1";
+  };
+  OFTC = { type = "IRC"; max_kicks = "1"; max_msgs = "1"; max_whois = "1"; };
+  QuakeNet = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "1";
+    max_whois = "1";
+  };
+  Rizon = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "1";
+    max_whois = "1";
+  };
+  SILC = { type = "SILC"; };
+  Undernet = {
+    type = "IRC";
+    max_kicks = "1";
+    max_msgs = "1";
+    max_whois = "1";
+  };
+};
+
+channels = (
+  { name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; },
+  { name = "#libera"; chatnet = "liberachat"; autojoin = "No"; },
+  { name = "#irssi"; chatnet = "liberachat"; autojoin = "No"; },
+  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
+  { name = "#irssi"; chatnet = "IRCNet"; autojoin = "No"; },
+  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
+  { name = "#netfuze"; chatnet = "NetFuze"; autojoin = "No"; },
+  { name = "#oftc"; chatnet = "OFTC"; autojoin = "No"; },
+  { name = "silc"; chatnet = "SILC"; autojoin = "No"; }
+);
+
+aliases = {
+  ATAG = "WINDOW SERVER";
+  ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{visible_name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}";
+  B = "BAN";
+  BACK = "AWAY";
+  BANS = "BAN";
+  BYE = "QUIT";
+  C = "CLEAR";
+  CALC = "EXEC - if command -v bc >/dev/null 2>&1\\; then printf '%s=' '$*'\\; echo '$*' | bc -l\\; else echo bc was not found\\; fi";
+  CHAT = "DCC CHAT";
+  CS = "QUOTE CS";
+  DATE = "TIME";
+  DEHIGHLIGHT = "DEHILIGHT";
+  DESCRIBE = "ACTION";
+  DHL = "DEHILIGHT";
+  EXEMPTLIST = "MODE $C +e";
+  EXIT = "QUIT";
+  GOTO = "SCROLLBACK GOTO";
+  HIGHLIGHT = "HILIGHT";
+  HL = "HILIGHT";
+  HOST = "USERHOST";
+  INVITELIST = "MODE $C +I";
+  J = "JOIN";
+  K = "KICK";
+  KB = "KICKBAN";
+  KN = "KNOCKOUT";
+  LAST = "LASTLOG";
+  LEAVE = "PART";
+  M = "MSG";
+  MS = "QUOTE MS";
+  MUB = "UNBAN *";
+  N = "NAMES";
+  NMSG = "^MSG";
+  NS = "QUOTE NS";
+  OS = "QUOTE OS";
+  P = "PART";
+  Q = "QUERY";
+  RESET = "SET -default";
+  RUN = "SCRIPT LOAD";
+  SAY = "MSG *";
+  SB = "SCROLLBACK";
+  SBAR = "STATUSBAR";
+  SHELP = "QUOTE HELP";
+  SIGNOFF = "QUIT";
+  SV = "MSG * Irssi $J ($V) - https://irssi.org";
+  T = "TOPIC";
+  UB = "UNBAN";
+  UMODE = "MODE $N";
+  UNSET = "SET -clear";
+  W = "WHO";
+  WC = "WINDOW CLOSE";
+  WG = "WINDOW GOTO";
+  WJOIN = "JOIN -window";
+  WI = "WHOIS";
+  WII = "WHOIS $0 $0";
+  WL = "WINDOW LIST";
+  WN = "WINDOW NEW HIDDEN";
+  WQUERY = "QUERY -window";
+  WW = "WHOWAS";
+};
+
+statusbar = {
+
+  items = {
+
+    barstart = "{sbstart}";
+    barend = "{sbend}";
+
+    topicbarstart = "{topicsbstart}";
+    topicbarend = "{topicsbend}";
+
+    time = "{sb $Z}";
+    user = "{sb {sbnickmode $cumode}$N{sbmode $usermode}{sbaway $A}}";
+
+    window = "{sb $winref:$tag/$itemname{sbmode $M}}";
+    window_empty = "{sb $winref{sbservertag $tag}}";
+
+    prompt = "{prompt $[.15]itemname}";
+    prompt_empty = "{prompt $winname}";
+
+    topic = " $topic";
+    topic_empty = " Irssi v$J - https://irssi.org";
+
+    lag = "{sb Lag: $0-}";
+    act = "{sb Act: $0-}";
+    more = "-- more --";
+  };
+
+  default = {
+
+    window = {
+
+      disabled = "no";
+      type = "window";
+      placement = "bottom";
+      position = "1";
+      visible = "active";
+
+      items = {
+        barstart = { priority = "100"; };
+        time = { };
+        user = { };
+        window = { };
+        window_empty = { };
+        lag = { priority = "-1"; };
+        act = { priority = "10"; };
+        more = { priority = "-1"; alignment = "right"; };
+        barend = { priority = "100"; alignment = "right"; };
+      };
+    };
+
+    window_inact = {
+
+      type = "window";
+      placement = "bottom";
+      position = "1";
+      visible = "inactive";
+
+      items = {
+        barstart = { priority = "100"; };
+        window = { };
+        window_empty = { };
+        more = { priority = "-1"; alignment = "right"; };
+        barend = { priority = "100"; alignment = "right"; };
+      };
+    };
+
+    prompt = {
+
+      type = "root";
+      placement = "bottom";
+      position = "100";
+      visible = "always";
+
+      items = {
+        prompt = { priority = "-1"; };
+        prompt_empty = { priority = "-1"; };
+        input = { priority = "10"; };
+      };
+    };
+
+    topic = {
+
+      type = "root";
+      placement = "top";
+      position = "1";
+      visible = "always";
+
+      items = {
+        topicbarstart = { priority = "100"; };
+        topic = { };
+        topic_empty = { };
+        topicbarend = { priority = "100"; alignment = "right"; };
+      };
+    };
+  };
+};
+
+settings = {
+  core = {
+    real_name = "Ismo Vuorinen";
+    user_name = "ivuorinen";
+    nick = "ivuorinen";
+  };
+  "fe-common/core" = { theme = "lyynx"; };
+  "fe-text" = { actlist_sort = "refnum"; };
+};

config/irssi/default.theme

@@ -120,7 +120,7 @@ abstracts = {
   # the basic styling of how to print message, $0 = nick mode, $1 = nick
   msgnick = "%K<%n$0$1-%K>%n %|";
 
-  # message from you is printed. "msgownnick" specifies the styling of the
+  # message from you is printed. "ownnick" specifies the styling of the
   # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the
   # whole line.
 
@@ -251,6 +251,7 @@ abstracts = {
   # default background for all statusbars. You can also give
   # the default foreground color for statusbar items.
   sb_background = "%4%w";
+  window_border = "%4%w";
 
   # default backround for "default" statusbar group
   #sb_default_bg = "%4";
@@ -261,8 +262,8 @@ abstracts = {
   # background for topicbar (same default)
   #sb_topic_bg = "%4";
 
-  # text at the beginning of statusbars. sb-item already puts
+  # text at the beginning of statusbars. "sb" already puts a space there,
-  # space there,so we don't use anything by default.
+  # so we don't use anything by default.
   sbstart = "";
   # text at the end of statusbars. Use space so that it's never
   # used for anything.

config/irssi/lyynx.theme

@@ -0,0 +1,258 @@
+# LyyNx.theme
+# started this by editing agon.theme, but later i noticed that there
+# was nothing left from agon :)
+# so here it is. i use it with transparent aterm, tint - lightblue,
+# shading - 99, foreground - lightyellow
+
+default_color = "-1";
+info_eol = "false";
+replaces = { "[]=" = "%K$*%n"; };
+
+abstracts = {
+  ##
+  ## generic
+  ##
+
+  # text to insert at the beginning of each non-message line
+  line_start = ". ";
+
+  # timestamp styling, nothing by default
+  timestamp = "%w$*%n";
+
+  # any kind of text that needs hilighting, default is to bold
+  hilight = "%_$*%_";
+
+  # any kind of error message, default is bright red
+  error = "%r$*%n";
+
+  # channel name is printed
+  channel = "%w$0-%n";
+
+  # nick is printed
+  nick = "%_%n$*%_";
+
+  # nick host is printed
+  nickhost = "$*";
+
+  # server name is printed
+  server = "%_$*%_";
+
+  # some kind of comment is printed
+  comment = "$*";
+
+  # reason for something is printed (part, quit, kick, ..)
+  reason = "{comment}";
+
+  # mode change is printed ([+o nick])
+  mode = "{comment $*}";
+
+  ##
+  ## channel specific messages
+  ##
+
+  # highlighted nick/host is printed (joins)
+  channick_hilight = "%c$0-%n";
+  chanhost_hilight = "{nickhost %w$0-%n}";
+
+  # nick/host is printed (parts, quits, etc.)
+  channick = "%c$*";
+  chanhost = "%w{nickhost $*}";
+
+  # highlighted channel name is printed
+  channelhilight = "%n$*%n";
+
+  # ban/ban exception/invite list mask is printed
+  ban = "%n$*%n";
+
+  ##
+  ## messages
+  ##
+
+  # the basic styling of how to print message, $0 = nick mode, $1 = nick
+  msgnick = "%_%n$0%n$1-%w:%n ";
+
+  # message from you is printed. "msgownnick" specifies the styling of the
+  # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the
+  # whole line.
+
+  # Example1: You want the message text to be green:
+  # ownmsgnick = "{msgnick $0 $1-}%g";
+  # Example2.1: You want < and> chars to be yellow:
+  # ownmsgnick = "%Y{msgnick $0 $1-%Y}%n";
+  # (you'll also have to remove <> from replaces list above)
+  # Example2.2: But you still want to keep <> grey for other messages:
+  # pubmsgnick = "%K{msgnick $0 $1-%K}%n";
+  # pubmsgmenick = "%K{msgnick $0 $1-%K}%n";
+  # pubmsghinick = "%K{msgnick $1 $0$2-%n%K}%n";
+  # ownprivmsgnick = "%K{msgnick $*%K}%n";
+  # privmsgnick = "%K{msgnick %R$*%K}%n";
+
+  # $0 = nick mod, $1 = nick
+  ownmsgnick = "%n{msgnick %n$0$1-%n}%w";
+  ownnick = "%w$*%n";
+
+  # public message in channel, $0 = nick mode, $1 = nick
+  pubmsgnick = "{msgnick %n$0 %b$1-}";
+  pubnick = "%w$*%n";
+
+  # public message in channel meant for me, $0 = nick mode, $1 = nick
+  pubmsgmenick = "{msgnick $0 $1-}";
+  menick = "%w$*";
+
+  # public highlighted message in channel
+  # $0 = highlight color, $1 = nick mode, $2 = nick
+  pubmsghinick = "{msgnick $1 $0$2-%n}";
+
+  # channel name is printed with message
+  msgchannel = "%K:%c$*%n";
+
+  # private message, $0 = nick, $1 = host
+  privmsg = "[%n$0%K(%W$1-%K)%n] ";
+
+  # private message from you, $0 = "msg", $1 = target nick
+  ownprivmsg = "[%n$0%K(%n$1-%K)%n] ";
+
+  # own private message in query
+  ownprivmsgnick = "{msgnick $*}%W";
+  ownprivnick = "%n$*%W";
+
+  # private message in query
+  privmsgnick = "{msgnick $*}";
+
+  ##
+  ## Actions (/ME stuff)
+  ##
+
+  # used internally by this theme
+  action_core = "%c * $*";
+
+  # generic one that's used by most actions
+  action = "{action_core $*} ";
+
+  # own action, both private/public
+  ownaction = "{action $*}";
+
+  # own action with target, both private/public
+  ownaction_target = "{action_core $0}%K:%c$1%n ";
+
+  # private action sent by others
+  pvtaction = "%W (*) $*%n ";
+  pvtaction_query = "{action $*}";
+
+  # public action sent by others
+  pubaction = "{action $*}";
+
+
+  ##
+  ## other IRC events
+  ##
+
+  # whois
+  whois = "$[8]0: $1-";
+
+  # notices
+  ownnotice = "[%n$0%K(%R$1-%K)]%n ";
+  notice = "%K-%C$*%K-%n ";
+  pubnotice_channel = "%K:%m$*";
+  pvtnotice_host = "%K(%m$*%K)";
+  servernotice = "%g!$*%n ";
+
+  # CTCPs
+  ownctcp = "[%y$0%K(%n$1-%K)] ";
+  ctcp = "%Y$*%n";
+
+  # wallops
+  wallop = "%W$*%n: ";
+  wallop_nick = "%n$*";
+  wallop_action = "%W * $*%n ";
+
+  # netsplits
+  netsplit = "%n$*%n";
+  netjoin = "%C$*%n";
+
+  # /names list
+  names_prefix = "";
+  names_nick = "%_$0%_$1- ";
+  names_nick_op = "{names_nick $*}";
+  names_nick_halfop = "{names_nick $*}";
+  names_nick_voice = "{names_nick $*}";
+  names_users = "%c$*%n";
+  names_channel = "%C$*%n";
+
+  # DCC
+  dcc = "%g$*%n";
+  dccfile = "%_$*%_";
+
+  # DCC chat, own msg/action
+  dccownmsg = "[%n$0%K($1-%K)%n] ";
+  dccownnick = "%n$*%n";
+  dccownquerynick = "%W$*%n";
+  dccownaction = "{action $*}";
+  dccownaction_target = "{action_core $0}%K:%c$1%n ";
+
+  # DCC chat, others
+  dccmsg = "[%G$1-%K(%g$0%K)%n] ";
+  dccquerynick = "%G$*%n";
+  dccaction = "%W (*dcc*) $*%n %|";
+
+  ##
+  ## statusbar
+  ##
+
+  # default background for all statusbars. You can also give
+  # the default foreground color for statusbar items.
+  sb_background = "%N%w";
+
+  # default backround for "default" statusbar group
+  #sb_default_bg = "%4";
+  # background for prompt / input line
+  sb_prompt_bg = "%n";
+  # background for info statusbar
+  sb_info_bg = "%8";
+  # background for topicbar (same default)
+  #sb_topic_bg = "%4";
+
+  # text at the beginning of statusbars. sb-item already puts
+  # space there,so we don't use anything by default.
+  sbstart = "";
+  # text at the end of statusbars. Use space so that it's never
+  # used for anything.
+  sbend = " ";
+
+  topicsbstart = "{sbstart $*}";
+  topicsbend = "{sbend $*}";
+
+  prompt = "$* ";
+
+  sb = " %n$*%n";
+  sbmode = "";
+  #sbaway = " (%g[away]%n)";
+  sbservertag = " $0";
+  sbnickmode = "$0";
+
+  # activity in statusbar
+
+  # ',' separator
+  sb_act_sep = "%K$*";
+  # normal text
+  sb_act_text = "%w$*";
+  # public message
+  sb_act_msg = "%c$*";
+  # hilight
+  sb_act_hilight = "%C$*";
+  # hilight with specified color, $0 = color, $1 = text
+  sb_act_hilight_color = "$0$1-%n";
+};
+formats = {
+  "fe-common/core" = {
+    join = "%g{channick $0} {chanhost $1} %cgot in {channel $2}";
+    part = "%g{channick $0} {chanhost $1} %cgot out of%n $2";
+    kick = "%g{channick $2} kicked %g{channick $0} ($3)";
+    quit = "%g{channick $0} {chanhost $1} %cleft irc%n ($2)";
+    line_start_irssi = "{line_start}";
+    nick_changed = "%g{channick $0} --> {channick $1}";
+    new_topic = "%g{nick $0} topic change -> {channel $1} to: $2";
+    endofnames = "$1 nicks totaly - $2 ops, $3 voices and $4 normal";
+    timestamp = "{timestamp %%H:%%M:%%S} ";
+  };
+};

config/irssi/scripts/autorun/autoaway.pl

@@ -0,0 +1,129 @@
+# /AUTOAWAY <n> - Mark user away after <n> seconds of inactivity
+# /AWAY - play nice with autoaway
+# New, brighter, whiter version of my autoaway script. Actually works :)
+# (c) 2000 Larry Daffner (vizzie@airmail.net)
+#     You may freely use, modify and distribute this script, as long as
+#      1) you leave this notice intact
+#      2) you don't pretend my code is yours
+#      3) you don't pretend your code is mine
+#
+# share and enjoy!
+
+# A simple script. /autoaway <n> will mark you as away automatically if
+# you have not typed any commands in <n> seconds. (<n>=0 disables the feature)
+# It will also automatically unmark you away the next time you type a command.
+# Note that using the /away command will disable the autoaway mechanism, as
+# well as the autoreturn. (when you unmark yourself, the autoaway wil
+# restart again)
+
+# Thanks to Adam Monsen for multiserver and config file fix
+
+use strict;
+use Irssi;
+use Irssi::Irc;
+
+use vars qw($VERSION %IRSSI);
+$VERSION = "0.5";
+%IRSSI = (
+    authors => 'Larry "Vizzie" Daffner',
+    contact => 'vizzie@airmail.net',
+    name => 'Automagic away setting',
+    description => 'Automatically goes  away after defined inactivity',
+    license => 'BSD',
+    url => 'http://www.flamingpackets.net/~vizzie/irssi/',
+    changed => '2018-12-02',
+);
+
+my ($autoaway_sec, $autoaway_to_tag, $autoaway_state);
+$autoaway_state = 0;
+
+#
+# /AUTOAWAY - set the autoaway timeout
+#
+sub cmd_autoaway {
+  my ($data, $server, $channel) = @_;
+
+  if (!($data =~ /^[0-9]+$/)) {
+    Irssi::print("autoaway: usage: /autoaway <seconds>");
+    return 1;
+  }
+
+  $autoaway_sec = $data;
+
+  if ($autoaway_sec) {
+    Irssi::settings_set_int("autoaway_timeout", $autoaway_sec);
+    Irssi::print("autoaway timeout set to $autoaway_sec seconds");
+  } else {
+    Irssi::print("autoway disabled");
+  }
+
+  if (defined($autoaway_to_tag)) {
+    Irssi::timeout_remove($autoaway_to_tag);
+    $autoaway_to_tag = undef;
+  }
+
+  if ($autoaway_sec) {
+    $autoaway_to_tag =
+      Irssi::timeout_add($autoaway_sec*1000, "auto_timeout", "");
+  }
+}
+
+#
+# away = Set us away or back, within the autoaway system
+sub cmd_away {
+  my ($data, $server, $channel) = @_;
+
+  if ($data eq "") {
+    $autoaway_state = 0;
+  } else {
+    if ($autoaway_state eq 0) {
+      Irssi::timeout_remove($autoaway_to_tag);
+      $autoaway_to_tag = undef;
+      $autoaway_state = 2;
+    }
+  }
+}
+
+sub auto_timeout {
+  my ($data, $server) = @_;
+
+  # we're in the process.. don't touch anything.
+  $autoaway_state = 3;
+  foreach my $server (Irssi::servers()) {
+      $server->command("/AWAY autoaway after $autoaway_sec seconds");
+  }
+
+  Irssi::timeout_remove($autoaway_to_tag);
+  $autoaway_state = 1;
+}
+
+sub reset_timer {
+   if ($autoaway_state eq 1) {
+     $autoaway_state = 3;
+     foreach my $server (Irssi::servers()) {
+         $server->command("/AWAY");
+     }
+
+     $autoaway_state = 0;
+   }
+  if ($autoaway_state eq 0) {
+    if (defined($autoaway_to_tag)) {
+      Irssi::timeout_remove($autoaway_to_tag);
+      $autoaway_to_tag = undef();
+    }
+    if ($autoaway_sec) {
+      $autoaway_to_tag = Irssi::timeout_add($autoaway_sec*1000, "auto_timeout", "");
+    }
+  }
+}
+
+Irssi::settings_add_int("misc", "autoaway_timeout", 0);
+
+$autoaway_sec = Irssi::settings_get_int("autoaway_timeout");
+reset_timer();
+
+Irssi::command_bind('autoaway', 'cmd_autoaway');
+Irssi::command_bind('away', 'cmd_away');
+Irssi::signal_add('send command', 'reset_timer');
+
+# vim:set expandtab ts=2 sw=2:

config/irssi/scripts/autorun/autowhois.pl

@@ -0,0 +1,39 @@
+# /WHOIS all the users who send you a private message.
+# v1.1 for irssi 0.7.98 by Timo Sirainen
+use strict;
+use Irssi;
+use vars qw($VERSION %IRSSI);
+$VERSION = "1.1";
+%IRSSI = (
+    authors	=> "Timo \'cras\' Sirainen",
+    contact	=> "tss\@iki.fi",
+    name	=> "autowhois",
+    description	=> "/WHOIS all the users who send you a private message.",
+    license	=> "Public Domain",
+    url		=> "http://irssi.org/",
+    changed	=> "2002-03-04T22:47+0100",
+    changes	=> "v1.1: don't /WHOIS if query exists for the nick already"
+);
+
+# History:
+#  v1.1: don't /WHOIS if query exists for the nick already
+
+my ($lastfrom, $lastquery);
+
+sub msg_private_first {
+  my ($server, $msg, $nick, $address) = @_;
+
+  $lastquery = $server->query_find($nick);
+}
+
+sub msg_private {
+  my ($server, $msg, $nick, $address) = @_;
+
+  return if $lastquery || $lastfrom eq $nick;
+
+  $lastfrom = $nick;
+  $server->command("whois $nick");
+}
+
+Irssi::signal_add_first('message private', 'msg_private_first');
+Irssi::signal_add('message private', 'msg_private');

config/irssi/scripts/autorun/go.pl

@@ -0,0 +1,115 @@
+use strict;
+use vars qw($VERSION %IRSSI);
+use Irssi;
+use Irssi::Irc;
+
+# Usage:
+# /script load go.pl
+# If you are in #irssi you can type /go #irssi or /go irssi or even /go ir ...
+# also try /go ir<tab> and /go  <tab> (that's two spaces)
+#
+# The following settings exist:
+#
+#   /SET go_match_case_sensitive [ON|OFF]
+#     Match window/item names sensitively (the default). Turning this off
+#     means e.g. "/go foo" would jump to a window named "Foobar", too.
+#
+#   /SET go_match_anchored [ON|OFF]
+#     Match window/names only at the start of the word (the default). Turning
+#     this off will mean that strings can match anywhere in the window/names.
+#     The leading '#' of channel names is optional either way.
+#
+#   /SET go_complete_case_sensitive [ON|OFF]
+#     When using tab-completion, match case-insensitively (the default).
+#     Turning this on means that "/go foo<tab>" will *not* suggest "Foobar".
+#
+#   /SET go_complete_anchored [ON|OFF]
+#     Match window/names only at the start of the word. The default is 'off',
+#     which causes completion to match anywhere in the window/names during
+#     completion. The leading '#' of channel names is optional either way.
+#
+
+$VERSION = '1.1.1';
+
+%IRSSI = (
+    authors     => 'nohar',
+    contact     => 'nohar@freenode',
+    name        => 'go to window',
+    description => 'Implements /go command that activates a window given a name/partial name. It features a nice completion.',
+    license     => 'GPLv2 or later',
+    changed     => '2019-02-25'
+);
+
+sub _make_regexp {
+	my ($name, $ci, $aw) = @_;
+	my $re = "\Q${name}\E";
+	$re = "(?i:$re)" unless $ci;
+	$re = "^#?$re" if $aw;
+	return $re;
+}
+
+sub signal_complete_go {
+	my ($complist, $window, $word, $linestart, $want_space) = @_;
+	my $channel = $window->get_active_name();
+	my $k = Irssi::parse_special('$k');
+
+        return unless ($linestart =~ /^\Q${k}\Ego\b/i);
+
+	my $re = _make_regexp($word,
+		Irssi::settings_get_bool('go_complete_case_sensitive'),
+		Irssi::settings_get_bool('go_complete_anchored'));
+	@$complist = ();
+	foreach my $w (Irssi::windows) {
+		my $name = $w->get_active_name();
+		if ($word ne "") {
+			if ($name =~ $re) {
+				push(@$complist, $name)
+			}
+		} else {
+			push(@$complist, $name);
+		}
+	}
+	Irssi::signal_stop();
+};
+
+sub cmd_go
+{
+	my($chan,$server,$witem) = @_;
+
+	my $case_sensitive = Irssi::settings_get_bool('go_match_case_sensitive');
+	my $match_anchored = Irssi::settings_get_bool('go_match_anchored');
+
+	$chan =~ s/ *//g;
+	my $re = _make_regexp($chan, $case_sensitive, $match_anchored);
+
+	my @matches;
+	foreach my $w (Irssi::windows) {
+		my $name = $w->get_active_name();
+		if (($case_sensitive && $name eq $chan) ||
+			(!$case_sensitive && CORE::fc $name eq CORE::fc $chan)) {
+			$w->set_active();
+			return;
+		} elsif ($name =~ /$re/) {
+			push(@matches, $w);
+		}
+	}
+	if (@matches) {
+		$matches[0]->set_active();
+	}
+}
+
+Irssi::command_bind("go", "cmd_go");
+Irssi::signal_add_first('complete word', 'signal_complete_go');
+Irssi::settings_add_bool('go', 'go_match_case_sensitive', 1);
+Irssi::settings_add_bool('go', 'go_complete_case_sensitive', 0);
+Irssi::settings_add_bool('go', 'go_match_anchored', 1);
+Irssi::settings_add_bool('go', 'go_complete_anchored', 0);
+
+# Changelog
+#
+# 2017-02-02  1.1  martin f. krafft <madduck@madduck.net>
+#   - made case-sensitivity of match configurable
+#   - made anchoring of search strings configurable
+#
+# 2019-02-025  1.1.1  dylan lloyd <dylan@disinclined.org>
+#   - prefer exact channel matches

config/irssi/scripts/autorun/highlite.pl

@@ -0,0 +1,113 @@
+use strict;
+use Irssi;
+use Irssi::Irc;
+
+use vars qw($VERSION %IRSSI);
+
+$VERSION = "1.0";
+%IRSSI = (
+	"authors"       => "Mantis",
+	"contact"       => "mantis\@inta-link.com",
+	"name"          => "highlite",
+	"description"   => "shows events happening in all channels you are in that may concern you",
+	"url"           => "http://www.inta-link.com/",
+	"license"       => "GNU GPL v2",
+	"changed"       => "2003-01-03"
+);
+
+sub msg_join
+{
+  my ($server, $channame, $nick, $host) = @_;
+  $channame =~ s/^://;
+
+  my $windowname = Irssi::window_find_name('highlite');
+  $windowname->print("%B%0JOIN : " . $nick . " : " . $channame . " : " . $host, MSGLEVEL_CLIENTCRAP) if ($windowname);
+}
+
+sub msg_part
+{
+  my ($server, $channame, $nick, $host) = @_;
+  $channame =~ s/^://;
+
+  my $windowname = Irssi::window_find_name('highlite');
+  $windowname->print("%b%0PART : " . $nick . " : " . $channame . " : " . $host, MSGLEVEL_CLIENTCRAP) if ($windowname);
+}
+
+sub msg_quit
+{
+  my ($server, $nick, $host, $quitmsg) = @_;
+
+  if (substr($quitmsg, 0, 14) eq "Read error to ")
+  {
+    $quitmsg = "[ General Read Error ]";
+  }
+  if (substr($quitmsg, 0, 17) eq "Ping timeout for ")
+  {
+    $quitmsg = "[ General Ping Timeout Error ]";
+  }
+
+  my $windowname = Irssi::window_find_name('highlite');
+  $windowname->print("%R%0QUIT : " . $nick . " : " . $host . " : " . $quitmsg, MSGLEVEL_CLIENTCRAP) if ($windowname);
+
+  $quitmsg = "";
+}
+
+sub msg_topic
+{
+  my ($server, $channame, $topicmsg, $nick, $host) = @_;
+  $channame =~ s/^://;
+
+  my $windowname = Irssi::window_find_name('highlite');
+  $windowname->print("%G%0TOPIC : " . $nick . " : " . $channame . " : " . $topicmsg, MSGLEVEL_CLIENTCRAP) if ($windowname);
+}
+
+sub msg_nick
+{
+  my ($server, $nick, $old_nick, $host) = @_;
+
+  my $windowname = Irssi::window_find_name('highlite');
+  $windowname->print("%m%0NICK : " . $old_nick . " : " . $nick . " : " . $host, MSGLEVEL_CLIENTCRAP) if ($windowname);
+}
+
+sub msg_kick
+{
+  my ($server, $channame, $kicked, $nick, $host, $reason) = @_;
+  $channame =~ s/^://;
+
+  my $windowname = Irssi::window_find_name('highlite');
+  $windowname->print("%Y%0KICK : " . $kicked . " : " . $channame . " : " . $nick . " : " . $reason, MSGLEVEL_CLIENTCRAP) if ($windowname);
+}
+
+sub sig_printtext {
+  my ($dest, $text, $stripped) = @_;
+
+  if (($dest->{level} & (MSGLEVEL_HILIGHT|MSGLEVEL_MSGS)) && ($dest->{level} & MSGLEVEL_NOHILIGHT) == 0)
+  {
+    if ($dest->{level} & MSGLEVEL_PUBLIC)
+    {
+      my $windowname = Irssi::window_find_name('highlite');
+
+      $windowname->print("%W%0HIGHLITE : " . $dest->{target} . " : " . $text, MSGLEVEL_CLIENTCRAP) if ($windowname);
+    }
+  }
+}
+
+my $windowname = Irssi::window_find_name('highlite');
+if (!$windowname)
+{
+  Irssi::command("window new hidden");
+  Irssi::command("window name highlite");
+}
+
+Irssi::signal_add(
+{
+  'message join' => \&msg_join,
+  'message part' => \&msg_part,
+  'message quit' => \&msg_quit,
+  'message topic' => \&msg_topic,
+  'print text', 'sig_printtext',
+  'message nick' => \&msg_nick,
+  'message kick' => \&msg_kick
+}
+);
+

config/irssi/scripts/autorun/nickcolor.pl

@@ -0,0 +1,257 @@
+use strict;
+use Irssi 20020101.0250 ();
+use vars qw($VERSION %IRSSI);
+$VERSION = "2.1";
+%IRSSI = (
+    authors     => "Timo Sirainen, Ian Peters, David Leadbeater, Bruno Cattáneo",
+    contact     => "tss\@iki.fi",
+    name        => "Nick Color",
+    description => "assign a different color for each nick",
+    license	    => "Public Domain",
+    url         => "http://irssi.org/",
+    changed     => "Mon 08 Jan 21:28:53 BST 2018",
+);
+
+# Tweaks to this plugin are:
+# - Moved irssi folder under $XDG_CONFIG_HOME/irssi/
+# - changed TABs to spaces
+
+# Settings:
+#   nickcolor_colors: List of color codes to use.
+#   e.g. /set nickcolor_colors 2 3 4 5 6 7 9 10 11 12 13
+#   (avoid 8, as used for hilights in the default theme).
+#
+#   nickcolor_enable_prefix: Enables prefix for same nick.
+#
+#   nickcolor_enable_truncate: Enables nick truncation.
+#
+#   nickcolor_prefix_text: Prefix text for succesive messages.
+#   e.g. /set nickcolor_prefix_text -
+#
+#   nickcolor_truncate_value: Truncate nick value.
+#   e.g. /set nickcolor_truncate_value -7
+#   This will truncate nicknames at 7 characters and make them right aligned
+
+my %saved_colors;
+my %session_colors = {};
+my %saved_nicks; # To store each channel's last nickname
+
+sub load_colors {
+  open my $color_fh, "<", "$ENV{XDG_CONFIG_HOME}/irssi/saved_colors";
+  while (<$color_fh>) {
+    chomp;
+    my($nick, $color) = split ":";
+    $saved_colors{$nick} = $color;
+  }
+}
+
+sub save_colors {
+  open COLORS, ">", "$ENV{XDG_CONFIG_HOME}/irssi/saved_colors";
+
+  foreach my $nick (keys %saved_colors) {
+    print COLORS "$nick:$saved_colors{$nick}\n";
+  }
+
+  close COLORS;
+}
+
+# If someone we've colored (either through the saved colors, or the hash
+# function) changes their nick, we'd like to keep the same color associated
+# with them (but only in the session_colors, ie a temporary mapping).
+
+sub sig_nick {
+  my ($server, $newnick, $nick, $address) = @_;
+  my $color;
+
+  $newnick = substr ($newnick, 1) if ($newnick =~ /^:/);
+
+  if ($color = $saved_colors{$nick}) {
+    $session_colors{$newnick} = $color;
+  } elsif ($color = $session_colors{$nick}) {
+    $session_colors{$newnick} = $color;
+  }
+}
+
+# This gave reasonable distribution values when run across
+# /usr/share/dict/words
+
+sub simple_hash {
+  my ($string) = @_;
+  chomp $string;
+  my @chars = split //, $string;
+  my $counter;
+
+  foreach my $char (@chars) {
+    $counter += ord $char;
+  }
+
+  my @colors = split / /, Irssi::settings_get_str('nickcolor_colors');
+  $counter = $colors[$counter % @colors];
+
+  return $counter;
+}
+
+# process public (others) messages
+sub sig_public {
+  my ($server, $msg, $nick, $address, $target) = @_;
+
+  my $enable_prefix = Irssi::settings_get_bool('nickcolor_enable_prefix');
+  my $enable_truncate = Irssi::settings_get_bool('nickcolor_enable_truncate');
+  my $prefix_text = Irssi::settings_get_str('nickcolor_prefix_text');
+  my $truncate_value = Irssi::settings_get_int('nickcolor_truncate_value');
+
+  # Reference for server/channel
+  my $tagtarget = "$server->{tag}/$target";
+
+  # Set default nick truncate value to 0 if option is disabled
+  $truncate_value = 0 if (!$enable_truncate);
+
+  # Has the user assigned this nick a color?
+  my $color = $saved_colors{$nick};
+
+  # Have -we- already assigned this nick a color?
+  if (!$color) {
+    $color = $session_colors{$nick};
+  }
+
+  # Let's assign this nick a color
+  if (!$color) {
+    $color = simple_hash $nick;
+    $session_colors{$nick} = $color;
+  }
+
+  $color = sprintf "\003%02d", $color;
+
+  # Optional: We check if it's the same nickname for current target
+  if ($saved_nicks{$tagtarget} eq $nick && $enable_prefix)
+  {
+    # Grouped message
+    Irssi::command('/^format pubmsg ' . $prefix_text . '$1');
+  }
+  else
+  {
+    # Normal message
+    Irssi::command('/^format pubmsg {pubmsgnick $2 {pubnick ' . $color . '$[' . $truncate_value . ']0}}$1');
+
+    # Save nickname for next message
+    $saved_nicks{$tagtarget} = $nick;
+  }
+
+}
+
+# process public (me) messages
+sub sig_me {
+  my ($server, $msg, $target) = @_;
+  my $nick = $server->{nick};
+
+  my $enable_prefix = Irssi::settings_get_bool('nickcolor_enable_prefix');
+  my $enable_truncate = Irssi::settings_get_bool('nickcolor_enable_truncate');
+  my $prefix_text = Irssi::settings_get_str('nickcolor_prefix_text');
+  my $truncate_value = Irssi::settings_get_int('nickcolor_truncate_value');
+
+  # Reference for server/channel
+  my $tagtarget = "$server->{tag}/$target";
+
+  # Set default nick truncate value to 0 if option is disabled
+  $truncate_value = 0 if (!$enable_truncate);
+
+  # Optional: We check if it's the same nickname for current target
+  if ($saved_nicks{$tagtarget} eq $nick && $enable_prefix)
+  {
+    # Grouped message
+    Irssi::command('/^format own_msg ' . $prefix_text . '$1');
+  }
+  else
+  {
+    # Normal message
+    Irssi::command('/^format own_msg {ownmsgnick $2 {ownnick $[' . $truncate_value . ']0}}$1');
+
+    # Save nickname for next message
+    $saved_nicks{$tagtarget} = $nick;
+  }
+
+}
+
+# process public (others) actions
+sub sig_action_public {
+  my ($server, $msg, $nick, $address, $target) = @_;
+
+  my $enable_prefix = Irssi::settings_get_bool('nickcolor_enable_prefix');
+
+  # Reference for server/channel
+  my $tagtarget = "$server->{tag}/$target";
+
+  # Empty current target nick if prefix option is enabled
+  $saved_nicks{$tagtarget} = '' if ($enable_prefix);
+
+}
+
+# process public (me) actions
+sub sig_action_me {
+  my ($server, $msg, $target) = @_;
+  my $nick = $server->{nick};
+
+  my $enable_prefix = Irssi::settings_get_bool('nickcolor_enable_prefix');
+
+  # Reference for server/channel
+  my $tagtarget = "$server->{tag}/$target";
+
+  # Empty current target nick if prefix option is enabled
+  $saved_nicks{$tagtarget} = '' if ($enable_prefix);
+
+}
+
+sub cmd_color {
+  my ($data, $server, $witem) = @_;
+  my ($op, $nick, $color) = split " ", $data;
+
+  $op = lc $op;
+
+  if (!$op) {
+    Irssi::print ("No operation given (save/set/clear/list/preview)");
+  } elsif ($op eq "save") {
+    save_colors;
+  } elsif ($op eq "set") {
+    if (!$nick) {
+      Irssi::print ("Nick not given");
+    } elsif (!$color) {
+      Irssi::print ("Color not given");
+    } elsif ($color < 2 || $color > 14) {
+      Irssi::print ("Color must be between 2 and 14 inclusive");
+    } else {
+      $saved_colors{$nick} = $color;
+    }
+  } elsif ($op eq "clear") {
+    if (!$nick) {
+      Irssi::print ("Nick not given");
+    } else {
+      delete ($saved_colors{$nick});
+    }
+  } elsif ($op eq "list") {
+    Irssi::print ("\nSaved Colors:");
+    foreach my $nick (keys %saved_colors) {
+      Irssi::print (chr (3) . sprintf("%02d", $saved_colors{$nick}) . "$nick" .
+        chr (3) . "1 ($saved_colors{$nick})");
+    }
+  } elsif ($op eq "preview") {
+    Irssi::print ("\nAvailable colors:");
+    foreach my $i (2..14) {
+      Irssi::print (chr (3) . "$i" . "Color #$i");
+    }
+  }
+}
+
+load_colors;
+
+Irssi::settings_add_str('misc', 'nickcolor_colors', '2 3 4 5 6 7 9 10 11 12 13');
+Irssi::settings_add_bool('misc', 'nickcolor_enable_prefix', 0);
+Irssi::settings_add_bool('misc', 'nickcolor_enable_truncate', 0);
+Irssi::settings_add_str('misc', 'nickcolor_prefix_text' => '- ');
+Irssi::settings_add_int('misc', 'nickcolor_truncate_value' => 0);
+Irssi::command_bind('color', 'cmd_color');
+
+Irssi::signal_add('message public', 'sig_public');
+Irssi::signal_add('message own_public', 'sig_me');
+Irssi::signal_add('message irc action', 'sig_action_public');
+Irssi::signal_add('message irc own_action', 'sig_action_me');
+Irssi::signal_add('event nick', 'sig_nick');

config/irssi/scripts/autorun/trackbar.pl

@@ -0,0 +1,606 @@
+## trackbar.pl
+#
+# This little script will do just one thing: it will draw a line each time you
+# switch away from a window. This way, you always know just upto where you've
+# been reading that window :) It also removes the previous drawn line, so you
+# don't see double lines.
+#
+#  redraw trackbar only works on irssi 0.8.17 or higher.
+#
+##
+
+## Usage:
+#
+#     The script works right out of the box, but if you want you can change
+#     the working by /set'ing the following variables:
+#
+#    Setting:     trackbar_style
+#    Description: This setting will be the color of your trackbar line.
+#                 By default the value will be '%K', only Irssi color
+#                 formats are allowed. If you don't know the color formats
+#                 by heart, you can take a look at the formats documentation.
+#                 You will find the proper docs on http://www.irssi.org/docs.
+#
+#    Setting:     trackbar_string
+#    Description: This is the string that your line will display. This can
+#                 be multiple characters or just one. For example: '~-~-'
+#                 The default setting is '-'.
+#                 Here are some unicode characters you can try:
+#                     "───" => U+2500 => a line
+#                     "═══" => U+2550 => a double line
+#                     "━━━" => U+2501 => a wide line
+#                     "▭  " => U+25ad => a white rectangle
+#
+#    Setting:     trackbar_use_status_window
+#    Description: If this setting is set to OFF, Irssi won't print a trackbar
+#                 in the statuswindow
+#
+#    Setting:     trackbar_ignore_windows
+#    Description: A list of windows where no trackbar should be printed
+#
+#    Setting:     trackbar_print_timestamp
+#    Description: If this setting is set to ON, Irssi will print the formatted
+#                 timestamp in front of the trackbar.
+#
+#    Setting:     trackbar_require_seen
+#    Description: Only clear the trackbar if it has been scrolled to.
+#
+#    Setting:     trackbar_all_manual
+#    Description: Never clear the trackbar until you do /mark.
+#
+#     /mark is a command that will redraw the line at the bottom.
+#
+#    Command:     /trackbar, /trackbar goto
+#    Description: Jump to where the trackbar is, to pick up reading
+#
+#    Command:     /trackbar keep
+#    Description: Keep this window's trackbar where it is the next time
+#                 you switch windows (then this flag is cleared again)
+#
+#    Command:     /mark, /trackbar mark
+#    Description: Remove the old trackbar and mark the bottom of this
+#                 window with a new trackbar
+#
+#    Command:     /trackbar markvisible
+#    Description: Like mark for all visible windows
+#
+#    Command:     /trackbar markall
+#    Description: Like mark for all windows
+#
+#    Command:     /trackbar remove
+#    Description: Remove this window's trackbar
+#
+#    Command:     /trackbar removeall
+#    Description: Remove all windows' trackbars
+#
+#    Command:     /trackbar redraw
+#    Description: Force redraw of trackbars
+#
+##
+
+##
+#
+# For bugreports and other improvements contact one of the authors.
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this script; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+##
+
+use strict;
+use warnings;
+use vars qw($VERSION %IRSSI);
+
+$VERSION = "2.9"; # a4c78e85092a271
+
+%IRSSI = (
+    authors     => "Peter 'kinlo' Leurs, Uwe Dudenhoeffer, " .
+                   "Michiel Holtkamp, Nico R. Wohlgemuth, " .
+                   "Geert Hauwaerts",
+    contact     => 'peter@pfoe.be',
+    patchers    => 'Johan Kiviniemi (UTF-8), Uwe Dudenhoeffer (on-upgrade-remove-line)',
+    name        => 'trackbar',
+    description => 'Shows a bar where you have last read a window.',
+    license     => 'GNU General Public License',
+    url         => 'http://www.pfoe.be/~peter/trackbar/',
+    commands    => 'trackbar',
+);
+
+## Comments and remarks.
+#
+# This script uses settings.
+# Use /SET  to change the value or /TOGGLE to switch it on or off.
+#
+#
+#    Tip:     The command 'trackbar' is very useful if you bind that to a key,
+#             so you can easily jump to the trackbar. Please see 'help bind' for
+#             more information about keybindings in Irssi.
+#
+#    Command: /BIND meta2-P key F1
+#             /BIND F1 command trackbar
+#
+##
+
+## Bugfixes and new items in this rewrite.
+#
+# * Remove all the trackbars before upgrading.
+# * New setting trackbar_use_status_window to control the statuswindow trackbar.
+# * New setting trackbar_print_timestamp to print a timestamp or not.
+# * New command 'trackbar' to scroll up to the trackbar.
+# * When resizing your terminal, Irssi will update all the trackbars to the new size.
+# * When changing trackbar settings, change all the trackbars to the new settings.
+# * New command 'trackbar mark' to draw a new trackbar (The old '/mark').
+# * New command 'trackbar markall' to draw a new trackbar in each window.
+# * New command 'trackbar remove' to remove the trackbar from the current window.
+# * New command 'trackbar removeall' to remove all the trackbars.
+# * Don't draw a trackbar in empty windows.
+# * Added a version check to prevent Irssi redraw errors.
+# * Fixed a bookmark NULL versus 0 bug.
+# * Fixed a remove-line bug in Uwe Dudenhoeffer his patch.
+# * New command 'help trackbar' to display the trackbar commands.
+# * Fixed an Irssi startup bug, now processing each auto-created window.
+#
+##
+
+## Known bugs and the todolist.
+#
+#    Todo: * Instead of drawing a line, invert the line.
+#
+##
+
+## Authors:
+#
+#   - Main maintainer & author: Peter 'kinlo' Leurs
+#   - Many thanks to Timo 'cras' Sirainen for placing me on my way
+#   - on-upgrade-remove-line patch by Uwe Dudenhoeffer
+#   - trackbar resizing by Michiel Holtkamp (02 Jul 2012)
+#   - scroll to trackbar, window excludes, and timestamp options by Nico R.
+#     Wohlgemuth (22 Sep 2012)
+#
+##
+
+## Version history:
+#
+#  2.9: - fix crash on /mark in empty window
+#  2.8: - fix /^join bug
+#  2.7: - add /set trackbar_all_manual option
+#  2.5: - merge back on scripts.irssi.org
+#       - fix /trackbar redraw broken in 2.4
+#       - fix legacy encodings
+#       - add workaround for irssi issue #271
+#  2.4: - add support for horizontal splits
+#  2.3: - add some features for seen tracking using other scripts
+#  2.0: - big rewrite based on 1.4
+#         * removed /tb, you can have it with /alias tb trackbar if you want
+#         * subcommand and settings changes:
+#              /trackbar vmark  => /trackbar markvisible
+#              /trackbar scroll => /trackbar goto (or just /trackbar)
+#              /trackbar help   => /help trackbar
+#              /set trackbar_hide_windows => /set trackbar_ignore_windows
+#              /set trackbar_timestamp    => /set trackbar_print_timestamp
+#         * magic line strings were removed, just paste the unicode you want!
+#         * trackbar_timestamp_styled is not currently supported
+#  1.9: - add version guard
+#  1.8: - sub draw_bar
+#  1.7: - Added /tb scroll, trackbar_hide_windows, trackbar_timestamp_timestamp
+#         and trackbar_timestamp_styled
+#  1.6: - Work around Irssi resize bug, please do /upgrade! (see below)
+#  1.5: - Resize trackbars in all windows when terminal is resized
+#  1.4: - Changed our's by my's so the irssi script header is valid
+#       - Removed utf-8 support.  In theory, the script should work w/o any
+#         problems for utf-8, just set trackbar_string to a valid utf-8 character
+#         and everything *should* work.  However, this script is being plagued by
+#         irssi internal bugs.  The function Irssi::settings_get_str does NOT handle
+#         unicode strings properly, hence you will notice problems when setting the bar
+#         to a unicode char.  For changing your bar to utf-8 symbols, read the line sub.
+#  1.3: - Upgrade now removes the trackbars.
+#       - Some code cleanups, other defaults
+#       - /mark sets the line to the bottom
+#  1.2: - Support for utf-8
+#       - How the bar looks can now be configured with trackbar_string
+#         and trackbar_style
+#  1.1: - Fixed bug when closing window
+#  1.0: - Initial release
+#
+##
+
+use Irssi;
+use Irssi::TextUI;
+use Encode;
+
+use POSIX qw(strftime);
+
+sub cmd_help {
+    my ($args) = @_;
+    if ($args =~ /^trackbar *$/i) {
+        print CLIENTCRAP <<HELP
+%9Syntax:%9
+
+TRACKBAR
+TRACKBAR GOTO
+TRACKBAR KEEP
+TRACKBAR MARK
+TRACKBAR MARKVISIBLE
+TRACKBAR MARKALL
+TRACKBAR REMOVE
+TRACKBAR REMOVEALL
+TRACKBAR REDRAW
+
+%9Parameters:%9
+
+    GOTO:        Jump to where the trackbar is, to pick up reading
+    KEEP:        Keep this window's trackbar where it is the next time
+                 you switch windows (then this flag is cleared again)
+    MARK:        Remove the old trackbar and mark the bottom of this
+                 window with a new trackbar
+    MARKVISIBLE: Like mark for all visible windows
+    MARKALL:     Like mark for all windows
+    REMOVE:      Remove this window's trackbar
+    REMOVEALL:   Remove all windows' trackbars
+    REDRAW:      Force redraw of trackbars
+
+%9Description:%9
+
+    Manage a trackbar. Without arguments, it will scroll up to the trackbar.
+
+%9Examples:%9
+
+    /TRACKBAR MARK
+    /TRACKBAR REMOVE
+HELP
+    }
+}
+
+Irssi::theme_register([
+    'trackbar_loaded', '%R>>%n %_Scriptinfo:%_ Loaded $0 version $1 by $2.',
+    'trackbar_wrong_version', '%R>>%n %_Trackbar:%_ Please upgrade your client to 0.8.17 or above if you would like to use this feature of trackbar.',
+    'trackbar_all_removed', '%R>>%n %_Trackbar:%_ All the trackbars have been removed.',
+    'trackbar_not_found', '%R>>%n %_Trackbar:%_ No trackbar found in this window.',
+]);
+
+my $old_irssi = Irssi::version < 20140701;
+sub check_version {
+    if ($old_irssi) {
+        Irssi::printformat(MSGLEVEL_CLIENTCRAP, 'trackbar_wrong_version');
+        return;
+    } else {
+        return 1;
+    }
+}
+
+sub is_utf8 {
+    lc Irssi::settings_get_str('term_charset') eq 'utf-8'
+}
+
+my (%config, %keep_trackbar, %unseen_trackbar);
+
+sub remove_one_trackbar {
+    my $win = shift;
+    my $view = shift || $win->view;
+    my $line = $view->get_bookmark('trackbar');
+    if (defined $line) {
+        my $bottom = $view->{bottom};
+        $view->remove_line($line);
+        $win->command('^scrollback end') if $bottom && !$win->view->{bottom};
+        $view->redraw;
+    }
+}
+
+sub add_one_trackbar_pt1 {
+    my $win = shift;
+    my $view = shift || $win->view;
+
+    my $last_cur_line = ($view->{buffer}{cur_line}||+{})->{_irssi};
+    $win->print(line($win->{width}), MSGLEVEL_NEVER);
+
+    my $cur_line = ($win->view->{buffer}{cur_line}||+{})->{_irssi}; # get a fresh buffer
+
+    ($last_cur_line//'') ne ($cur_line//'') # printing was successful
+}
+
+sub add_one_trackbar_pt2 {
+    my $win = shift;
+    my $view = $win->view;
+
+    $view->set_bookmark_bottom('trackbar');
+    $unseen_trackbar{ $win->{_irssi} } = 1;
+    Irssi::signal_emit("window trackbar added", $win);
+    $view->redraw;
+}
+
+sub update_one_trackbar {
+    my $win = shift;
+    my $view = shift || $win->view;
+    my $force = shift;
+    my $ignored = win_ignored($win, $view);
+    my $success;
+
+    $success = add_one_trackbar_pt1($win, $view) ? 1 : 0
+	if $force || !$ignored;
+
+    remove_one_trackbar($win, $view)
+	if ( $success || !defined $success ) && ( $force || !defined $force || !$ignored );
+
+    add_one_trackbar_pt2($win)
+	if $success;
+}
+
+sub win_ignored {
+    my $win = shift;
+    my $view = shift || $win->view;
+    return 1 unless $view->{buffer}{lines_count};
+    return 1 if $win->{name} eq '(status)' && !$config{use_status_window};
+    no warnings 'uninitialized';
+    return 1 if grep { $win->{name} eq $_ || $win->{refnum} eq $_
+			   || $win->get_active_name eq $_ } @{ $config{ignore_windows} };
+    return 0;
+}
+
+sub sig_window_changed {
+    my ($newwindow, $oldwindow) = @_;
+    return unless $oldwindow;
+    redraw_one_trackbar($newwindow) unless $old_irssi;
+    trackbar_update_seen($newwindow);
+    return if delete $keep_trackbar{ $oldwindow->{_irssi} };
+    trackbar_update_seen($oldwindow);
+    return if $config{require_seen} && $unseen_trackbar{ $oldwindow->{_irssi } };
+    return if $config{all_manual};
+    update_one_trackbar($oldwindow, undef, 0);
+}
+
+sub trackbar_update_seen {
+    my $win = shift;
+    return unless $win;
+    return unless $unseen_trackbar{ $win->{_irssi} };
+
+    my $view = $win->view;
+    my $line = $view->get_bookmark('trackbar');
+    unless ($line) {
+        delete $unseen_trackbar{ $win->{_irssi} };
+        Irssi::signal_emit("window trackbar seen", $win);
+        return;
+    }
+    my $startline = $view->{startline};
+    return unless $startline;
+
+    if ($startline->{info}{time} < $line->{info}{time}
+            || $startline->{_irssi} == $line->{_irssi}) {
+        delete $unseen_trackbar{ $win->{_irssi} };
+        Irssi::signal_emit("window trackbar seen", $win);
+    }
+}
+
+sub screen_length;
+{ local $@;
+  eval { require Text::CharWidth; };
+  unless ($@) {
+      *screen_length = sub { Text::CharWidth::mbswidth($_[0]) };
+  }
+  else {
+      *screen_length = sub {
+          my $temp = shift;
+          Encode::_utf8_on($temp) if is_utf8();
+          length($temp)
+      };
+  }
+}
+
+{ my %strip_table = (
+    (map { $_ => '' } (split //, '04261537' .  'kbgcrmyw' . 'KBGCRMYW' . 'U9_8I:|FnN>#[' . 'pP')),
+    (map { $_ => $_ } (split //, '{}%')),
+   );
+  sub c_length {
+      my $o = Irssi::strip_codes($_[0]);
+      $o =~ s/(%(%|Z.{6}|z.{6}|X..|x..|.))/exists $strip_table{$2} ? $strip_table{$2} :
+          $2 =~ m{x(?:0[a-f]|[1-6][0-9a-z]|7[a-x])|z[0-9a-f]{6}}i ? '' : $1/gex;
+      screen_length($o)
+  }
+}
+
+sub line {
+    my ($width, $time)  = @_;
+    my $string = $config{string};
+    $string = ' ' unless length $string;
+    $time ||= time;
+
+    Encode::_utf8_on($string) if is_utf8();
+    my $length = c_length($string);
+
+    my $format = '';
+    if ($config{print_timestamp}) {
+        $format = $config{timestamp_str};
+        $format =~ y/%/\01/;
+        $format =~ s/\01\01/%/g;
+        $format = strftime($format, localtime $time);
+        $format =~ y/\01/%/;
+    }
+
+    my $times = $width / $length;
+    $times += 1 if $times != int $times;
+    my $style = "$config{style}";
+    Encode::_utf8_on($style) if is_utf8();
+    $format .= $style;
+    $width -= c_length($format);
+    $string x= $times;
+    chop $string while length $string && c_length($string) > $width;
+    return $format . $string;
+}
+
+sub remove_all_trackbars {
+    for my $window (Irssi::windows) {
+        next unless ref $window;
+        remove_one_trackbar($window);
+    }
+}
+
+sub UNLOAD {
+    remove_all_trackbars();
+}
+
+sub redraw_one_trackbar {
+    my $win = shift;
+    my $view = $win->view;
+    my $line = $view->get_bookmark('trackbar');
+    return unless $line;
+    my $bottom = $view->{bottom};
+    $win->print_after($line, MSGLEVEL_NEVER, line($win->{width}, $line->{info}{time}),
+      $line->{info}{time});
+    $view->set_bookmark('trackbar', $win->last_line_insert);
+    $view->remove_line($line);
+    $win->command('^scrollback end') if $bottom && !$win->view->{bottom};
+    $view->redraw;
+}
+
+sub redraw_trackbars {
+    return unless check_version();
+    for my $win (Irssi::windows) {
+        next unless ref $win;
+        redraw_one_trackbar($win);
+    }
+}
+
+sub goto_trackbar {
+    my $win = Irssi::active_win;
+    my $line = $win->view->get_bookmark('trackbar');
+
+    if ($line) {
+        $win->command("scrollback goto ". strftime("%d %H:%M:%S", localtime($line->{info}{time})));
+    } else {
+        $win->printformat(MSGLEVEL_CLIENTCRAP, 'trackbar_not_found');
+    }
+}
+
+sub cmd_mark {
+    update_one_trackbar(Irssi::active_win, undef, 1);
+}
+
+sub cmd_markall {
+    for my $window (Irssi::windows) {
+        next unless ref $window;
+        update_one_trackbar($window);
+    }
+}
+
+sub signal_stop {
+    Irssi::signal_stop;
+}
+
+sub cmd_markvisible {
+    my @wins = Irssi::windows;
+    my $awin =
+        my $bwin = Irssi::active_win;
+    my $awin_counter = 0;
+    Irssi::signal_add_priority('window changed' => 'signal_stop', -99);
+    do {
+        Irssi::active_win->command('window up');
+        $awin = Irssi::active_win;
+        update_one_trackbar($awin);
+        ++$awin_counter;
+    } until ($awin->{refnum} == $bwin->{refnum} || $awin_counter >= @wins);
+    Irssi::signal_remove('window changed' => 'signal_stop');
+}
+
+sub cmd_trackbar_remove_one {
+    remove_one_trackbar(Irssi::active_win);
+}
+
+sub cmd_remove_all_trackbars {
+    remove_all_trackbars();
+    Irssi::printformat(MSGLEVEL_CLIENTCRAP, 'trackbar_all_removed');
+}
+
+sub cmd_keep_once {
+    $keep_trackbar{ Irssi::active_win->{_irssi} } = 1;
+}
+
+sub trackbar_runsub {
+    my ($data, $server, $item) = @_;
+    $data =~ s/\s+$//g;
+
+    if ($data) {
+        Irssi::command_runsub('trackbar', $data, $server, $item);
+    } else {
+        goto_trackbar();
+    }
+}
+
+sub update_config {
+    my $was_status_window = $config{use_status_window};
+    $config{style} = Irssi::settings_get_str('trackbar_style');
+    $config{string} = Irssi::settings_get_str('trackbar_string');
+    $config{require_seen} = Irssi::settings_get_bool('trackbar_require_seen');
+    $config{all_manual} = Irssi::settings_get_bool('trackbar_all_manual');
+    $config{ignore_windows} = [ split /[,\s]+/, Irssi::settings_get_str('trackbar_ignore_windows') ];
+    $config{use_status_window} = Irssi::settings_get_bool('trackbar_use_status_window');
+    $config{print_timestamp} = Irssi::settings_get_bool('trackbar_print_timestamp');
+    if (defined $was_status_window && $was_status_window != $config{use_status_window}) {
+        if (my $swin = Irssi::window_find_name('(status)')) {
+            if ($config{use_status_window}) {
+                update_one_trackbar($swin);
+            }
+            else {
+                remove_one_trackbar($swin);
+            }
+        }
+    }
+    if ($config{print_timestamp}) {
+        my $ts_format = Irssi::settings_get_str('timestamp_format');
+        my $ts_theme = Irssi::current_theme->get_format('fe-common/core', 'timestamp');
+        my $render_str = Irssi::current_theme->format_expand($ts_theme);
+        (my $ts_escaped = $ts_format) =~ s/([%\$])/$1$1/g;
+        $render_str =~ s/(?|\$(.)(?!\w)|\$\{(\w+)\})/$1 eq 'Z' ? $ts_escaped : $1/ge;
+        $config{timestamp_str} = $render_str;
+    }
+    redraw_trackbars() unless $old_irssi;
+}
+
+Irssi::settings_add_str('trackbar', 'trackbar_string', is_utf8() ? "\x{2500}" : '-');
+Irssi::settings_add_str('trackbar', 'trackbar_style', '%K');
+Irssi::settings_add_str('trackbar', 'trackbar_ignore_windows', '');
+Irssi::settings_add_bool('trackbar', 'trackbar_use_status_window', 1);
+Irssi::settings_add_bool('trackbar', 'trackbar_print_timestamp', 0);
+Irssi::settings_add_bool('trackbar', 'trackbar_require_seen', 0);
+Irssi::settings_add_bool('trackbar', 'trackbar_all_manual', 0);
+
+update_config();
+
+Irssi::signal_add_last( 'mainwindow resized' => 'redraw_trackbars')
+    unless $old_irssi;
+
+Irssi::signal_register({'window trackbar added' => [qw/Irssi::UI::Window/]});
+Irssi::signal_register({'window trackbar seen' => [qw/Irssi::UI::Window/]});
+Irssi::signal_register({'gui page scrolled' => [qw/Irssi::UI::Window/]});
+Irssi::signal_add_last('gui page scrolled' => 'trackbar_update_seen');
+
+Irssi::signal_add('setup changed' => 'update_config');
+Irssi::signal_add_priority('session save' => 'remove_all_trackbars', Irssi::SIGNAL_PRIORITY_HIGH-1);
+
+Irssi::signal_add('window changed' => 'sig_window_changed');
+
+Irssi::command_bind('trackbar goto'      => 'goto_trackbar');
+Irssi::command_bind('trackbar keep'      => 'cmd_keep_once');
+Irssi::command_bind('trackbar mark'      => 'cmd_mark');
+Irssi::command_bind('trackbar markvisible' => 'cmd_markvisible');
+Irssi::command_bind('trackbar markall'   => 'cmd_markall');
+Irssi::command_bind('trackbar remove'    => 'cmd_trackbar_remove_one');
+Irssi::command_bind('trackbar removeall' => 'cmd_remove_all_trackbars');
+Irssi::command_bind('trackbar redraw'    => 'redraw_trackbars');
+Irssi::command_bind('trackbar'           => 'trackbar_runsub');
+Irssi::command_bind('mark'               => 'cmd_mark');
+Irssi::command_bind_last('help' => 'cmd_help');
+
+Irssi::printformat(MSGLEVEL_CLIENTCRAP, 'trackbar_loaded', $IRSSI{name}, $VERSION, $IRSSI{authors});
+
+# workaround for issue #271
+{ package Irssi::Nick }

config/irssi/scripts/autorun/usercount.pl

@@ -0,0 +1,171 @@
+use Irssi 20020101.0250 ();
+$VERSION = "1.16";
+%IRSSI = (
+    authors     => 'David Leadbeater, Timo Sirainen, Georg Lukas',
+    contact     => 'dgl@dgl.cx, tss@iki.fi, georg@boerde.de',
+    name        => 'usercount',
+    description => 'Adds a usercount for a channel as a statusbar item',
+    license     => 'GNU GPLv2 or later',
+    url         => 'http://irssi.dgl.yi.org/',
+);
+
+# Once you have loaded this script run the following command:
+# /statusbar window add usercount
+# You can also add -alignment left|right option
+
+# /set usercount_show_zero on or off to show users when 0 users of that type
+# /set usercount_show_ircops (default off)
+# /set usercount_show_halfops (default on)
+
+# you can customize the look of this item from theme file:
+#  sb_usercount = "{sb %_$0%_ nicks ($1-)}";
+#  sb_uc_ircops = "%_*%_$*";
+#  sb_uc_ops = "%_@%_$*";
+#  sb_uc_halfops = "%_%%%_$*";
+#  sb_uc_voices = "%_+%_$*";
+#  sb_uc_normal = "$*";
+#  sb_uc_space = " ";
+
+
+use strict;
+use Irssi::TextUI;
+
+my ($ircops, $ops, $halfops, $voices, $normal, $total);
+my ($timeout_tag, $recalc);
+
+# Called to make the status bar item
+sub usercount {
+  my ($item, $get_size_only) = @_;
+  my $wi = !Irssi::active_win() ? undef : Irssi::active_win()->{active};
+
+  if(!ref $wi || $wi->{type} ne "CHANNEL") { # only works on channels
+    return unless ref $item;
+    $item->{min_size} = $item->{max_size} = 0;
+    return;
+  }
+
+  if ($recalc) {
+    $recalc = 0;
+    calc_users($wi);
+  }
+
+  my $theme = Irssi::current_theme();
+  my $format = $theme->format_expand("{sb_usercount}");
+  if ($format) {
+    # use theme-specific look
+    my $ircopstr = $theme->format_expand("{sb_uc_ircops $ircops}",
+          Irssi::EXPAND_FLAG_IGNORE_EMPTY);
+    my $opstr = $theme->format_expand("{sb_uc_ops $ops}",
+          Irssi::EXPAND_FLAG_IGNORE_EMPTY);
+    my $halfopstr = $theme->format_expand("{sb_uc_halfops $halfops}",
+          Irssi::EXPAND_FLAG_IGNORE_EMPTY);
+    my $voicestr = $theme->format_expand("{sb_uc_voices $voices}",
+          Irssi::EXPAND_FLAG_IGNORE_EMPTY);
+    my $normalstr = $theme->format_expand("{sb_uc_normal $normal}",
+          Irssi::EXPAND_FLAG_IGNORE_EMPTY);
+	my $space = $theme->format_expand('{sb_uc_space}',
+         Irssi::EXPAND_FLAG_IGNORE_EMPTY);
+	$space = " " unless $space;
+
+    my $str = "";
+    $str .= $ircopstr.$space if defined $ircops;
+    $str .= $opstr.$space  if defined $ops;
+    $str .= $halfopstr.$space if defined $halfops;
+    $str .= $voicestr.$space if defined $voices;
+    $str .= $normalstr.$space if defined $normal;
+    $str =~ s/\Q$space\E$//;
+
+    $format = $theme->format_expand("{sb_usercount $total $str}",
+				    Irssi::EXPAND_FLAG_IGNORE_REPLACES);
+  } else {
+    # use the default look
+    $format = "{sb \%_$total\%_ nicks \%c(\%n";
+    $format .= '*'.$ircops.' ' if (defined $ircops);
+    $format .= '@'.$ops.' ' if (defined $ops);
+    $format .= '%%'.$halfops.' ' if (defined $halfops);
+    $format .= "+$voices " if (defined $voices);
+    $format .= "$normal " if (defined $normal);
+    $format =~ s/ $//;
+    $format .= "\%c)}";
+  }
+
+  $item->default_handler($get_size_only, $format, undef, 1);
+}
+
+sub calc_users() {
+  my $channel = shift;
+  my $server = $channel->{server};
+
+  $ircops = $ops = $halfops = $voices = $normal = 0;
+  for ($channel->nicks()) {
+    if ($_->{serverop}) {
+      $ircops++;
+	}
+
+    if ($_->{op}) {
+      $ops++;
+	} elsif ($_->{halfop}) {
+	   $halfops++;
+    } elsif ($_->{voice}) {
+      $voices++;
+    } else {
+      $normal++;
+    }
+  }
+
+  $total = $ops+$halfops+$voices+$normal;
+  if (!Irssi::settings_get_bool('usercount_show_zero')) {
+    $ircops = undef if ($ircops == 0);
+    $ops = undef if ($ops == 0);
+    $halfops = undef if ($halfops == 0);
+    $voices = undef if ($voices == 0);
+    $normal = undef if ($normal == 0);
+  }
+  $halfops = undef unless Irssi::settings_get_bool('usercount_show_halfops');
+  $ircops = undef unless Irssi::settings_get_bool('usercount_show_ircops');
+}
+
+sub refresh {
+   if ($timeout_tag > 0) {
+      Irssi::timeout_remove($timeout_tag);
+      $timeout_tag = 0;
+   }
+   Irssi::statusbar_items_redraw('usercount');
+}
+
+sub refresh_check {
+   my $channel = shift;
+   my $wi = ref Irssi::active_win() ? Irssi::active_win()->{active} : 0;
+
+   return unless ref $wi && ref $channel;
+   return if $wi->{name} ne $channel->{name};
+   return if $wi->{server}->{tag} ne $channel->{server}->{tag};
+
+   # don't refresh immediately, or we'll end up refreshing
+   # a lot around netsplits
+   $recalc = 1;
+   Irssi::timeout_remove($timeout_tag) if ($timeout_tag > 0);
+   $timeout_tag = Irssi::timeout_add(500, 'refresh', undef);
+}
+
+sub refresh_recalc {
+  $recalc = 1;
+  refresh();
+}
+
+$recalc = 1;
+$timeout_tag = 0;
+
+Irssi::settings_add_bool('usercount', 'usercount_show_zero', 1);
+Irssi::settings_add_bool('usercount', 'usercount_show_ircops', 0);
+Irssi::settings_add_bool('usercount', 'usercount_show_halfops', 1);
+
+Irssi::statusbar_item_register('usercount', undef, 'usercount');
+Irssi::statusbars_recreate_items();
+
+Irssi::signal_add_last('nicklist new', 'refresh_check');
+Irssi::signal_add_last('nicklist remove', 'refresh_check');
+Irssi::signal_add_last('nick mode changed', 'refresh_check');
+Irssi::signal_add_last('setup changed', 'refresh_recalc');
+Irssi::signal_add_last('window changed', 'refresh_recalc');
+Irssi::signal_add_last('window item changed', 'refresh_recalc');

config/nvim/lazy-lock.json

@@ -1,27 +1,27 @@
 {
-  "LazyVim": { "branch": "main", "commit": "50401d358b7be9b931b42fc3b537794920308bef" },
+  "LazyVim": { "branch": "main", "commit": "4e277fcb8f6c73fe557f140ff407b3be691f31f6" },
   "LuaSnip": { "branch": "master", "commit": "480b032f6708573334f4437d3f83307d143f1a72" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "917083c0ab4fc328628f0a55c72415e1bd72ab13" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "08ab25507a92e22cec433f6750bb4a56a8cec22d" },
   "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" },
   "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
   "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" },
-  "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
+  "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" },
-  "catppuccin": { "branch": "main", "commit": "3d9a5ed556e289bce6c1fb0af89ec838360641b2" },
+  "catppuccin": { "branch": "main", "commit": "7a4bcdadafc59a5bedbd866c643fa486d8cca4a1" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "comment-box.nvim": { "branch": "main", "commit": "dd1a48f8d06102e9b87ae1e0069bc365c006979b" },
-  "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" },
+  "dressing.nvim": { "branch": "master", "commit": "8f4d62b7817455896a3c73cab642002072c114bc" },
-  "edgy.nvim": { "branch": "main", "commit": "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4" },
+  "edgy.nvim": { "branch": "main", "commit": "70e334c9cd7915aedde3255ade01ceeebe735b53" },
-  "flash.nvim": { "branch": "main", "commit": "cc8c7e03987134997d74ee87e55a5717279f2d05" },
+  "flash.nvim": { "branch": "main", "commit": "79e79ae45c3512ff1edc5da55f38ca8ee8d857b9" },
-  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
+  "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
-  "gitsigns.nvim": { "branch": "main", "commit": "bdeba1cec3faddd89146690c10b9a87949c0ee66" },
+  "gitsigns.nvim": { "branch": "main", "commit": "b14b9fba7d085ed8c11392aa51e575de84822bb1" },
-  "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "c60e76a638b1d2a4299b9bfc38461cdb02ae8397" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
+  "lazy.nvim": { "branch": "main", "commit": "59335c5b9d116f5d3948f833288a89e2a829a005" },
-  "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
   "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "e2705063f395b44f676cd26596a11007a2cbd3bd" },
   "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
   "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
   "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" },
@@ -32,34 +32,33 @@
   "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" },
   "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" },
-  "neoconf.nvim": { "branch": "main", "commit": "909179f44e94b4cb8331d46b31d3b77ca71127d5" },
+  "neoconf.nvim": { "branch": "main", "commit": "466ba6f645f63f91ac84d3dd986acede5d107f39" },
-  "neodev.nvim": { "branch": "main", "commit": "67b7a5c9facd65077cc4486c73d1774d1a2ed582" },
+  "neodev.nvim": { "branch": "main", "commit": "8cc5eb23452d355ea95b7253ca1367c3420352ff" },
   "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" },
   "noice.nvim": { "branch": "main", "commit": "396f9146529130904e07c45e90ecdbfa607534f3" },
+  "none-ls.nvim": { "branch": "main", "commit": "f39f627bbdfb33cc4ae4a95b4708e7dba7b9aafc" },
   "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
-  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
   "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
-  "nvim-lspconfig": { "branch": "master", "commit": "bfdf2e91e7297a54bcc09d3e092a12bff69a1cf4" },
+  "nvim-lspconfig": { "branch": "master", "commit": "361a2878a41f23452457eec12a807ff59bc75882" },
   "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" },
-  "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" },
+  "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
   "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" },
   "nvim-spectre": { "branch": "master", "commit": "97cfd1b0f5a6ab35979ce1bee6c17f54745fd1e5" },
-  "nvim-treesitter": { "branch": "master", "commit": "d6c9c85e14e15bc59478a0d5d810e88dad0ac53f" },
+  "nvim-treesitter": { "branch": "master", "commit": "32cc79b63342662f1136aebd93ba190778a45c92" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "95e9ba9de4289d221666b66fd930d157c7ca08c6" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "0c136439fb93fd94db9106250ff6f6858101422b" },
   "nvim-ufo": { "branch": "main", "commit": "6f2ccdf2da390d62f8f9e15fc5ddbcbd312e1e66" },
   "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
   "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
   "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
   "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" },
   "stickybuf.nvim": { "branch": "master", "commit": "e3db41f2c1bb2df3ee6ff964ee74fe991f6f9566" },
+  "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
   "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" },
-  "telescope.nvim": { "branch": "master", "commit": "84d53dfdbefbdf84e861a288abc71ef8ccafd04e" },
+  "telescope.nvim": { "branch": "master", "commit": "8c69f58427f98b2ca39a90a36db830c06e30351c" },
   "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "tokyonight.nvim": { "branch": "main", "commit": "8e670218651eaf02bf61c68ecdfdaa572bc14b47" },
+  "tokyonight.nvim": { "branch": "main", "commit": "e89caa3ad6d8da9d0dd981ec74a82c55adc61ffd" },
-  "transparent.nvim": { "branch": "main", "commit": "3af6232c8d39d51062702e875ff6407c1eeb0391" },
   "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
-  "typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" },
   "venv-selector.nvim": { "branch": "main", "commit": "14d6e866070f759e9014a8053954f835294f56f9" },
   "vim-illuminate": { "branch": "master", "commit": "1b5d70332a51a1de05f281069851865a2bb1e6d7" },
   "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },

config/nvim/lua/config/lazy.lua

@@ -12,8 +12,17 @@ require("lazy").setup({
     {
       "LazyVim/LazyVim",
       import = "lazyvim.plugins",
+    },
+    {
+      "folke/tokyonight.nvim",
       opts = {
-        colorscheme = "catppuccin",
+        style = "night",
+        transparent = true,
+        sidebars = { "qf", "vista_kind", "terminal", "packer" },
+        styles = {
+          sidebars = "transparent",
+          floats = "transparent",
+        },
       },
     },
     -- import any extras modules here
@@ -41,7 +50,7 @@ require("lazy").setup({
     version = false, -- always use the latest git commit
     -- version = "*", -- try installing the latest stable version for plugins that support semver
   },
-  install = { colorscheme = { "catppuccin" } },
+  install = { colorscheme = { "tokyonight" } },
   checker = { enabled = true }, -- automatically check for plugin updates
   performance = {
     rtp = {

config/nvim/lua/plugins/coding.lua

@@ -65,26 +65,40 @@ return {
       auto = true,
     },
   },
-
   -- Clarify and beautify your comments using boxes and lines.
   -- https://github.com/LudoPinelli/comment-box.nvim
   { "LudoPinelli/comment-box.nvim", opts = {} },
-
-  -- Tabnine Client for Neovim
-  -- https://github.com/codota/tabnine-nvim
   {
-    "codota/tabnine-nvim",
+    "williamboman/mason.nvim",
-    name = "tabnine",
-    enabled = false,
-    build = vim.loop.os_uname().sysname == "Windows_NT" and "pwsh.exe -file .\\dl_binaries.ps1" or "./dl_binaries.sh",
-    cmd = { "TabnineStatus", "TabnineDisable", "TabnineEnable", "TabnineToggle" },
-    event = "User",
     opts = {
-      accept_keymap = "<C-e>",
+      ensure_installed = {
-      dismiss_keymap = "<C-Esc>",
+        "actionlint",
+        "ansible-language-server",
+        "ansible-lint",
+        "bash-language-server",
+        "blade-formatter",
+        "cfn-lint",
+        "codeql",
+        "codespell",
+        "commitlint",
+        "diagnostic-languageserver",
+        "docker-compose-language-service",
+        "dockerfile-language-server",
+        "editorconfig-checker",
+        "fixjson",
+        "html-lsp",
+        "jq",
+        "nginx-language-server",
+        "php-cs-fixer",
+        "semgrep",
+        "sonarlint-language-server",
+        "stylua",
+        "shellcheck",
+        "shfmt",
+        "flake8",
+      },
     },
   },
-
   -- Vim plugin for automatic time tracking and metrics generated from your programming activity.
   -- https://github.com/wakatime/vim-wakatime
   { "wakatime/vim-wakatime", lazy = false, enabled = true },

config/nvim/lua/plugins/supertab.lua

@@ -0,0 +1,53 @@
+return {
+  -- Use <tab> for completion and snippets (supertab)
+  -- first: disable default <tab> and <s-tab> behavior in LuaSnip
+  {
+    "L3MON4D3/LuaSnip",
+    keys = function()
+      return {}
+    end,
+  },
+  -- then: setup supertab in cmp
+  {
+    "hrsh7th/nvim-cmp",
+    dependencies = {
+      "hrsh7th/cmp-emoji",
+    },
+    ---@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      local has_words_before = function()
+        unpack = unpack or table.unpack
+        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+        return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+      end
+
+      local luasnip = require("luasnip")
+      local cmp = require("cmp")
+
+      opts.mapping = vim.tbl_extend("force", opts.mapping, {
+        ["<Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_next_item()
+            -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
+            -- this way you will only jump inside the snippet region
+          elseif luasnip.expand_or_jumpable() then
+            luasnip.expand_or_jump()
+          elseif has_words_before() then
+            cmp.complete()
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+        ["<S-Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_prev_item()
+          elseif luasnip.jumpable(-1) then
+            luasnip.jump(-1)
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+      })
+    end,
+  },
+}

config/nvim/lua/plugins/ui.lua

@@ -1,43 +1,5 @@
 -- luacheck: globals vim
 return {
-  -- The theme of choise, catppuccin
-  -- https://github.com/catppuccin/nvim
-  {
-    "catppuccin/nvim",
-    name = "catppuccin",
-    priority = 1000,
-    enabled = true,
-    config = function()
-      vim.cmd.colorscheme("catppuccin")
-    end,
-    opts = {
-      flavour = "mocha",
-    },
-  },
-  -- Remove all background colors to make nvim transparent
-  -- https://github.com/xiyaowong/transparent.nvim
-  {
-    "xiyaowong/transparent.nvim",
-    lazy = false,
-    enabled = true,
-    config = function()
-      vim.g.transparent_groups = vim.list_extend(
-        vim.g.transparent_groups or {},
-        vim.tbl_map(function(v)
-          return v.hl_group
-        end, vim.tbl_values(require("bufferline.config").highlights))
-      )
-    end,
-  },
-  -- A fancy, configurable, notification manager for NeoVim
-  -- https://github.com/rcarriga/nvim-notify
-  {
-    "rcarriga/nvim-notify",
-    opts = {
-      -- Set background color to black so transparent doesn't mess stuff up
-      background_colour = "#000000",
-    },
-  },
   -- Not UFO in the sky, but an ultra fold in Neovim.
   -- https://github.com/kevinhwang91/nvim-ufo/
   {
@@ -71,7 +33,7 @@ return {
           jumpBot = "]",
         },
       },
-      provider_selector = function(bufnr, filetype, buftype)
+      provider_selector = function(_, _, _) -- bufnr, filetype, buftype
         return { "treesitter", "indent" }
       end,
       fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
@@ -103,15 +65,18 @@ return {
       end,
     },
   },
+  {
+    "simrat39/symbols-outline.nvim",
+    cmd = "SymbolsOutline",
+    keys = { { "<leader>cs", "<cmd>SymbolsOutline<cr>", desc = "Symbols Outline" } },
+    config = true,
+  },
   -- Indent guides for Neovim
   -- https://github.com/lukas-reineke/indent-blankline.nvim
   { "lukas-reineke/indent-blankline.nvim" },
   -- Git integration for buffers
   -- https://github.com/lewis6991/gitsigns.nvim
   { "lewis6991/gitsigns.nvim" },
-  -- Getting you where you want with the fewest keystrokes.
-  -- https://github.com/ThePrimeagen/harpoon
-  { "ThePrimeagen/harpoon" },
   -- Close buffer without messing up with the window.
   -- https://github.com/famiu/bufdelete.nvim
   { "famiu/bufdelete.nvim" },

config/tmux/tmux.conf

@@ -85,62 +85,47 @@ set-option -g renumber-windows on
 # set vi-mode
 set-window-option -g mode-keys vi
 
-#  ╭──────────────────────────────────────────────────────────╮
+# Set theme to tokyonight
-#  │ Plugins                                                  │
+source-file ~/.dotfiles/config/tmux/tokyonight_storm.tmux
-#  ╰──────────────────────────────────────────────────────────╯
-
-# Set plugins install dir
-set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.dotfiles/config/tmux/plugins'
-
-## Install plugins, starting with plugin manager
-set -g @tpm_plugins '            \
-  catppuccin/tmux                \
-  tmux-plugins/tmux-continuum    \
-  jaclu/tmux-menus               \
-  ofirgall/tmux-window-name      \
-  tmux-plugins/tmux-resurrect    \
-  tmux-plugins/tmux-sensible     \
-  tmux-plugins/tmux-sessionist   \
-  tmux-plugins/tmux-yank         \
-  tmux-plugins/tpm               \
-'
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins related configurations                           │
 #  ╰──────────────────────────────────────────────────────────╯
 
-## https://github.com/jaclu/tmux-menus
+# Plugin that lets you suspend local tmux session,
-set -g @menus_trigger 'm'
+# so that you can work with nested remote tmux session painlessly.
+# https://github.com/MunifTanjim/tmux-suspend
+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 "20"
+set -g @tmux_window_name_max_name_len "30"
 ### Replace $HOME with ~ in window names
 set -g @tmux_window_name_use_tilde "True"
 
-## https://github.com/catppuccin/tmux
-set -g @catppuccin_flavour "mocha" # latte/frappe/macchiato/mocha
-set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs
-set -g @catppuccin_window_status_enable "yes"
-
-## set -g @catppuccin_window_right_separator "█"
-set -g @catppuccin_window_number_position "left"
-set -g @catppuccin_window_middle_separator ": "
-set -g @catppuccin_window_default_fill "none"
-set -g @catppuccin_window_current_fill "all"
-set -g @catppuccin_status_modules "application session date_time"
-set -g @catppuccin_status_left_separator "█"
-set -g @catppuccin_status_right_separator "█"
-set -g @catppuccin_date_time_text "%Y-%m-%d %H:%M"
-
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'
 set -g @continuum-boot 'on'
+set -g @continuum-boot-options 'alacritty'
 
 ## https://github.com/tmux-plugins/tmux-resurrect
 set -g @resurrect-strategy-nvim 'session'
 set -g @resurrect-dir '$HOME/.local/state/tmux/tmux-resurrect'
 
-# Finally run the tmux plugin manager
+# Modified from tokyonight_storm to include tmux_mode_indicator
-run '~/.dotfiles/config/tmux/plugins/tpm/tpm'
+set -g status-right "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1f2335] #{prefix_highlight} #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %H:%M #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1d202f,bg=#7aa2f7,bold] #h #{tmux_mode_indicator}"
+
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Plugins                                                  │
+#  ╰──────────────────────────────────────────────────────────╯
+
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-sensible/sensible.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-resurrect/resurrect.tmux
+run-shell ~/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux
+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-window-name/tmux_window_name.tmux
+

config/tmux/tokyonight_storm.tmux

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# TokyoNight colors for Tmux
+
+set -g mode-style "fg=#7aa2f7,bg=#3b4261"
+
+set -g message-style "fg=#7aa2f7,bg=#3b4261"
+set -g message-command-style "fg=#7aa2f7,bg=#3b4261"
+
+set -g pane-border-style "fg=#3b4261"
+set -g pane-active-border-style "fg=#7aa2f7"
+
+set -g status "on"
+set -g status-justify "left"
+
+set -g status-style "fg=#7aa2f7,bg=#1f2335"
+
+set -g status-left-length "100"
+set -g status-right-length "100"
+
+set -g status-left-style NONE
+set -g status-right-style NONE
+
+set -g status-left "#[fg=#1d202f,bg=#7aa2f7,bold] #S #[fg=#7aa2f7,bg=#1f2335,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1f2335] #{prefix_highlight} #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %I:%M %p #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1d202f,bg=#7aa2f7,bold] #h "
+if-shell '[ "$(tmux show-option -gqv "clock-mode-style")" == "24" ]' {
+  set -g status-right "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1f2335] #{prefix_highlight} #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %H:%M #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1d202f,bg=#7aa2f7,bold] #h "
+}
+
+setw -g window-status-activity-style "underscore,fg=#a9b1d6,bg=#1f2335"
+setw -g window-status-separator ""
+setw -g window-status-style "NONE,fg=#a9b1d6,bg=#1f2335"
+setw -g window-status-format "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]"
+setw -g window-status-current-format "#[fg=#1f2335,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261,bold] #I  #W #F #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]"
+
+# tmux-plugins/tmux-prefix-highlight support
+set -g @prefix_highlight_output_prefix "#[fg=#e0af68]#[bg=#1f2335]#[fg=#1f2335]#[bg=#e0af68]"
+set -g @prefix_highlight_output_suffix ""

hosts/lakka/base/zshrc

@@ -1,59 +0,0 @@
-# Lakka zsh configuration.
-#
-# shellcheck shell=bash
-export PATH="$HOME/bin:/usr/local/bin:/usr/bin:/usr/sbin:$PATH"
-
-# Defaults
-export DOTFILES="$HOME/.dotfiles"
-
-# Run x-load-configs in your terminal to reload the files.
-function x-load-configs()
-{
-  HOST="$(hostname -s)"
-  # Load the shell dotfiles, and then some:
-  for file in $DOTFILES/config/{exports,alias,functions}; do
-    # global (exports|alias|functions) file for all hosts
-    # shellcheck source=../../../config/exports
-    [ -r "$file" ] && source "$file"
-    # shellcheck source=../../../config/exports
-    [ -r "$file-secret" ] && source "$file-secret"
-    # shellcheck source=../../../config/exports
-    [ -r "$file-$HOST" ] && source "$file-$HOST"
-    # shellcheck source=../../../config/exports
-    [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
-  done
-}
-x-load-configs
-
-export PATH="$XDG_BIN_HOME:$PATH"
-export LC_ALL=fi_FI.utf8
-
-export RVM_PATH="$HOME/.rvm"
-export PATH="$RVM_PATH/bin:$PATH"
-# shellcheck source=$HOME/.rvm/scripts/rvm
-[[ -s "$RVM_PATH/scripts/rvm" ]] && source "$RVM_PATH/scripts/rvm" # Load RVM into a shell session *as a function*
-
-# Try to load antigen, if present
-ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
-# shellcheck source=$HOME/.local/bin/antigen.zsh
-[[ -f "$ANTIGEN_ZSH_PATH" ]] && source "$ANTIGEN_ZSH_PATH"
-
-# If antigen was loaded
-if command -v antigen &>/dev/null; then
-  antigen use oh-my-zsh
-
-  # config/functions
-  x-default-antigen-bundles
-
-  antigen theme oskarkrawczyk/honukai-iterm-zsh honukai
-
-  antigen apply
-fi
-
-alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state'
-alias nano='nano -wS -$'
-alias gpg=gpg2
-
-ACME_PATH="$HOME/.acme.sh"
-# shellcheck source=$HOME/.acme.sh/acme.sh.env
-[[ -s "$ACME_PATH/acme.sh.env" ]] && . "$ACME_PATH/acme.sh.env"

install

@@ -18,8 +18,6 @@ git submodule update --init --recursive "${DOTBOT_DIR}"
   -d "${BASEDIR}" \
   --plugin-dir=tools/dotbot-brew \
   --plugin-dir=tools/dotbot-include \
-  --plugin-dir=tools/dotbot-crontab \
-  --plugin-dir=tools/dotbot-snap \
   --plugin-dir=tools/dotbot-pip \
   -c "${CONFIG}" \
   "${@}"
@@ -27,14 +25,12 @@ git submodule update --init --recursive "${DOTBOT_DIR}"
 if [ "${DOTBOT_HOST}" != "" ]; then
   DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
   echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
-  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \
+  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] &&
-    && echo "(!) Found $DOTBOT_HOST_CONFIG" \
+    echo "(!) Found $DOTBOT_HOST_CONFIG" &&
-    && "$DOTBOT_BIN_PATH" \
+    "$DOTBOT_BIN_PATH" \
       -d "$BASEDIR" \
       --plugin-dir=tools/dotbot-brew \
       --plugin-dir=tools/dotbot-include \
-      --plugin-dir=tools/dotbot-crontab \
-      --plugin-dir=tools/dotbot-snap \
       --plugin-dir=tools/dotbot-pip \
       -c "$DOTBOT_HOST_CONFIG" \
       "${@}"

install.conf.yaml

@@ -56,12 +56,3 @@
     file: tools/requirements-pipx.txt
     stdout: false
     stderr: true
-- crontab:
-    - time: 0 5 * * *
-      command: brew update && brew upgrade
-      platform: darwin # Optional
-    - time: 0 5 * * *
-      command: apt update && apt upgrade
-      platform: linux # Optional
-    - time: 0 5 * * *
-      command: task sync

local/bin/dfm

@@ -9,8 +9,6 @@
 # Helper variables, override with ENVs like `VERBOSE=1 dfm help`
 : "${VERBOSE:=0}"
 : "${DOTFILES:=$HOME/.dotfiles}"
-: "${SHARED_SCRIPT:=$DOTFILES/scripts/shared.sh}"
-: "${INSTALL_SCRIPT:=$DOTFILES/scripts/install-dotfiles.sh}"
 : "${BREWFILE:=$DOTFILES/config/homebrew/Brewfile}"
 : "${HOSTFILES:=$DOTFILES/hosts}"
 
@@ -18,9 +16,12 @@ SCRIPT=$(basename "$0")
 
 VERSION_NVM="v0.39.5"
 
-export DOTFILES_SHARED_LOADED=""
+export DOTFILES="$HOME/.dotfiles"
 # shellcheck source=./../../scripts/shared.sh
-source "$SHARED_SCRIPT"
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+# Loads configs for better installation experience
+x-load-configs
 
 function section_install
 {
@@ -49,6 +50,8 @@ function section_install
 
   case "$1" in
     all)
+      msgr msg "Starting to install all and reloading configurations..."
+      x-load-configs
       $0 install macos
       $0 install fonts
       $0 install antigen
@@ -67,6 +70,9 @@ function section_install
       $0 install npm
       $0 install ntfy
       $0 install z
+      msgr msg "Reloading configurations again..."
+      x-load-configs
+      msgr yay "All done!"
       ;;
     antigen)
       curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
@@ -141,10 +147,7 @@ function section_install
       bash "$DOTFILES/scripts/install-ntfy.sh" \
         && msg_yay "ntfy installed!"
       ;;
-    pip)
+    pip) bash "$DOTFILES/scripts/install-pip-packages.sh" ;;
-      bash "$DOTFILES/scripts/install-pip-packages.sh" \
-        && msg_yay "pip/python packages installed!"
-      ;;
     z)
       bash "$DOTFILES/scripts/install-z.sh" \
         && msg_yay "z has been installed!"

local/bin/msgr

@@ -0,0 +1,222 @@
+#!/usr/bin/env bash
+# msgr / Messanger helper
+# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
+# MIT License, https://opensource.org/license/mit/
+
+# Modified from https://stackoverflow.com/a/28776166
+(
+  [[ -n $ZSH_VERSION && $ZSH_EVAL_CONTEXT =~ :file$ ]] \
+    || [[ -n $BASH_VERSION ]] && (return 0 2> /dev/null)
+) && sourced=1 || sourced=0
+
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Colors                                                   │
+#  ╰──────────────────────────────────────────────────────────╯
+
+CLR_RED="\033[1;31m"
+CLR_YELLOW="\033[1;33m"
+CLR_GREEN="\033[1;32m"
+CLR_BLUE="\033[1;34m"
+CLR_RESET="\033[0m"
+
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Color functions                                          │
+#  ╰──────────────────────────────────────────────────────────╯
+
+function __color_red()
+{
+  local MSG="$1"
+  echo -e "${CLR_RED}${MSG}${CLR_RESET}"
+}
+function __color_yellow()
+{
+  local MSG="$1"
+  echo -e "${CLR_YELLOW}${MSG}${CLR_RESET}"
+}
+function __color_green()
+{
+  local MSG="$1"
+  echo -e "${CLR_GREEN}${MSG}${CLR_RESET}"
+}
+function __color_blue()
+{
+  local MSG="$1"
+  echo -e "${CLR_BLUE}${MSG}${CLR_RESET}"
+}
+
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Helpers                                                  │
+#  ╰──────────────────────────────────────────────────────────╯
+
+function __log_marker()
+{
+  echo -e "${CLR_BLUE}➜${CLR_RESET}"
+}
+
+function __log_marker_ok()
+{
+  echo -e "${CLR_GREEN}✔${CLR_RESET}"
+}
+
+function __log_marker_ok_blue()
+{
+  echo -e "${CLR_BLUE}✔${CLR_RESET}"
+}
+
+function __log_marker_warn()
+{
+  echo -e "${CLR_YELLOW}⁕${CLR_RESET}"
+}
+
+function __log_marker_question()
+{
+  echo -e "${CLR_YELLOW}?${CLR_RESET}"
+}
+
+function __log_marker_err()
+{
+  echo -e "${CLR_RED}⛌${CLR_RESET}"
+}
+
+function __log_indent()
+{
+  echo "    "
+}
+
+#  ╭──────────────────────────────────────────────────────────╮
+#  │ Log functions                                            │
+#  ╰──────────────────────────────────────────────────────────╯
+
+function msg()
+{
+  echo -e "$(__log_marker) $1"
+}
+
+function msg_yay()
+{
+  echo -e "🎉 $1"
+}
+
+function msg_yay_done()
+{
+  echo -e "🎉 $1 ...$(__log_marker_ok)"
+}
+
+function msg_done()
+{
+  echo -e "$(__log_marker) $1 ...$(__log_marker_ok)"
+}
+
+function msg_done_suffix()
+{
+  echo -e "$(__log_marker) ...$(__log_marker_ok)"
+}
+
+function msg_prompt()
+{
+  echo -e "$(__log_marker_question) $1"
+}
+
+function msg_prompt_done()
+{
+  echo -e "$(__log_marker_question) $1 ...$(__log_marker_ok)"
+}
+
+function msg_nested()
+{
+  echo -e "$(__log_indent)$(__log_marker) $1"
+}
+
+function msg_nested_done()
+{
+  echo -e "$(__log_indent)$(__log_marker) $1 ...$(__log_marker_ok)"
+}
+
+function msg_run()
+{
+  echo -e "${CLR_GREEN}➜ $1${CLR_RESET} $2"
+}
+
+function msg_run_done()
+{
+  echo -e "${CLR_GREEN}➜ $1${CLR_RESET} $2 ...$(__log_marker_ok)"
+}
+
+function msg_ok()
+{
+  echo -e "$(__log_marker_ok) $1"
+}
+
+function msg_warn()
+{
+  echo -e "$(__log_marker_warn) $1"
+}
+
+function msg_err()
+{
+  echo -e "$(__log_marker_err) $1"
+}
+
+# Create a prompt which you have to answer y/n to continue
+ask()
+{
+  while true; do
+    read -p "$1 ([y]/n) " -r
+    REPLY=${REPLY:-"y"}
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+      return 1
+    elif [[ $REPLY =~ ^[Nn]$ ]]; then
+      return 0
+    fi
+  done
+}
+
+# If this is being sourced, no need to run the next steps.
+[ "$sourced" = 1 ] && return
+
+function __tests()
+{
+  msg "[ msg ]"
+  msg_done "[ done ]"
+  msg_done_suffix "[ done_suffix ]" && echo "   ^-- (done_suffix)"
+  msg_err "[ err ]"
+  msg_nested "[ nested ]"
+  msg_nested_done "[ nested_done ]"
+  msg_ok "[ ok ]"
+  msg_prompt "[ prompt ]"
+  msg_prompt_done "[ prompt_done ]"
+  msg_run "[ run ]" "[ second_param ]"
+  msg_run_done "[ run_done ]" "[ second_param ]"
+  msg_warn "[ warn ]"
+  msg_yay "[ yay ]"
+  msg_yay_done "[ yay_done ]"
+}
+
+function usage()
+{
+  echo "usage: msgr [type] [message] [optional second message]"
+  echo ""
+  echo "-- types and examples: --"
+  __tests
+  echo ""
+}
+
+# The main loop. first keyword after $0 triggers type, or help and usage examples.
+case "$1" in
+  msg) msg "$2" ;;
+  done) msg_done "$2" ;;
+  done_suffix) msg_done_suffix "$2" ;;
+  err) msg_err "$2" ;;
+  nested) msg_nested "$2" ;;
+  nested_done) msg_nested_done "$2" ;;
+  ok) msg_ok "$2" ;;
+  prompt) msg_prompt "$2" ;;
+  prompt_done) msg_prompt_done "$2" ;;
+  run) msg_run "$2" ;;
+  run_done) msg_run_done "$2" "$3" ;;
+  warn) msg_warn "$2" ;;
+  yay) msg_yay "$2" ;;
+  yay_done) msg_yay_done "$2" ;;
+  tests) __tests "[first]" "[second]" ;;
+  *) usage && exit 0 ;;
+esac

local/bin/x-dc

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Create directory if it doesn't exist already
+#
+# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
+# Licensed under MIT License. http://www.opensource.org/licenses/mit-license.
+
+dir="$1"
+
+[ $# -eq 0 ] && {
+  echo "Usage: $0 full/path/to/dir/to/create"
+  exit 1
+}
+
+if [ ! -d "$dir" ]; then
+  mkdir -p "$dir" && exit 0
+fi

local/bin/x-have

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Returns which status
+which "$1" >&/dev/null
+
+if [ $? -eq 0 ]; then
+  echo 0
+else
+  echo 1
+fi

local/bin/x-load-configs

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Load our configuration files
+# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
+
+DOTFILES="$HOME/.dotfiles"
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+CONFIG_PATH="$DOTFILES/config"
+
+# Load the shell dotfiles, and then some:
+function x-load-config-fn()
+{
+  for FILE in $CONFIG_PATH/{exports,alias,functions}; do
+    FILENAME="$FILE"
+    HOST="$(hostname -s)"
+    # global (exports|alias|functions) FILENAME for all hosts
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME" ] && source "$FILENAME"
+    # global secret FILENAME, git ignored
+    # shellcheck source=../config/exports-secret
+    [ -r "$FILENAME-secret" ] && source "$FILENAME-secret"
+    # host specific (exports|alias|functions) FILENAME
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME-$HOST" ] && source "$FILENAME-$HOST"
+    # host specific (exports|alias|functions) FILENAME, git ignored
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME-$HOST-secret" ] && source "$FILENAME-$HOST-secret"
+  done
+}
+
+x-load-config-fn

scripts/install-cargo-packages.sh

@@ -2,15 +2,22 @@
 # Install cargo/rust packages.
 #
 # shellcheck source=shared.sh
-DOTFILES_SHARED_LOADED=""
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-! have cargo && {
+msg "Starting to install rust/cargo packages"
+
+[[ $(x-have "cargo") == "1" ]] && {
   msg "cargo could not be found. installing cargo with rustup.rs"
   curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path
 }
 
+source "$CARGO_HOME/env"
+
 packages=(
+  # starship.rs
+  "starship"
+  # An incremental parsing system for programming tools
+  "tree-sitter-cli"
   # a subprocess caching utility
   "bkt"
   # a structural diff that understands syntax

scripts/install-cheat-purebashbible.sh

@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2231,SC2034,SC2181,SC2068
 # shellcheck source=shared.sh
-DOTFILES_SHARED_LOADED=""
 source "$HOME/.dotfiles/scripts/shared.sh"
 
 PBB_REQUIRED_TOOLS=(git cheat)
 for t in ${PBB_REQUIRED_TOOLS[@]}; do
-  ! have "$t" && echo "(!) $t is missing, can't continue..." && exit 1
+  [[ $(x-have "$t") == "1" ]] && echo "(!) $t is missing, can't continue..." && exit 1
 done
 
 PBB_GIT="https://github.com/dylanaraps/pure-bash-bible.git"

scripts/install-cheat-tldr.sh

@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2231,SC2034,SC2181,SC2068
 # shellcheck source=shared.sh
-DOTFILES_SHARED_LOADED=""
 source "$HOME/.dotfiles/scripts/shared.sh"
 
 TLDR_REQUIRED_TOOLS=(git cheat)
 for t in ${TLDR_REQUIRED_TOOLS[@]}; do
-  ! have "$t" && echo "(!) $t is missing, can't continue..." && exit 1
+  [[ $(x-have "$t") == "1" ]] && echo "(!) $t is missing, can't continue..." && exit 1
 done
 
 TLDR_GIT="https://github.com/tldr-pages/tldr.git"

scripts/install-composer.sh

@@ -4,7 +4,7 @@
 # shellcheck source="shared.sh"
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-! have php && msg_err "PHP Not Available, cannot install composer" && exit 0
+[[ $(x-have "php") == "1" ]] && msg_err "PHP Not Available, cannot install composer" && exit 0
 
 EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
 php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"

scripts/install-gh-extensions.sh

@@ -6,7 +6,7 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg_run "Installing gh (GitHub Client) extensions"
 
-! have gh \
+[[ $(x-have "gh") == "1" ]] \
   && msg_err "gh (GitHub Client) could not be found, please install it first" \
   && exit 0
 

scripts/install-git-crypt.sh

@@ -8,7 +8,7 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg_run "Installing git-crypt"
 
-! have git-crypt && {
+[[ $(x-have "git-crypt") == "1" ]] && {
 
   REPO_URL="https://github.com/AGWA/git-crypt.git"
   CHECK_PATH="${XDG_BIN_HOME}/git-crypt"

scripts/install-go-packages.sh

@@ -6,7 +6,7 @@ source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg_run "Installing go packages"
 
-! have go && msg "go hasn't been installed yet." && exit 0
+[[ $(x-have "go") == "1" ]] && msg "go hasn't been installed yet." && exit 0
 
 packages=(
   # A shell parser, formatter, and interpreter with bash support; includes shfmt
@@ -27,6 +27,8 @@ packages=(
   github.com/charmbracelet/glow@latest
   # Static checker for GitHub Actions workflow files
   github.com/rhysd/actionlint/cmd/actionlint@latest
+  # simple terminal UI for git commands
+  github.com/jesseduffield/lazygit@latest
 )
 
 for pkg in "${packages[@]}"; do

scripts/install-neofetch.sh

@@ -11,7 +11,7 @@ NEOFETCH_URL="${NEOFETCH_REPO}/archive/refs/tags/${NEOFETCH_VERSION}.tar.gz"
 NEOFETCH_TEMP="/tmp/neofetch"
 NEOFETCH_INSTALL_PREFIX="$HOME/.local"
 
-have neofetch || {
+[[ $(x-have "neofetch") == "1" ]] && {
   LC_ALL=C
 
   mkdir -p "$NEOFETCH_TEMP" "$NEOFETCH_INSTALL_PREFIX"

scripts/install-npm-packages.sh

@@ -4,7 +4,9 @@
 # shellcheck source=shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-! have npm && msg_err "npm could not be found." && exit 0
+msg "Starting to install npm packages"
+
+[[ $(x-have "npm") == "1" ]] && msg_err "npm could not be found." && exit 0
 
 packages=(
   # This is a tool to check if your files consider your .editorconfig rules.

scripts/install-ntfy.sh

@@ -6,7 +6,7 @@
 source "$HOME/.dotfiles/scripts/shared.sh"
 set -e
 
-have ntfy && msg "ntfy already installed" && exit 0
+[[ $(x-have "ntfy") == "0" ]] && msg "ntfy already installed" && exit 0
 
 case $(dfm check arch) in
   Linux)

scripts/install-pip-packages.sh

@@ -4,13 +4,16 @@
 # shellcheck source=shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-! have pip && {
+msg "Starting to install pip packages"
-  msg_err "Could not find pip, something really terrible is going on." && exit 1
+
+[[ $(x-have "python3") == "1" ]] && {
+  msg_err "Could not find python3, something really weird is going on." && exit 1
 }
 
 packages=(
   "pipx"
   "libtmux"
+  "ensurepath"
 )
 
 for pkg in "${packages[@]}"; do
@@ -19,7 +22,10 @@ for pkg in "${packages[@]}"; do
   # Skip comments
   if [[ ${pkg:0:1} == "#" ]]; then continue; fi
 
+  msg_nested "Installing pip package: $pkg"
   python3 -m pip install --user "$pkg"
 
   echo ""
 done
+
+msg_yay "Run pip package installations"

scripts/shared.sh

@@ -6,145 +6,160 @@
 # Helper env variables. Use like this: VERBOSE=1 ./script.sh
 : "${VERBOSE:=0}"
 
-# If this file has already been loaded, no need to reload it.
+# Modified from https://stackoverflow.com/a/28776166
-[ "$DOTFILES_SHARED_LOADED" = "yes" ] && return
+(
-export DOTFILES_SHARED_LOADED="yes"
+  [[ -n $ZSH_VERSION && $ZSH_EVAL_CONTEXT =~ :file$ ]] \
+    || [[ -n $BASH_VERSION ]] && (return 0 2> /dev/null)
+) && sourced=1 || sourced=0
 
-# -- Colors -- #
+export DOTFILES="$HOME/.dotfiles"
-CLR_RED="\033[1;31m"
+DOTFILES_CURRENT_SHELL=$(ps -p $$ -oargs=)
-CLR_YELLOW="\033[1;33m"
+export DOTFILES_CURRENT_SHELL
-CLR_GREEN="\033[1;32m"
-CLR_BLUE="\033[1;34m"
-CLR_RESET="\033[0m"
 
-# -- Color functions -- #
+# Explicitly set XDG folders
-function __color_red()
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
+
+# Remove directory from the PATH variable
+# usage: path_remove ~/.local/bin
+function path_remove
 {
-  local MSG="$1"
+  PATH=$(echo -n "$PATH" | awk -v RS=: -v ORS=: "\$0 != \"$1\"" | sed 's/:$//')
-  echo -e "${CLR_RED}${MSG}${CLR_RESET}"
-}
-function __color_yellow()
-{
-  local MSG="$1"
-  echo -e "${CLR_YELLOW}${MSG}${CLR_RESET}"
-}
-function __color_green()
-{
-  local MSG="$1"
-  echo -e "${CLR_GREEN}${MSG}${CLR_RESET}"
-}
-function __color_blue()
-{
-  local MSG="$1"
-  echo -e "${CLR_BLUE}${MSG}${CLR_RESET}"
 }
 
-# -- Helpers -- #
+# Append directory to the PATH
-function __log_marker()
+# usage: path_append ~/.local/bin
+function path_append
 {
-  echo -e "${CLR_BLUE}➜${CLR_RESET}"
+  path_remove "$1"
+  PATH="${PATH:+"$PATH:"}$1"
 }
 
-function __log_marker_ok()
+# Prepend directory to the PATH
+# usage: path_prepend ~/.local/bin
+function path_prepend
 {
-  echo -e "${CLR_GREEN}✔${CLR_RESET}"
+  path_remove "$1"
+  PATH="$1${PATH:+":$PATH"}"
 }
 
-function __log_marker_ok_blue()
+# Create directory if it doesn't exist already
+x-dc()
 {
-  echo -e "${CLR_BLUE}✔${CLR_RESET}"
+  dir="$1"
+
+  [ $# -eq 0 ] && {
+    echo "Usage: $0 full/path/to/dir/to/create"
+    exit 1
+  }
+
+  if [ ! -d "$dir" ]; then
+    mkdir -p "$dir" && exit 0
+  fi
 }
 
-function __log_marker_warn()
+# Create a new directory and enter it
+mkd()
 {
-  echo -e "${CLR_YELLOW}⁕${CLR_RESET}"
+  mkdir -p "$@" && cd "$@" || exit
 }
 
-function __log_marker_question()
+# Run command silently
+# Usage: silent uptime
+silent()
 {
-  echo -e "${CLR_YELLOW}?${CLR_RESET}"
+  "$@" >&/dev/null
 }
 
-function __log_marker_err()
+# Check if a file contains non-ascii characters
+nonascii()
 {
-  echo -e "${CLR_RED}⛌${CLR_RESET}"
+  LC_ALL=C grep -n '[^[:print:][:space:]]' "${@}"
 }
 
-function __log_indent()
+# Cache commands using bkt if installed
+if command -v bkt >&/dev/null; then
+  bkt()
+  {
+    command bkt --cache-dir="$XDG_CACHE_HOME/bkt" "$@"
+  }
+else
+  # If bkt isn't installed skip its arguments and just execute directly.
+  # Optionally write a msg to stderr suggesting users install bkt.
+  bkt()
+  {
+    while [[ "$1" == --* ]]; do shift; done
+    "$@"
+  }
+fi
+
+# shorthand for checking if the system has the bin in path,
+# this version does not use caching
+# usage: have_command php && php -v
+function have_command
 {
-  echo "    "
+  command -v "$1" >&/dev/null
 }
 
-# -- Log -- #
+# shorthand for checking if the system has the bin in path,
-function msg()
+# this version uses caching
+# usage: have php && php -v
+function have
 {
-  echo -e "$(__log_marker) $1"
+  bkt -- which "$1" >&/dev/null
 }
 
-function msg_yay()
+function brew_installed
 {
-  echo -e "🎉 $1"
+  bkt -- brew list
 }
 
-function msg_yay_done()
+# shorthand for checking if brew package is installed
+# usage: have_brew php && php -v
+function have_brew
 {
-  echo -e "🎉 $1 ...$(__log_marker_ok)"
+  ! have brew && return 125
+
+  if bkt -- brew list "$1" &> /dev/null; then
+    return 0
+  else
+    return 1
+  fi
 }
 
-function msg_done()
+CONFIG_PATH="$DOTFILES/config"
+
+# Load the shell dotfiles, and then some:
+function x-load-config-fn()
 {
-  echo -e "$(__log_marker) $1 ...$(__log_marker_ok)"
+  for FILE in $CONFIG_PATH/{exports,alias,functions}; do
+    FILENAME="$FILE"
+    HOST="$(hostname -s)"
+    # global (exports|alias|functions) FILENAME for all hosts
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME" ] && source "$FILENAME"
+    # global secret FILENAME, git ignored
+    # shellcheck source=../config/exports-secret
+    [ -r "$FILENAME-secret" ] && source "$FILENAME-secret"
+    # host specific (exports|alias|functions) FILENAME
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME-$HOST" ] && source "$FILENAME-$HOST"
+    # host specific (exports|alias|functions) FILENAME, git ignored
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME-$HOST-secret" ] && source "$FILENAME-$HOST-secret"
+  done
 }
 
-function msg_done_suffix()
+x-load-config-fn
-{
-  echo -e "$(__log_marker) ...$(__log_marker_ok)"
-}
 
-function msg_prompt()
+source "$DOTFILES/local/bin/msgr"
-{
-  echo -e "$(__log_marker_question) $1"
-}
-
-function msg_prompt_done()
-{
-  echo -e "$(__log_marker_question) $1 ...$(__log_marker_ok)"
-}
-
-function msg_nested()
-{
-  echo -e "$(__log_indent)$(__log_marker) $1"
-}
-
-function msg_nested_done()
-{
-  echo -e "$(__log_indent)$(__log_marker) $1 ...$(__log_marker_ok)"
-}
-
-function msg_run()
-{
-  echo -e "${CLR_GREEN}➜ $1${CLR_RESET} $2"
-}
-
-function msg_run_done()
-{
-  echo -e "${CLR_GREEN}➜ $1${CLR_RESET} $2 ...$(__log_marker_ok)"
-}
-
-function msg_ok()
-{
-  echo -e "$(__log_marker_ok) $1"
-}
-
-function msg_warn()
-{
-  echo -e "$(__log_marker_warn) $1"
-}
-
-function msg_err()
-{
-  echo -e "$(__log_marker_err) $1"
-}
 
 # -- Menu builder -- #
 function menu_section()
@@ -201,79 +216,6 @@ function menu_usage()
   done
 }
 
-# Cache commands using bkt if installed
-if command -v bkt >&/dev/null; then
-  bkt()
-  {
-    command bkt --cache-dir="$XDG_CACHE_HOME/bkt" "$@"
-  }
-else
-  # If bkt isn't installed skip its arguments and just execute directly.
-  # Optionally write a msg to stderr suggesting users install bkt.
-  bkt()
-  {
-    while [[ "$1" == --* ]]; do shift; done
-    "$@"
-  }
-fi
-
-# shorthand for checking if the system has the bin in path,
-# this version does not use caching
-# usage: have_command php && php -v
-function have_command
-{
-  command -v "$1" >&/dev/null
-}
-
-# shorthand for checking if the system has the bin in path,
-# this version uses caching
-# usage: have php && php -v
-function have
-{
-  bkt -- command -v "$1" >&/dev/null
-}
-
-function brew_installed
-{
-  bkt -- brew list
-}
-
-# shorthand for checking if brew package is installed
-# usage: have_brew php && php -v
-function have_brew
-{
-  ! have brew && return 125
-
-  if bkt -- brew list "$1" &> /dev/null; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Remove directory from the PATH variable
-# usage: path_remove ~/.local/bin
-function path_remove
-{
-  PATH=$(echo -n "$PATH" | awk -v RS=: -v ORS=: "\$0 != \"$1\"" | sed 's/:$//')
-}
-
-# Append directory to the PATH
-# usage: path_append ~/.local/bin
-function path_append
-{
-  path_remove "$1"
-  PATH="${PATH:+"$PATH:"}$1"
-}
-
-# Prepend directory to the PATH
-# usage: path_prepend ~/.local/bin
-function path_prepend
-{
-  path_remove "$1"
-  PATH="$1${PATH:+":$PATH"}"
-}
-
 # Creates a random string
 rnd()
 {
@@ -328,51 +270,3 @@ function replacable()
 
   return 1
 }
-
-# Create directory if it doesn't exist already
-x-dc()
-{
-  dir="$1"
-
-  [ $# -eq 0 ] && {
-    echo "Usage: $0 full/path/to/dir/to/create"
-    exit 1
-  }
-
-  if [ ! -d "$dir" ]; then
-    mkdir -p "$dir" && exit 0
-  fi
-}
-
-# Create a new directory and enter it
-mkd()
-{
-  mkdir -p "$@" && cd "$@" || exit
-}
-
-# Run command silently
-# Usage: silent uptime
-silent()
-{
-  "$@" >&/dev/null
-}
-
-# Create a prompt which you have to answer y/n to continue
-ask()
-{
-  while true; do
-    read -p "$1 ([y]/n) " -r
-    REPLY=${REPLY:-"y"}
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-      return 1
-    elif [[ $REPLY =~ ^[Nn]$ ]]; then
-      return 0
-    fi
-  done
-}
-
-# Check if a file contains non-ascii characters
-nonascii()
-{
-  LC_ALL=C grep -n '[^[:print:][:space:]]' "${@}"
-}

tools/requirements-pipx.txt

@@ -1,3 +1 @@
-ensurepath
 openapi-python-client
-libtmux

yarn.lock

@@ -29,14 +29,14 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@commitlint/cli@17.7.1":
+"@commitlint/cli@17.7.2":
-  version "17.7.1"
+  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.7.1.tgz#f3ab35bd38d82fcd4ab03ec5a1e9db26d57fe1b0"
+  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.7.2.tgz#3a0287373224db14968ab160b2b4988c693d3400"
-  integrity sha512-BCm/AT06SNCQtvFv921iNhudOHuY16LswT0R3OeolVGLk8oP+Rk9TfQfgjH7QPMjhvp76bNqGFEcpKojxUNW1g==
+  integrity sha512-t3N7TZq7lOeqTOyEgfGcaltHqEJf7YDlPg75MldeVPPyz14jZq/+mbGF9tueDLFX8R6RwdymrN6D+U5XwZ8Iwg==
   dependencies:
     "@commitlint/format" "^17.4.4"
     "@commitlint/lint" "^17.7.0"
-    "@commitlint/load" "^17.7.1"
+    "@commitlint/load" "^17.7.2"
     "@commitlint/read" "^17.5.1"
     "@commitlint/types" "^17.4.4"
     execa "^5.0.0"
@@ -103,16 +103,16 @@
     "@commitlint/rules" "^17.7.0"
     "@commitlint/types" "^17.4.4"
 
-"@commitlint/load@^17.7.1":
+"@commitlint/load@^17.7.2":
-  version "17.7.1"
+  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.7.1.tgz#0723b11723a20043a304a74960602dead89b5cdd"
+  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.7.2.tgz#85730900a501c50f0bc890bb50e4a2167ee3085a"
-  integrity sha512-S/QSOjE1ztdogYj61p6n3UbkUvweR17FQ0zDbNtoTLc+Hz7vvfS7ehoTMQ27hPSjVBpp7SzEcOQu081RLjKHJQ==
+  integrity sha512-XA7WTnsjHZ4YH6ZYsrnxgLdXzriwMMq+utZUET6spbOEEIPBCDLdOQXS26P+v3TTO4hUHOEhzUquaBv3jbBixw==
   dependencies:
     "@commitlint/config-validator" "^17.6.7"
     "@commitlint/execute-rule" "^17.4.0"
     "@commitlint/resolve-extends" "^17.6.7"
     "@commitlint/types" "^17.4.4"
-    "@types/node" "20.4.7"
+    "@types/node" "20.5.1"
     chalk "^4.1.0"
     cosmiconfig "^8.0.0"
     cosmiconfig-typescript-loader "^4.0.0"
@@ -205,9 +205,9 @@
     eslint-visitor-keys "^3.3.0"
 
 "@eslint-community/regexpp@^4.6.0", "@eslint-community/regexpp@^4.6.1":
-  version "4.9.0"
+  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.0.tgz#7ccb5f58703fa61ffdcbf39e2c604a109e781162"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz#449dfa81a57a1d755b09aa58d826c1262e4283b4"
-  integrity sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==
+  integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==
 
 "@eslint/eslintrc@^2.1.2":
   version "2.1.2"
@@ -261,11 +261,11 @@
     wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
 "@ivuorinen/commitlint-config@^0.1.10":
-  version "0.1.10"
+  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@ivuorinen/commitlint-config/-/commitlint-config-0.1.10.tgz#7218e39de5628242508413f2ad87a614081916a4"
+  resolved "https://registry.yarnpkg.com/@ivuorinen/commitlint-config/-/commitlint-config-0.1.11.tgz#bfb360a37feafc91b13c2e6c11f70558d0c1e9d4"
-  integrity sha512-ONGUxrmUG5vd/Oyzy5jp+fQzpK5ftsxqrWLN/7TxEBRNSj3ab6vF9tSLdMg+RzbTubfPxOkGD9hrPVP0vXRDYw==
+  integrity sha512-/pGcqZofzTx8stVDGSszOj9VA+vwTdqeGx7oTF5KIkvAN2IBq1l/n4mv3E158LP6j4xIzV6Dth2z+IeKBMcFTA==
   dependencies:
-    "@commitlint/cli" "17.7.1"
+    "@commitlint/cli" "17.7.2"
     "@commitlint/config-conventional" "17.7.0"
 
 "@ivuorinen/eslint-config@^0.2.13":
@@ -370,14 +370,14 @@
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/minimist@^1.2.0":
-  version "1.2.2"
+  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.3.tgz#dd249cef80c6fff2ba6a0d4e5beca913e04e25f8"
-  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+  integrity sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A==
 
-"@types/node@20.4.7":
+"@types/node@20.5.1":
-  version "20.4.7"
+  version "20.5.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.7.tgz#74d323a93f1391a63477b27b9aec56669c98b2ab"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.1.tgz#178d58ee7e4834152b0e8b4d30cbfab578b9bb30"
-  integrity sha512-bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g==
+  integrity sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.2"
@@ -1740,9 +1740,9 @@ isexe@^2.0.0:
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 jackspeak@^2.3.5:
-  version "2.3.5"
+  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.5.tgz#443f237f9eeeb0d7c6ec34835ef5289bb4acb068"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
-  integrity sha512-Ratx+B8WeXLAtRJn26hrhY8S1+Jz6pxPMrkrdkgb/NstTNiqMhX0/oFVu5wX+g5n6JlEu2LPsDJmY8nRP4+alw==
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
   optionalDependencies:
@@ -2057,9 +2057,9 @@ minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.0.3"
+  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.3.tgz#05ea638da44e475037ed94d1c7efcc76a25e1974"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
-  integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
 
 ms@2.1.2:
   version "2.1.2"
@@ -2577,7 +2577,6 @@ string_decoder@^1.1.1:
     safe-buffer "~5.2.0"
 
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  name strip-ansi-cjs
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==