chore(lint): run prettier to all files

this file causes too much noise to the repo, and should be per-machine
managed. starting nvim already generates this, and the state is always
going to change.

.browserslistrc

@@ -0,0 +1 @@
+extends @ivuorinen/browserslist-config

.commitlintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@ivuorinen/commitlint-config"]
+}

.editorconfig

@@ -19,11 +19,11 @@ indent_size = 1
 indent_size = 1
 indent_style = tab
 
-[{local/bin/*,**/*.sh,**/zshrc}]
+[{local/bin/*,**/*.sh,**/zshrc,config/*}]
 shell_variant      = bash # --language-variant
 binary_next_line   = true
 switch_case_indent = true # --case-indent
 space_redirects    = true
-keep_padding       = true
+keep_padding       = false
 function_next_line = true # --func-next-line
 

.eslintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@ivuorinen"]
+}

.gitattributes

@@ -13,7 +13,7 @@
 ##   Handle line endings automatically for files detected as
 ##   text and leave all files detected as binary untouched.
 ##   This will handle all files NOT defined below.
-*                 text=auto
+*                 text=auto oel=lf
 
 # Source code
 *.bash            text eol=lf

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+ismo@ivuorinen.net.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

.github/SECURITY.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+Usually only the latest daily tag is supported at all,
+because that's the current I'm using.
+
+## Reporting a Vulnerability
+
+Please send me email directly to the email in my profile.
+I'd appreciate link to the release the vulnerability was
+found in, and what is the vulnerable code/dependency.

.github/dependabot.yml

@@ -1,7 +1,7 @@
 version: 2
 updates:
   # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
+  - package-ecosystem: 'github-actions'
+    directory: '/'
     schedule:
-      interval: "weekly"
+      interval: 'weekly'

.github/renovate.json

@@ -1,6 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "local>ivuorinen/.github:renovate-config"
-  ]
+  "extends": ["local>ivuorinen/.github:renovate-config"]
 }

.github/tag-changelog-config.js

@@ -7,20 +7,21 @@ module.exports = {
     { types: ['build', 'ci'], label: '🏗️ Build System' },
     { types: ['refactor'], label: '🪚 Refactors' },
     { types: ['doc', 'docs'], label: '📚 Documentation Changes' },
+    { types: ['config'], label: '🪛 Configuration Changes' },
     { types: ['test', 'tests'], label: '🔍 Tests' },
-    { types: ['style', 'codestyle'], label: '💅 Code Style Changes' },
-    { types: ['chore', 'Chore'], label: '🧹 Chores' },
+    { types: ['style', 'codestyle', 'lint'], label: '💅 Code Style Changes' },
+    { types: ['chore', 'Chore', 'deps', 'Deps'], label: '🧹 Chores' },
     { types: ['other', 'Other'], label: 'Other Changes' },
   ],
 
   excludeTypes: [],
 
   renderTypeSection: function (label, commits) {
-    let text = `\n## ${ label }\n\n`
+    let text = `\n## ${label}\n\n`
 
-    commits.forEach((commit) => {
-      const scope = commit.scope ? `**${ commit.scope }:** ` : ''
-      text += `- ${ scope }${ commit.subject }\n`
+    commits.forEach(commit => {
+      const scope = commit.scope ? `**${commit.scope}:** ` : ''
+      text += `- ${scope}${commit.subject}\n`
     })
 
     return text
@@ -28,8 +29,8 @@ module.exports = {
 
   renderChangelog: function (release, changes) {
     const now = new Date()
-    const d = now.toISOString().substring(0, 10);
-    const header = `# ${ release } - ${ d }\n`;
+    const d = now.toISOString().substring(0, 10)
+    const header = `# ${release} - ${d}\n`
     return header + changes + '\n\n'
   },
 }

.github/workflows/changelog.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch: # Trigger manually
 jobs:
   debug-changelog:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
       - name: Create changelog text
@@ -12,7 +12,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config_file: .github/tag-changelog-config.js
-      - name: "Echo results"
+      - name: 'Echo results'
         id: output-changelog
         run: |
           echo "${{ steps.changelog.outputs.changes }}"

.github/workflows/linters.yml

@@ -3,7 +3,7 @@ on: [push]
 jobs:
   linters:
     name: Linters
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
       - name: GitHub Actions

.github/workflows/new-release.yml

@@ -2,12 +2,12 @@ name: Release Daily State # Workflow name displayed on GitHub
 on:
   workflow_dispatch: # Trigger manually
   schedule:
-    - cron: "30 20 * * *" # UTC is 2-3 hours behind Europe/Helsinki, my timezone
+    - cron: '30 20 * * *' # UTC is 2-3 hours behind Europe/Helsinki, my timezone
 permissions:
   contents: write
 jobs:
   new-daily-release:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     outputs:
       created: ${{ steps.daily-version.outputs.created }}
       version: ${{ steps.daily-version.outputs.version }}

.github/workflows/update-submodules.yml

@@ -1,6 +1,6 @@
 name: Update submodules
 on:
-  schedule: [{cron: 0 3 * * *}]
+  schedule: [{ cron: 0 3 * * * }]
   workflow_dispatch:
 permissions:
   contents: write
@@ -8,7 +8,7 @@ permissions:
   pull-requests: write
 jobs:
   update-submodules:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.gitignore

@@ -1,4 +1,5 @@
 Brewfile.lock.json
+config/nvim/lazy-lock.json
 *.log
 *-secret
 *cache
@@ -13,4 +14,11 @@ ssh/local.d/*
 !ssh/local.d/.gitkeep
 !.gitkeep
 .env
+local/share/fonts/*
+node_modules
+.nfs*
+*.socket
+iTermServer-*
+lock
+config/iterm2/AppSupport
 

.gitmodules

@@ -19,31 +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"]
-	path = config/tmux/plugins/tmux-menus
-	url = https://github.com/jaclu/tmux-menus.git
+	ignore = dirty
 [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
+	ignore = dirty
+[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

.ignore

@@ -3,4 +3,4 @@ config/cheat/cheatsheets/community/**
 tools/dotbot/**
 tools/dotbot-brew/**
 tools/dotbot-include/**
-
+node_modules

.markdownlint.json

@@ -1,5 +1,5 @@
 {
-  "extends": "markdownlint/style/prettier",
+  "extends": "@ivuorinen/markdownlint-config",
   "code-block-style": {
     "style": "fenced"
   },

.markdownlintignore

@@ -0,0 +1,6 @@
+# only care about files that are under our control
+config/cheat/cheatsheets/community/*
+config/tmux/plugins/*
+tools/*
+node_modules/*
+

.prettierignore

@@ -0,0 +1,8 @@
+.mypy_cache/*
+tools/dotbot*
+local/bin/antigen.zsh
+config/cheat/cheatsheets/community
+config/tmux/plugins/*
+lazy-lock.json
+Brewfile.lock.json
+

.prettierrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  ...require('@ivuorinen/prettier-config'),
+  trailingComma: 'all',
+  // Add custom options below:
+  overrides: [
+    {
+      files: '*.md',
+      options: {
+        printWidth: 120,
+        proseWrap: 'preserve',
+      },
+    },
+  ],
+}

.python-version

@@ -1 +1 @@
-3.11
+3.12

.releaserc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@ivuorinen/semantic-release-config"]
+}

.yamlfmt

@@ -1,22 +0,0 @@
-formatter:
-  type: basic
-  indent: 2
-  retain_line_breaks: false
-  disallow_anchors: false
-  max_line_length: 0
-  scan_folded_as_literal: false
-  indentless_arrays: false
-
-doublestar: true
-
-extensions:
-  - yaml
-  - yml
-
-include:
-  - ./*.{yml,yaml}
-  - ./**/*.{yml,yaml}
-
-exclude:
-  - ./tools/**
-  - ./config/nvim/**

.yamlignore

@@ -1,2 +0,0 @@
-# .yamlignore
-

add-submodules.sh

@@ -1,26 +1,45 @@
 #!/usr/bin/env bash
 
-git submodule add --name dotbot -f https://github.com/anishathalye/dotbot.git tools/dotbot
-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 cheat-community -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
+# dotbot and plugins
+git submodule add --name dotbot \
+  -f https://github.com/anishathalye/dotbot.git tools/dotbot
+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-pip \
+  -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip
+
+# other repos
+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 \
-  -f https://github.com/jaclu/tmux-menus.git config/tmux/plugins/tmux-menus
+git submodule add --name tmux/tmux-mode-indicator \
+  -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
+
+# Takes submodules and sets them to ignore all changes
+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,24 +3,98 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
+export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
+# shellcheck source=scripts/shared.sh
+# source "$DOTFILES/scripts/shared.sh"
 
-# 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
-        [ -r "$file" ] && source "$file"
-        [ -r "$file-secret" ] && source "$file-secret"
-        [ -r "$file-$HOST" ] && source "$file-$HOST"
-        [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
-    done
-}
-x-load-configs
+# 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"
 
 # Import ssh keys in keychain
-ssh-add -A 2>/dev/null;
+ssh-add -A 2>/dev/null
+
+# Enable the subsequent settings only in interactive sessions
+case $- in
+*i*) ;;
+*) return ;;
+esac
+
+# Path to your oh-my-bash installation.
+export OSH="$HOME/.local/share/oh-my-bash"
+
+[ -d "$OSH" ] && {
+  export OSH_THEME="powerline-multiline"
+
+  # PowerLine theme config
+  export POWERLINE_LEFT_PROMPT="cwd scm"
+  export POWERLINE_RIGHT_PROMPT="python_venv ruby in_vim battery user_info"
+
+  # Display red dots whilst waiting for completion.
+  export COMPLETION_WAITING_DOTS="true"
+
+  # Uncomment the following line if you want to disable marking untracked files
+  # under VCS as dirty. This makes repository status check for large repositories
+  # much, much faster.
+  export DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+  # To disable the uses of "sudo" by oh-my-bash, please set "false" to
+  # this variable.  The default behavior for the empty value is "true".
+  export OMB_USE_SUDO=true
+
+  # To enable/disable display of Python virtualenv and condaenv
+  export OMB_PROMPT_SHOW_PYTHON_VENV=true # enable
+  # OMB_PROMPT_SHOW_PYTHON_VENV=false # disable
+
+  # Which completions would you like to load? (completions can be found in ~/.oh-my-bash/completions/*)
+  # Custom completions may be added to ~/.oh-my-bash/custom/completions/
+  # Example format: completions=(ssh git bundler gem pip pip3)
+  # Add wisely, as too many completions slow down shell startup.
+  export completions=(
+    git
+    composer
+    ssh
+  )
+
+  # Which aliases would you like to load? (aliases can be found in ~/.oh-my-bash/aliases/*)
+  # Custom aliases may be added to ~/.oh-my-bash/custom/aliases/
+  # Example format: aliases=(vagrant composer git-avh)
+  # Add wisely, as too many aliases slow down shell startup.
+  export aliases=(
+    general
+  )
+
+  # Which plugins would you like to load? (plugins can be found in ~/.oh-my-bash/plugins/*)
+  # Custom plugins may be added to ~/.oh-my-bash/custom/plugins/
+  # Example format: plugins=(rails git textmate ruby lighthouse)
+  # Add wisely, as too many plugins slow down shell startup.
+  export plugins=(
+    git
+    bashmarks
+  )
+
+  # Which plugins would you like to conditionally load? (plugins can be found in ~/.oh-my-bash/plugins/*)
+  # Custom plugins may be added to ~/.oh-my-bash/custom/plugins/
+  # Example format:
+  #  if [ "$DISPLAY" ] || [ "$SSH" ]; then
+  #      plugins+=(tmux-autoattach)
+  #  fi
+
+  source "$OSH/oh-my-bash.sh"
+
+  # Preferred editor for local and remote sessions
+  # if [[ -n $SSH_CONNECTION ]]; then
+  #   export EDITOR='vim'
+  # else
+  #   export EDITOR='mvim'
+  # fi
+}
+
 
-# shellcheck source=../config/fzf/fzf.bash
-[ -f "${DOTFILES}/config/fzf/fzf.bash" ] \
-  && source "${DOTFILES}/config/fzf/fzf.bash"

base/zshenv

@@ -0,0 +1,18 @@
+# shellcheck shell=bash
+# vim: filetype=zsh
+
+export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
+
+export DOTFILES="$HOME/.dotfiles"
+
+# 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"
+

base/zshrc

@@ -1,53 +1,32 @@
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-# Defaults
-export DOTFILES="$HOME/.dotfiles"
-# shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
 
 export COMPLETION_WAITING_DOTS=true
 
-# Run x-load-configs in your terminal to reload the files.
-function x-load-configs()
-{
-  # Load the shell dotfiles, and then some:
-  for file in $DOTFILES/config/{exports,alias,functions}; do
-    HOST="$(hostname -s)"
-    # global (exports|alias|functions) file for all hosts
-    # shellcheck source=../config/exports
-    [ -r "$file" ] && source "$file"
-    # global secret file, git ignored
-    # 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
+path_append "/opt/homebrew/bin"
+if type brew &> /dev/null; then
+  eval "$(brew shellenv)"
+  FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
+fi
 
-export HISTFILE="$XDG_STATE_HOME"/zsh/history
+path_append "/usr/local/bin"
+path_prepend "$XDG_DATA_HOME/cargo/bin"
+path_prepend "$XDG_BIN_HOME"
+path_prepend "$HOME/.local/go/bin"
+path_prepend "$XDG_DATA_HOME/bob/nvim-bin"
 
-autoload -U colors zsh/terminfo
-colors
+source "$DOTFILES/config/exports-shell"
+source "$DOTFILES/config/exports-apps"
+source "$DOTFILES/config/alias"
+source "$DOTFILES/config/functions"
 
 export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
 x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
 
 # Add completion scripts to zsh path
 FPATH="$ZSH_CUSTOM_COMPLETION_PATH:$FPATH"
-autoload -Uz compinit
-
-if type brew &>/dev/null
-then
-  FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
-fi
-
-compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
 
 # Try to load antigen, if present
 ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
@@ -55,14 +34,45 @@ ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
 [[ -f "$ANTIGEN_ZSH_PATH" ]] && source "$ANTIGEN_ZSH_PATH"
 
 # antigen is present
-have antigen && {
-  antigen use oh-my-zsh
+antigen use oh-my-zsh
 
-  # config/functions
-  x-default-antigen-bundles
+export ZSH_TMUX_AUTOSTART=true
+export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
+export ZSH_TMUX_UNICODE=true
+export ZSH_TMUX_AUTOQUIT=false
+export ZSH_TMUX_DEFAULT_SESSION_NAME=main
 
-  antigen apply
-}
+export NVM_DIR="$XDG_CONFIG_HOME/nvm"
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+
+# z, the zsh version
+export ZSHZ_DATA="$XDG_STATE_HOME/z"
+antigen bundle z
+
+# these should be always available
+antigen bundle tmux
+antigen bundle colored-man-pages
+antigen bundle command-not-found
+antigen bundle ssh-agent
+antigen bundle jreese/zsh-titles
+antigen bundle zsh-users/zsh-completions
+
+# these should be available if there's need
+have brew && antigen bundle brew
+have php && antigen bundle php
+have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
+
+# nvm is a strange beast
+zstyle ':omz:plugins:nvm' autoload yes
+antigen bundle nvm
+# antigen bundle "$DOTFILES/config/zsh/plugins/nvm-auto-use"
+
+# nice to have stuff
+antigen bundle gcloud
+
+# this needs to be the last item
+antigen bundle zsh-users/zsh-syntax-highlighting
+antigen apply
 
 # shellcheck source=../config/fzf/fzf.zsh
 [ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
@@ -70,4 +80,3 @@ have antigen && {
 
 # Start starship
 eval "$(starship init zsh)"
-

config/alacritty/alacritty.yml

@@ -1,3 +1,4 @@
+---
 # Configuration for Alacritty, the GPU enhanced terminal emulator
 
 # Any items in the `env` entry below will be added as
@@ -16,6 +17,7 @@ env:
 # Window dimensions in character columns and lines
 # (changes require restart)
 window:
+  dynamic_title: true
   dimensions:
     columns: 130
     lines: 40
@@ -38,19 +40,19 @@ draw_bold_text_with_bright_colors: true
 font:
   # The normal (roman) font face to use.
   normal:
-    family: JetBrainsMono Nerd Font
+    family: JetBrainsMonoNL Nerd Font Mono
     # Style can be specified to pick a specific face.
-    # style: Regular
+    style: ExtraLight
 
     # The bold font face
   bold:
-    family: JetBrainsMono Nerd Font
+    family: JetBrainsMonoNL Nerd Font Mono
     # Style can be specified to pick a specific face.
     style: Bold
 
   # The italic font face
   italic:
-    family: JetBrainsMono Nerd Font
+    family: JetBrainsMonoNL Nerd Font Mono
     # Style can be specified to pick a specific face.
     style: Italic
 
@@ -73,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
-    foreground: "#CDD6F4" # text
-    # 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
+    background: '0x24283b'
+    foreground: '0xc0caf5'
 
   # Normal colors
   normal:
-    black: "#45475A" # surface1
-    red: "#F38BA8" # red
-    green: "#A6E3A1" # green
-    yellow: "#F9E2AF" # yellow
-    blue: "#89B4FA" # blue
-    magenta: "#F5C2E7" # pink
-    cyan: "#94E2D5" # teal
-    white: "#BAC2DE" # subtext1
+    black: '0x1d202f'
+    red: '0xf7768e'
+    green: '0x9ece6a'
+    yellow: '0xe0af68'
+    blue: '0x7aa2f7'
+    magenta: '0xbb9af7'
+    cyan: '0x7dcfff'
+    white: '0xa9b1d6'
 
   # Bright colors
   bright:
-    black: "#585B70" # surface2
-    red: "#F38BA8" # red
-    green: "#A6E3A1" # green
-    yellow: "#F9E2AF" # yellow
-    blue: "#89B4FA" # blue
-    magenta: "#F5C2E7" # pink
-    cyan: "#94E2D5" # teal
-    white: "#A6ADC8" # subtext0
-
-  # 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
+    black: '0x414868'
+    red: '0xf7768e'
+    green: '0x9ece6a'
+    yellow: '0xe0af68'
+    blue: '0x7aa2f7'
+    magenta: '0xbb9af7'
+    cyan: '0x7dcfff'
+    white: '0xc0caf5'
 
   indexed_colors:
-    - { index: 16, color: "#FAB387" }
-    - { index: 17, color: "#F5E0DC" }
+    - { index: 16, color: '0xff9e64' }
+    - { 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 }
@@ -260,7 +157,7 @@ key_bindings:
   - { key: F10, chars: "\e[21~" }
   - { key: F11, chars: "\e[23~" }
   - { key: F12, chars: "\e[24~" }
-  - { key: Back, chars: "" }
+  - { key: Back, chars: '' }
   - { key: Back, mods: Alt, chars: "\e" }
   - { key: Insert, chars: "\e[2~" }
   - { key: Delete, chars: "\e[3~" }
@@ -298,7 +195,6 @@ mouse:
 
 selection:
   semantic_escape_chars: ',│`|:"'' ()[]{}<>'
-
 # Shell
 #
 # You can set shell.program to the path of your favorite shell, e.g. /bin/fish.

config/alias

@@ -1,14 +1,14 @@
 #!/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
 {
   have brew && {
     local php_versions=()
-    while IFS="" read -r line; do php_versions+=("$line"); done < <(brew list | grep '^php')
+    while IFS="" read -r line; do php_versions+=("$line"); done < <(brew_installed | grep '^php')
 
     php_error_reporting='-d error_reporting=22527'
 
@@ -58,6 +58,9 @@ fi
 # Be nice
 alias please="sudo "
 
+# Color the grep output
+alias grep='grep --color'
+
 ! have eza && alias ls='ls --color=auto'
 have eza && {
   alias ls='eza -h -s=type --git --icons --group-directories-first'
@@ -68,9 +71,12 @@ alias ..="cd .."
 alias ...="cd ../.."
 alias ....="cd ../../.."
 
-# Colors for ls
-alias ll="ls -l"
-alias l="ls"
+# cd to git root directory
+alias cdgr='cd "$(git root)"'
+
+# Shortcuts for listing
+alias ll="ls -la"
+alias l="ls -a"
 
 # Prevent common typos
 alias cd..="cd .."
@@ -79,12 +85,6 @@ alias sl="ls"
 # List only directories
 alias lsd="ls -lF | grep '^d'"
 
-# Recursively delete `.pyc` files
-alias rmpyc="find . -type f -name '*.pyc' -ls -delete"
-
-# Recursively delete `.DS_Store` files
-alias rmds="find . -type f -name '*.DS_Store' -ls -delete"
-
 # IP addresses
 alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias localip="ipconfig getifaddr en1"
@@ -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
@@ -118,6 +115,10 @@ alias ta='tmux attach || tmux'
 alias watchx='watch -dpbc'
 # delete .DS_Store files
 alias zapds='find . -name ".DS_Store" -print -delete'
+# Recursively delete `.pyc` files
+alias zappyc="find . -type f -name '*.pyc' -ls -delete"
+# Run all zaps
+alias zapall="zapds && zappyc"
 # tail with follow flag on
 alias t='tail -f'
 # directory usage, return only the total
@@ -136,8 +137,7 @@ alias code_scanner='docker run
 
 alias zedit='$EDITOR ~/.dotfiles'
 
-have irssi \
-  && alias irssi="irssi --config='$IRSSI_CONFIG_FILE' --home='$IRSSI_CONFIG_HOME'"
+alias irssi="irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_CONFIG_HOME/irssi"
 
 if [[ -f "$HOME/.aliases.local" ]]; then
   # shellcheck disable=SC1091
@@ -146,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/cheat/conf.yml

@@ -6,7 +6,7 @@ colorize: true
 # Which 'chroma' colorscheme should be applied to the output?
 # Options are available here:
 #   https://github.com/alecthomas/chroma/tree/master/styles
-style: "catppuccin"
+style: 'catppuccin'
 # Which 'chroma' "formatter" should be applied?
 # One of: "terminal", "terminal256", "terminal16m"
 formatter: terminal256
@@ -74,7 +74,6 @@ cheatpaths:
     path: ~/.dotfiles/config/cheat/cheatsheets/tldr
     tags: [tldr]
     readonly: true
-
 # While it requires no configuration here, it's also worth noting that
 # cheat will automatically append directories named '.cheat' within the
 # current working directory to the 'cheatpath'. This can be very useful if

config/exports

@@ -2,32 +2,6 @@
 # shellcheck shell=bash
 # 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
-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"
-
-path_append "/opt/homebrew/bin"
-have brew && eval "$(brew shellenv)"
-
-path_append "/usr/local/bin"
-path_append "$XDG_BIN_HOME"
-
-# brew, https://brew.sh
-have brew && {
-  have_brew python && path_append "$(brew --prefix python)/bin"
-}
-
 source "$DOTFILES/config/exports-shell"
 source "$DOTFILES/config/exports-apps"
 

config/exports-apps

@@ -2,9 +2,7 @@
 # shellcheck shell=bash
 # shellcheck enable=external-sources
 # shellcheck disable=1091,2139
-# vim: filetype=zsh
-export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/scripts/shared.sh"
+# vim: filetype=bash
 
 # Antigen configuration
 # https://github.com/zsh-users/antigen/wiki/Configuration
@@ -17,41 +15,32 @@ export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
 export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible"
 export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible.cfg"
 export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy_cache"
-have ansible && {
-  x-dc "$ANSIBLE_HOME"
-  x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
-}
+x-dc "$ANSIBLE_HOME"
+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/
 export COMPOSER_HOME="$XDG_STATE_HOME/composer"
 export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
-have composer && {
-  export PATH="$COMPOSER_BIN:$PATH"
-}
+path_append "$COMPOSER_BIN"
 
 # docker, https://docs.docker.com/engine/reference/commandline/cli/
 export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
-have docker && {
-  x-dc "$DOCKER_CONFIG"
-  # Docker: Disable snyk ad
-  export DOCKER_SCAN_SUGGEST=false
-}
+x-dc "$DOCKER_CONFIG"
+# Docker: Disable snyk ad
+export DOCKER_SCAN_SUGGEST=false
 
 # ffmpeg
 export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
 have ffmpeg && x-dc "$FFMPEG_DATADIR"
 
-# gcloud
-have gcloud && {
-  GCLOUD_LOC=$(gcloud info --format="value(installation.sdk_root)" --quiet)
-  [[ -f "$GCLOUD_LOC/path.zsh.inc" ]] && builtin source "$GCLOUD_LOC/path.zsh.inc"
-  [[ -f "$GCLOUD_LOC/completion.zsh.inc" ]] && builtin source "$GCLOUD_LOC/completion.zsh.inc"
-}
-
 # GnuPG
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 
@@ -59,29 +48,11 @@ 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"
 
-# nvm, the node version manager
-export NVM_LAZY_LOAD=true
-export NVM_COMPLETION=true
-export NVM_AUTO_USE=true
-export NVM_DIR="$XDG_CONFIG_HOME/nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"                   # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
-
-export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
-
-# Add npm packages to path
+# NPM: Add npm packages to path
 have node && {
   NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
   path_append "$NVM_NODE_BIN_DIR"
@@ -90,8 +61,10 @@ have node && {
 # op (1Password cli) is present
 export OP_CACHE="$XDG_STATE_HOME/1password"
 have op && {
-  eval "$(op completion zsh)"
-  compdef _op op
+  [ "$DOTFILES_CURRENT_SHELL" = "zsh" ] && {
+    eval "$(op completion zsh)"
+    compdef _op op
+  }
 }
 
 # Python
@@ -100,8 +73,7 @@ have op && {
 export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
 export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
 have pyenv && {
-  path_append "$(pyenv root)/shims"
-  path_append "$PYENV_ROOT/bin"
+  path_append "$PYENV_ROOT/shims"
   eval "$(pyenv init -)"
 }
 
@@ -115,10 +87,14 @@ export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
 export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
 export RBENV_ROOT="$XDG_STATE_HOME/rbenv"
 x-dc "$RBENV_ROOT"
-have gem && path_append "$(gem environment gemdir)/bin"
-have rbenv && eval "$(rbenv init - zsh)"
+have gem && path_append "${GEM_HOME}/bin"
+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"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 path_append "$CARGO_HOME/bin"
 
@@ -138,10 +114,6 @@ export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
 export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
 x-dc "$WAKATIME_HOME"
 
-# z, https://github.com/rupa/z
-export _Z_DATA="$XDG_STATE_HOME/z"
-[[ -f "$XDG_BIN_HOME/z/z.sh" ]] && source "$XDG_BIN_HOME/z/z.sh"
-
 # Misc
 export BAT_THEME="ansi"
 export CHEAT_USE_FZF=true

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,9 +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
 
@@ -23,9 +34,16 @@ export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
 # And include the parameter for ZSH
 export HISTORY_IGNORE="(ls|cd|cd -|pwd|exit|date|* --help)"
 
+# Less history location
+export LESSHISTFILE="$XDG_STATE_HOME"/less/history
+
 # Highlight section titles in manual pages
 export LESS_TERMCAP_md="$ORANGE"
 
+# zsh autoloaded terminfo
+export TERMINFO="$XDG_DATA_HOME"/terminfo
+export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo
+
 # Don’t clear the screen after quitting a manual page
 export MANPAGER="less -X"
 
@@ -36,29 +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
-  x-dc "$XDG_CACHE_HOME/zsh"
-  x-dc "$XDG_STATE_HOME/zsh"
-  export HISTFILE="$XDG_STATE_HOME/zsh/history"
-  zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
-  zstyle ':completion:*' list-colors "$LS_COLORS"
+if [ "$DOTFILES_CURRENT_SHELL" = "-zsh" ]; then
+  [[ $ZSH_VERSION != "" ]] && {
+    autoload -U colors zsh/terminfo compinit
+    colors
+    compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
 
-  # fzf
-  [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
-    && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
+    x-dc "$XDG_CACHE_HOME/zsh"
+    x-dc "$XDG_STATE_HOME/zsh"
+    export HISTFILE="$XDG_STATE_HOME/zsh/history"
+    zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
+    zstyle ':completion:*' list-colors "$LS_COLORS"
+
+    # 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"
+  }
 fi
 
 # If we are using bash
-if [ "$SHELL" = "$(which bash)" ]; then
-  [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ] \
-    && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
+if [ "$DOTFILES_CURRENT_SHELL" = "bash" ]; then
+  # shellcheck source=../config/fzf/fzf.bash
+  [ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
+    source "${DOTFILES}/config/fzf/fzf.bash"
 fi

config/functions

@@ -1,87 +1,3 @@
 #!/usr/bin/env bash
 #
 # shell functions
-#
-# shellcheck source="../scripts/shared.sh"
-export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/scripts/shared.sh"
-
-# 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
-}
-
-# Defines default antigen bundles
-x-default-antigen-bundles()
-{
-  export ZSH_TMUX_AUTOSTART=false
-  export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
-  export ZSH_TMUX_UNICODE=true
-  export ZSH_TMUX_AUTOQUIT=false
-  export ZSH_TMUX_DEFAULT_SESSION_NAME=main
-
-  # these should be always available
-  antigen bundle tmux
-  antigen bundle colored-man-pages
-  antigen bundle command-not-found
-  antigen bundle ssh-agent
-  antigen bundle jreese/zsh-titles
-  antigen bundle unixorn/autoupdate-antigen.zshplugin
-  antigen bundle zsh-users/zsh-completions
-  antigen bundle zsh-users/zsh-syntax-highlighting
-
-  # these should be available if there's need
-  have brew && antigen bundle brew
-  # have nvm && antigen bundle nvm
-  have nvm && antigen bundle "$DOTFILES/config/zsh/plugins/nvm-auto-use"
-  have php && antigen bundle php
-  have python && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
-  have rvm && antigen bundle unixorn/rvm-plugin
-}

config/gh-changelog/config.yaml

@@ -0,0 +1,19 @@
+check_for_updates: true
+excluded_labels:
+  - maintenance
+  - dependencies
+file_name: CHANGELOG.md
+logger: spinner
+no_color: false
+sections:
+  added:
+    - feature
+    - enhancement
+  changed:
+    - backwards-incompatible
+  fixed:
+    - bug
+    - bugfix
+    - documentation
+show_unreleased: true
+skip_entries_without_label: false

config/gh-dash/config.yml

@@ -0,0 +1,54 @@
+prSections:
+  - title: My Pull Requests
+    filters: is:open author:@me
+  - title: Needs My Review
+    filters: is:open review-requested:@me
+  - title: Involved
+    filters: is:open involves:@me -author:@me
+issuesSections:
+  - title: My Issues
+    filters: is:open author:@me
+  - title: Assigned
+    filters: is:open assignee:@me
+  - title: Involved
+    filters: is:open involves:@me -author:@me
+defaults:
+  preview:
+    open: true
+    width: 50
+  prsLimit: 20
+  issuesLimit: 20
+  view: prs
+  layout:
+    prs:
+      updatedAt:
+        width: 7
+      repo:
+        width: 15
+      author:
+        width: 15
+      assignees:
+        width: 20
+        hidden: true
+      base:
+        width: 15
+        hidden: true
+      lines:
+        width: 16
+    issues:
+      updatedAt:
+        width: 7
+      repo:
+        width: 15
+      creator:
+        width: 10
+      assignees:
+        width: 20
+        hidden: true
+  refetchIntervalMinutes: 30
+keybindings:
+  issues: []
+  prs: []
+repoPaths: {}
+pager:
+  diff: ''

config/gh/hosts.yml

@@ -0,0 +1,3 @@
+github.com:
+  user: ivuorinen
+  git_protocol: https

config/git/config

@@ -5,3 +5,9 @@
   name = Ismo Vuorinen
   email = ismo@ivuorinen.net
 
+[github]
+  user = ivuorinen
+
+[include]
+  path = ~/.config/git/overrides/config
+

config/git/overrides/.gitignore

@@ -0,0 +1,2 @@
+!.gitkeep
+config

config/homebrew/Brewfile

@@ -18,12 +18,10 @@ tap "xwmx/taps"
 brew "act"
 # Mozilla CA certificate store
 brew "ca-certificates"
-# Cryptography and SSL/TLS Toolkit
-brew "openssl@3"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.11"
 # YAML Parser
 brew "libyaml"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.11"
 # Automate deployment, configuration, and upgrading
 brew "ansible"
 # Checks ansible playbooks for practices and behaviour
@@ -104,12 +102,20 @@ brew "dnsmasq"
 brew "dog"
 # Lightning-fast linter for .env files written in Rust
 brew "dotenv-linter"
+# Tool to verify that your files are in harmony with your .editorconfig
+brew "editorconfig-checker"
 # Useful examples at the command-line
 brew "eg-examples"
+# OpenType text shaping engine
+brew "harfbuzz"
+# Development kit for the Java programming language
+brew "openjdk"
 # Run arbitrary commands when files change
 brew "entr"
 # Perl lib for reading and writing EXIF metadata
 brew "exiftool"
+# Simple, fast and user-friendly alternative to find
+brew "fd"
 # Banner-like program prints strings as ASCII art
 brew "figlet"
 # Libraries to talk to Microsoft SQL Server and Sybase databases
@@ -152,8 +158,6 @@ brew "gpgme"
 brew "gpg-tui"
 # Image manipulation
 brew "netpbm"
-# OpenType text shaping engine
-brew "harfbuzz"
 # Framework for layout and rendering of i18n text
 brew "pango"
 # Library to render SVG files using Cairo
@@ -194,10 +198,10 @@ brew "luarocks"
 brew "m-cli"
 # Mac App Store command-line interface
 brew "mas"
+# Mongrel of mail user agents (part elm, pine, mush, mh, etc.)
+brew "mutt"
 # NCurses Disk Usage
 brew "ncdu"
-# Ambitious Vim-fork focused on extensibility and agility
-brew "neovim"
 # HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
 brew "nginx"
 # Port scanning utility for large networks
@@ -208,8 +212,6 @@ brew "nvm"
 brew "openjdk@11"
 # Generate clients, server & docs from an OpenAPI spec (v2, v3)
 brew "openapi-generator"
-# Development kit for the Java programming language
-brew "openjdk"
 # Swiss-army knife of markup format conversion
 brew "pandoc"
 # Highly capable, feature-rich programming language
@@ -416,6 +418,7 @@ mas "Keynote", id: 409183694
 mas "LastPass", id: 926036361
 mas "Numbers", id: 409203825
 mas "Pages", id: 409201541
+mas "Pixelmator Pro", id: 1289583905
 mas "Tailscale", id: 1475387142
 mas "Xcode", id: 497799835
 vscode "akamud.vscode-theme-onelight"
@@ -485,6 +488,7 @@ vscode "Vue.volar"
 vscode "Vue.vscode-typescript-vue-plugin"
 vscode "WakaTime.vscode-wakatime"
 vscode "wix.vscode-import-cost"
+vscode "XadillaX.viml"
 vscode "xdebug.php-debug"
 vscode "xdebug.php-pack"
 vscode "yinfei.luahelper"

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
-  # space there,so we don't use anything by default.
+  # text at the beginning of statusbars. "sb" already puts a 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.

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/iterm2/iterm2-config.json

@@ -1,417 +1,410 @@
 {
-  "Badge Text" : "",
-  "Working Directory" : "\/Users\/ivuorinen\/Code",
-  "Prompt Before Closing 2" : false,
-  "Selected Text Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 1,
-    "Green Component" : 0.83921568627450982
+  "Badge Text": "",
+  "Working Directory": "/Users/ivuorinen/Code",
+  "Prompt Before Closing 2": false,
+  "Selected Text Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 1,
+    "Green Component": 0.83921568627450982
   },
-  "Rows" : 25,
-  "Ansi 11 Color" : {
-    "Red Component" : 0.97647058823529409,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.68627450980392157,
-    "Alpha Component" : 1,
-    "Green Component" : 0.88627450980392153
+  "Rows": 25,
+  "Ansi 11 Color": {
+    "Red Component": 0.97647058823529409,
+    "Color Space": "sRGB",
+    "Blue Component": 0.68627450980392157,
+    "Alpha Component": 1,
+    "Green Component": 0.88627450980392153
   },
-  "Use Italic Font" : true,
-  "Foreground Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 1,
-    "Green Component" : 0.83921568627450982
+  "Use Italic Font": true,
+  "Foreground Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 1,
+    "Green Component": 0.83921568627450982
   },
-  "Right Option Key Sends" : 0,
-  "Character Encoding" : 4,
-  "Selection Color" : {
-    "Red Component" : 0.34509803921568627,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.4392156862745098,
-    "Alpha Component" : 1,
-    "Green Component" : 0.35686274509803922
+  "Right Option Key Sends": 0,
+  "Character Encoding": 4,
+  "Selection Color": {
+    "Red Component": 0.34509803921568627,
+    "Color Space": "sRGB",
+    "Blue Component": 0.4392156862745098,
+    "Alpha Component": 1,
+    "Green Component": 0.35686274509803922
   },
-  "Blend" : 0.24709154211956524,
-  "Mouse Reporting" : true,
-  "Cursor Boost" : 0,
-  "Ansi 4 Color" : {
-    "Red Component" : 0.53725490196078429,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.98039215686274506,
-    "Alpha Component" : 1,
-    "Green Component" : 0.70588235294117652
+  "Blend": 0.24709154211956524,
+  "Mouse Reporting": true,
+  "Cursor Boost": 0,
+  "Ansi 4 Color": {
+    "Red Component": 0.53725490196078429,
+    "Color Space": "sRGB",
+    "Blue Component": 0.98039215686274506,
+    "Alpha Component": 1,
+    "Green Component": 0.70588235294117652
   },
-  "Non-ASCII Anti Aliased" : true,
-  "Sync Title" : false,
-  "Badge Font" : "JetBrainsMonoNerdFontCompleteM-Bold",
-  "Disable Window Resizing" : true,
-  "Description" : "Default",
-  "Close Sessions On End" : true,
-  "Jobs to Ignore" : [
-    "rlogin",
-    "ssh",
-    "slogin",
-    "telnet"
-  ],
-  "Scrollback Lines" : 0,
-  "Draw Powerline Glyphs" : true,
-  "Flashing Bell" : true,
-  "Cursor Guide Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 0.070000000000000007,
-    "Green Component" : 0.83921568627450982
+  "Non-ASCII Anti Aliased": true,
+  "Sync Title": false,
+  "Badge Font": "JetBrainsMonoNerdFontCompleteM-Bold",
+  "Disable Window Resizing": true,
+  "Description": "Default",
+  "Close Sessions On End": true,
+  "Jobs to Ignore": ["rlogin", "ssh", "slogin", "telnet"],
+  "Scrollback Lines": 0,
+  "Draw Powerline Glyphs": true,
+  "Flashing Bell": true,
+  "Cursor Guide Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 0.070000000000000007,
+    "Green Component": 0.83921568627450982
   },
-  "BM Growl" : true,
-  "Ansi 3 Color" : {
-    "Red Component" : 0.97647058823529409,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.68627450980392157,
-    "Alpha Component" : 1,
-    "Green Component" : 0.88627450980392153
+  "BM Growl": true,
+  "Ansi 3 Color": {
+    "Red Component": 0.97647058823529409,
+    "Color Space": "sRGB",
+    "Blue Component": 0.68627450980392157,
+    "Alpha Component": 1,
+    "Green Component": 0.88627450980392153
   },
-  "Icon" : 1,
-  "Use Non-ASCII Font" : false,
-  "Link Color" : {
-    "Red Component" : 0.53725490196078429,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.92156862745098034,
-    "Alpha Component" : 1,
-    "Green Component" : 0.86274509803921573
+  "Icon": 1,
+  "Use Non-ASCII Font": false,
+  "Link Color": {
+    "Red Component": 0.53725490196078429,
+    "Color Space": "sRGB",
+    "Blue Component": 0.92156862745098034,
+    "Alpha Component": 1,
+    "Green Component": 0.86274509803921573
   },
-  "Shortcut" : "",
-  "Background Image Location" : "",
-  "Bold Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 1,
-    "Green Component" : 0.83921568627450982
+  "Shortcut": "",
+  "Background Image Location": "",
+  "Bold Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 1,
+    "Green Component": 0.83921568627450982
   },
-  "Use Cursor Guide" : false,
-  "Unlimited Scrollback" : true,
-  "Custom Command" : "No",
-  "Title Components" : 512,
-  "Keyboard Map" : {
-    "0xf700-0x260000" : {
-      "Action" : 10,
-      "Text" : "[1;6A"
+  "Use Cursor Guide": false,
+  "Unlimited Scrollback": true,
+  "Custom Command": "No",
+  "Title Components": 512,
+  "Keyboard Map": {
+    "0xf700-0x260000": {
+      "Action": 10,
+      "Text": "[1;6A"
     },
-    "0x37-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1f"
+    "0x37-0x40000": {
+      "Action": 11,
+      "Text": "0x1f"
     },
-    "0x32-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x00"
+    "0x32-0x40000": {
+      "Action": 11,
+      "Text": "0x00"
     },
-    "0xf709-0x20000" : {
-      "Action" : 10,
-      "Text" : "[17;2~"
+    "0xf709-0x20000": {
+      "Action": 10,
+      "Text": "[17;2~"
     },
-    "0xf70c-0x20000" : {
-      "Action" : 10,
-      "Text" : "[20;2~"
+    "0xf70c-0x20000": {
+      "Action": 10,
+      "Text": "[20;2~"
     },
-    "0xf729-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2H"
+    "0xf729-0x20000": {
+      "Action": 10,
+      "Text": "[1;2H"
     },
-    "0xf72b-0x40000" : {
-      "Action" : 10,
-      "Text" : "[1;5F"
+    "0xf72b-0x40000": {
+      "Action": 10,
+      "Text": "[1;5F"
     },
-    "0xf705-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2Q"
+    "0xf705-0x20000": {
+      "Action": 10,
+      "Text": "[1;2Q"
     },
-    "0xf703-0x260000" : {
-      "Action" : 10,
-      "Text" : "[1;6C"
+    "0xf703-0x260000": {
+      "Action": 10,
+      "Text": "[1;6C"
     },
-    "0xf700-0x220000" : {
-      "Action" : 10,
-      "Text" : "[1;2A"
+    "0xf700-0x220000": {
+      "Action": 10,
+      "Text": "[1;2A"
     },
-    "0xf701-0x280000" : {
-      "Action" : 11,
-      "Text" : "0x1b 0x1b 0x5b 0x42"
+    "0xf701-0x280000": {
+      "Action": 11,
+      "Text": "0x1b 0x1b 0x5b 0x42"
     },
-    "0x38-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x7f"
+    "0x38-0x40000": {
+      "Action": 11,
+      "Text": "0x7f"
     },
-    "0x33-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1b"
+    "0x33-0x40000": {
+      "Action": 11,
+      "Text": "0x1b"
     },
-    "0xf703-0x220000" : {
-      "Action" : 10,
-      "Text" : "[1;2C"
+    "0xf703-0x220000": {
+      "Action": 10,
+      "Text": "[1;2C"
     },
-    "0xf701-0x240000" : {
-      "Action" : 10,
-      "Text" : "[1;5B"
+    "0xf701-0x240000": {
+      "Action": 10,
+      "Text": "[1;5B"
     },
-    "0xf70d-0x20000" : {
-      "Action" : 10,
-      "Text" : "[21;2~"
+    "0xf70d-0x20000": {
+      "Action": 10,
+      "Text": "[21;2~"
     },
-    "0xf702-0x260000" : {
-      "Action" : 10,
-      "Text" : "[1;6D"
+    "0xf702-0x260000": {
+      "Action": 10,
+      "Text": "[1;6D"
     },
-    "0xf729-0x40000" : {
-      "Action" : 10,
-      "Text" : "[1;5H"
+    "0xf729-0x40000": {
+      "Action": 10,
+      "Text": "[1;5H"
     },
-    "0xf706-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2R"
+    "0xf706-0x20000": {
+      "Action": 10,
+      "Text": "[1;2R"
     },
-    "0x34-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1c"
+    "0x34-0x40000": {
+      "Action": 11,
+      "Text": "0x1c"
     },
-    "0xf700-0x280000" : {
-      "Action" : 11,
-      "Text" : "0x1b 0x1b 0x5b 0x41"
+    "0xf700-0x280000": {
+      "Action": 11,
+      "Text": "0x1b 0x1b 0x5b 0x41"
     },
-    "0x2d-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1f"
+    "0x2d-0x40000": {
+      "Action": 11,
+      "Text": "0x1f"
     },
-    "0xf70e-0x20000" : {
-      "Action" : 10,
-      "Text" : "[23;2~"
+    "0xf70e-0x20000": {
+      "Action": 10,
+      "Text": "[23;2~"
     },
-    "0xf702-0x220000" : {
-      "Action" : 10,
-      "Text" : "[1;2D"
+    "0xf702-0x220000": {
+      "Action": 10,
+      "Text": "[1;2D"
     },
-    "0xf703-0x280000" : {
-      "Action" : 11,
-      "Text" : "0x1b 0x1b 0x5b 0x43"
+    "0xf703-0x280000": {
+      "Action": 11,
+      "Text": "0x1b 0x1b 0x5b 0x43"
     },
-    "0xf700-0x240000" : {
-      "Action" : 10,
-      "Text" : "[1;5A"
+    "0xf700-0x240000": {
+      "Action": 10,
+      "Text": "[1;5A"
     },
-    "0xf707-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2S"
+    "0xf707-0x20000": {
+      "Action": 10,
+      "Text": "[1;2S"
     },
-    "0xf70a-0x20000" : {
-      "Action" : 10,
-      "Text" : "[18;2~"
+    "0xf70a-0x20000": {
+      "Action": 10,
+      "Text": "[18;2~"
     },
-    "0x35-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1d"
+    "0x35-0x40000": {
+      "Action": 11,
+      "Text": "0x1d"
     },
-    "0xf70f-0x20000" : {
-      "Action" : 10,
-      "Text" : "[24;2~"
+    "0xf70f-0x20000": {
+      "Action": 10,
+      "Text": "[24;2~"
     },
-    "0xf703-0x240000" : {
-      "Action" : 10,
-      "Text" : "[1;5C"
+    "0xf703-0x240000": {
+      "Action": 10,
+      "Text": "[1;5C"
     },
-    "0xf701-0x260000" : {
-      "Action" : 10,
-      "Text" : "[1;6B"
+    "0xf701-0x260000": {
+      "Action": 10,
+      "Text": "[1;6B"
     },
-    "0xf702-0x280000" : {
-      "Action" : 11,
-      "Text" : "0x1b 0x1b 0x5b 0x44"
+    "0xf702-0x280000": {
+      "Action": 11,
+      "Text": "0x1b 0x1b 0x5b 0x44"
     },
-    "0xf72b-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2F"
+    "0xf72b-0x20000": {
+      "Action": 10,
+      "Text": "[1;2F"
     },
-    "0x36-0x40000" : {
-      "Action" : 11,
-      "Text" : "0x1e"
+    "0x36-0x40000": {
+      "Action": 11,
+      "Text": "0x1e"
     },
-    "0xf708-0x20000" : {
-      "Action" : 10,
-      "Text" : "[15;2~"
+    "0xf708-0x20000": {
+      "Action": 10,
+      "Text": "[15;2~"
     },
-    "0xf701-0x220000" : {
-      "Action" : 10,
-      "Text" : "[1;2B"
+    "0xf701-0x220000": {
+      "Action": 10,
+      "Text": "[1;2B"
     },
-    "0xf70b-0x20000" : {
-      "Action" : 10,
-      "Text" : "[19;2~"
+    "0xf70b-0x20000": {
+      "Action": 10,
+      "Text": "[19;2~"
     },
-    "0xf702-0x240000" : {
-      "Action" : 10,
-      "Text" : "[1;5D"
+    "0xf702-0x240000": {
+      "Action": 10,
+      "Text": "[1;5D"
     },
-    "0xf704-0x20000" : {
-      "Action" : 10,
-      "Text" : "[1;2P"
+    "0xf704-0x20000": {
+      "Action": 10,
+      "Text": "[1;2P"
     }
   },
-  "Ansi 14 Color" : {
-    "Red Component" : 0.58039215686274515,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.83529411764705885,
-    "Alpha Component" : 1,
-    "Green Component" : 0.88627450980392153
+  "Ansi 14 Color": {
+    "Red Component": 0.58039215686274515,
+    "Color Space": "sRGB",
+    "Blue Component": 0.83529411764705885,
+    "Alpha Component": 1,
+    "Green Component": 0.88627450980392153
   },
-  "Ansi 2 Color" : {
-    "Red Component" : 0.65098039215686276,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.63137254901960782,
-    "Alpha Component" : 1,
-    "Green Component" : 0.8901960784313725
+  "Ansi 2 Color": {
+    "Red Component": 0.65098039215686276,
+    "Color Space": "sRGB",
+    "Blue Component": 0.63137254901960782,
+    "Alpha Component": 1,
+    "Green Component": 0.8901960784313725
   },
-  "Send Code When Idle" : false,
-  "ASCII Anti Aliased" : true,
-  "Tags" : [
-
-  ],
-  "Ansi 9 Color" : {
-    "Red Component" : 0.95294117647058818,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.6588235294117647,
-    "Alpha Component" : 1,
-    "Green Component" : 0.54509803921568623
+  "Send Code When Idle": false,
+  "ASCII Anti Aliased": true,
+  "Tags": [],
+  "Ansi 9 Color": {
+    "Red Component": 0.95294117647058818,
+    "Color Space": "sRGB",
+    "Blue Component": 0.6588235294117647,
+    "Alpha Component": 1,
+    "Green Component": 0.54509803921568623
   },
-  "Badge Right Margin" : 10,
-  "Use Bold Font" : true,
-  "Silence Bell" : false,
-  "Ansi 12 Color" : {
-    "Red Component" : 0.53725490196078429,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.98039215686274506,
-    "Alpha Component" : 1,
-    "Green Component" : 0.70588235294117652
+  "Badge Right Margin": 10,
+  "Use Bold Font": true,
+  "Silence Bell": false,
+  "Ansi 12 Color": {
+    "Red Component": 0.53725490196078429,
+    "Color Space": "sRGB",
+    "Blue Component": 0.98039215686274506,
+    "Alpha Component": 1,
+    "Green Component": 0.70588235294117652
   },
-  "Window Type" : 0,
-  "Use Bright Bold" : true,
-  "Cursor Text Color" : {
-    "Red Component" : 0.80392156862745101,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.95686274509803926,
-    "Alpha Component" : 1,
-    "Green Component" : 0.83921568627450982
+  "Window Type": 0,
+  "Use Bright Bold": true,
+  "Cursor Text Color": {
+    "Red Component": 0.80392156862745101,
+    "Color Space": "sRGB",
+    "Blue Component": 0.95686274509803926,
+    "Alpha Component": 1,
+    "Green Component": 0.83921568627450982
   },
-  "Default Bookmark" : "No",
-  "Cursor Color" : {
-    "Red Component" : 0.96078431372549022,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.86274509803921573,
-    "Alpha Component" : 1,
-    "Green Component" : 0.8784313725490196
+  "Default Bookmark": "No",
+  "Cursor Color": {
+    "Red Component": 0.96078431372549022,
+    "Color Space": "sRGB",
+    "Blue Component": 0.86274509803921573,
+    "Alpha Component": 1,
+    "Green Component": 0.8784313725490196
   },
-  "Ansi 1 Color" : {
-    "Red Component" : 0.95294117647058818,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.6588235294117647,
-    "Alpha Component" : 1,
-    "Green Component" : 0.54509803921568623
+  "Ansi 1 Color": {
+    "Red Component": 0.95294117647058818,
+    "Color Space": "sRGB",
+    "Blue Component": 0.6588235294117647,
+    "Alpha Component": 1,
+    "Green Component": 0.54509803921568623
   },
-  "Name" : "Default",
-  "Blinking Cursor" : false,
-  "Guid" : "82636119-EA17-4A26-9AA7-408172F4A9C8",
-  "Badge Max Width" : 0.45000000000000001,
-  "Idle Code" : 0,
-  "Ansi 10 Color" : {
-    "Red Component" : 0.65098039215686276,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.63137254901960782,
-    "Alpha Component" : 1,
-    "Green Component" : 0.8901960784313725
+  "Name": "Default",
+  "Blinking Cursor": false,
+  "Guid": "82636119-EA17-4A26-9AA7-408172F4A9C8",
+  "Badge Max Width": 0.45000000000000001,
+  "Idle Code": 0,
+  "Ansi 10 Color": {
+    "Red Component": 0.65098039215686276,
+    "Color Space": "sRGB",
+    "Blue Component": 0.63137254901960782,
+    "Alpha Component": 1,
+    "Green Component": 0.8901960784313725
   },
-  "Ansi 8 Color" : {
-    "Red Component" : 0.34509803921568627,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.4392156862745098,
-    "Alpha Component" : 1,
-    "Green Component" : 0.35686274509803922
+  "Ansi 8 Color": {
+    "Red Component": 0.34509803921568627,
+    "Color Space": "sRGB",
+    "Blue Component": 0.4392156862745098,
+    "Alpha Component": 1,
+    "Green Component": 0.35686274509803922
   },
-  "Badge Color" : {
-    "Red Component" : 1,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0,
-    "Alpha Component" : 0.5,
-    "Green Component" : 0.14910030364990234
+  "Badge Color": {
+    "Red Component": 1,
+    "Color Space": "sRGB",
+    "Blue Component": 0,
+    "Alpha Component": 0.5,
+    "Green Component": 0.14910030364990234
   },
-  "Smart Cursor Color" : true,
-  "Ambiguous Double Width" : false,
-  "Blur Radius" : 9.5927277260638313,
-  "Badge Max Height" : 0.10000000000000001,
-  "Ansi 0 Color" : {
-    "Red Component" : 0.27058823529411763,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.35294117647058826,
-    "Alpha Component" : 1,
-    "Green Component" : 0.27843137254901962
+  "Smart Cursor Color": true,
+  "Ambiguous Double Width": false,
+  "Blur Radius": 9.5927277260638313,
+  "Badge Max Height": 0.10000000000000001,
+  "Ansi 0 Color": {
+    "Red Component": 0.27058823529411763,
+    "Color Space": "sRGB",
+    "Blue Component": 0.35294117647058826,
+    "Alpha Component": 1,
+    "Green Component": 0.27843137254901962
   },
-  "Blur" : true,
-  "Normal Font" : "JetBrainsMonoNerdFontCompleteM-Light 15",
-  "Vertical Spacing" : 1,
-  "Ansi 7 Color" : {
-    "Red Component" : 0.72941176470588232,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.87058823529411766,
-    "Alpha Component" : 1,
-    "Green Component" : 0.76078431372549016
+  "Blur": true,
+  "Normal Font": "JetBrainsMonoNerdFontCompleteM-Light 15",
+  "Vertical Spacing": 1,
+  "Ansi 7 Color": {
+    "Red Component": 0.72941176470588232,
+    "Color Space": "sRGB",
+    "Blue Component": 0.87058823529411766,
+    "Alpha Component": 1,
+    "Green Component": 0.76078431372549016
   },
-  "Command" : "",
-  "Terminal Type" : "xterm-256color",
-  "Horizontal Spacing" : 1,
-  "Option Key Sends" : 0,
-  "Only The Default BG Color Uses Transparency" : true,
-  "Minimum Contrast" : 0.14973958333333334,
-  "Ansi 15 Color" : {
-    "Red Component" : 0.65098039215686276,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.78431372549019607,
-    "Alpha Component" : 1,
-    "Green Component" : 0.67843137254901964
+  "Command": "",
+  "Terminal Type": "xterm-256color",
+  "Horizontal Spacing": 1,
+  "Option Key Sends": 0,
+  "Only The Default BG Color Uses Transparency": true,
+  "Minimum Contrast": 0.14973958333333334,
+  "Ansi 15 Color": {
+    "Red Component": 0.65098039215686276,
+    "Color Space": "sRGB",
+    "Blue Component": 0.78431372549019607,
+    "Alpha Component": 1,
+    "Green Component": 0.67843137254901964
   },
-  "Ansi 6 Color" : {
-    "Red Component" : 0.58039215686274515,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.83529411764705885,
-    "Alpha Component" : 1,
-    "Green Component" : 0.88627450980392153
+  "Ansi 6 Color": {
+    "Red Component": 0.58039215686274515,
+    "Color Space": "sRGB",
+    "Blue Component": 0.83529411764705885,
+    "Alpha Component": 1,
+    "Green Component": 0.88627450980392153
   },
-  "Badge Top Margin" : 10,
-  "Transparency" : 0.10293218085106381,
-  "Background Color" : {
-    "Red Component" : 0.11764705882352941,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.1803921568627451,
-    "Alpha Component" : 1,
-    "Green Component" : 0.11764705882352941
+  "Badge Top Margin": 10,
+  "Transparency": 0.10293218085106381,
+  "Background Color": {
+    "Red Component": 0.11764705882352941,
+    "Color Space": "sRGB",
+    "Blue Component": 0.1803921568627451,
+    "Alpha Component": 1,
+    "Green Component": 0.11764705882352941
   },
-  "Screen" : -2,
-  "Non Ascii Font" : "Monaco 12",
-  "Ansi 13 Color" : {
-    "Red Component" : 0.96078431372549022,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.90588235294117647,
-    "Alpha Component" : 1,
-    "Green Component" : 0.76078431372549016
+  "Screen": -2,
+  "Non Ascii Font": "Monaco 12",
+  "Ansi 13 Color": {
+    "Red Component": 0.96078431372549022,
+    "Color Space": "sRGB",
+    "Blue Component": 0.90588235294117647,
+    "Alpha Component": 1,
+    "Green Component": 0.76078431372549016
   },
-  "Columns" : 120,
-  "Visual Bell" : true,
-  "ASCII Ligatures" : false,
-  "Ansi 5 Color" : {
-    "Red Component" : 0.96078431372549022,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.90588235294117647,
-    "Alpha Component" : 1,
-    "Green Component" : 0.76078431372549016
+  "Columns": 120,
+  "Visual Bell": true,
+  "ASCII Ligatures": false,
+  "Ansi 5 Color": {
+    "Red Component": 0.96078431372549022,
+    "Color Space": "sRGB",
+    "Blue Component": 0.90588235294117647,
+    "Alpha Component": 1,
+    "Green Component": 0.76078431372549016
   },
-  "Custom Directory" : "Yes"
-}
+  "Custom Directory": "Yes"
+}

config/nvim/.luarc.json

@@ -0,0 +1,3 @@
+{
+  "diagnostics.globals": ["vim"]
+}

config/nvim/lazy-lock.json

@@ -1,69 +0,0 @@
-{
-  "LazyVim": { "branch": "main", "commit": "a72a84972d85e5bbc6b9d60a0983b37efef21b8a" },
-  "LuaSnip": { "branch": "master", "commit": "1fd22fa96c11573248f9fdd09f25e724c7bb3dd4" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "d2a3d1da007549c921f7b0e22521d1c20d09c8a7" },
-  "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" },
-  "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
-  "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" },
-  "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
-  "catppuccin": { "branch": "main", "commit": "3d9a5ed556e289bce6c1fb0af89ec838360641b2" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "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" },
-  "edgy.nvim": { "branch": "main", "commit": "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4" },
-  "flash.nvim": { "branch": "main", "commit": "cc8c7e03987134997d74ee87e55a5717279f2d05" },
-  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
-  "gitsigns.nvim": { "branch": "main", "commit": "bdeba1cec3faddd89146690c10b9a87949c0ee66" },
-  "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
-  "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
-  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" },
-  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
-  "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
-  "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" },
-  "mini.animate": { "branch": "main", "commit": "989ac014933ab5cd14ab83f2fce4b9a08ca6d81e" },
-  "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" },
-  "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
-  "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" },
-  "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": "360805250fe45391d30b96b6640d03e2c35597ee" },
-  "neodev.nvim": { "branch": "main", "commit": "ddf29935af5a510307850919d6772ea6a4e2c008" },
-  "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" },
-  "noice.nvim": { "branch": "main", "commit": "74c2902146b080035beb19944baf6f014a954720" },
-  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
-  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
-  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ede4114e1fd41acb121c70a27e1b026ac68c42d6" },
-  "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" },
-  "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" },
-  "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" },
-  "nvim-spectre": { "branch": "master", "commit": "97cfd1b0f5a6ab35979ce1bee6c17f54745fd1e5" },
-  "nvim-treesitter": { "branch": "master", "commit": "0960322686bfa38afd4f1e0b9660473cf77e24b6" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "95e9ba9de4289d221666b66fd930d157c7ca08c6" },
-  "nvim-ufo": { "branch": "main", "commit": "6f2ccdf2da390d62f8f9e15fc5ddbcbd312e1e66" },
-  "nvim-web-devicons": { "branch": "master", "commit": "480a756df82a0c231622c9bf2173bb6634713716" },
-  "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
-  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
-  "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" },
-  "stickybuf.nvim": { "branch": "master", "commit": "e3db41f2c1bb2df3ee6ff964ee74fe991f6f9566" },
-  "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" },
-  "telescope.nvim": { "branch": "master", "commit": "ed9574dd6dde143d009b2528ea6d79bd34bbe6c8" },
-  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" },
-  "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": "6acf7d4a18255a3ddc43770866c8e148fe85af7b" },
-  "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
-  "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" },
-  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
-  "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }
-}

config/nvim/lazyvim.json

@@ -0,0 +1,28 @@
+{
+  "extras": [
+    "lazyvim.plugins.extras.coding.copilot",
+    "lazyvim.plugins.extras.editor.aerial",
+    "lazyvim.plugins.extras.editor.leap",
+    "lazyvim.plugins.extras.editor.symbols-outline",
+    "lazyvim.plugins.extras.formatting.black",
+    "lazyvim.plugins.extras.formatting.prettier",
+    "lazyvim.plugins.extras.lang.docker",
+    "lazyvim.plugins.extras.lang.go",
+    "lazyvim.plugins.extras.lang.json",
+    "lazyvim.plugins.extras.lang.markdown",
+    "lazyvim.plugins.extras.lang.python",
+    "lazyvim.plugins.extras.lang.tailwind",
+    "lazyvim.plugins.extras.lang.terraform",
+    "lazyvim.plugins.extras.lang.typescript",
+    "lazyvim.plugins.extras.lang.yaml",
+    "lazyvim.plugins.extras.linting.eslint",
+    "lazyvim.plugins.extras.ui.edgy",
+    "lazyvim.plugins.extras.ui.mini-animate",
+    "lazyvim.plugins.extras.util.dot",
+    "lazyvim.plugins.extras.vscode"
+  ],
+  "news": {
+    "NEWS.md": "2123"
+  },
+  "version": 2
+}

config/nvim/lua/config/lazy.lua

@@ -12,24 +12,19 @@ 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
-    { import = "lazyvim.plugins.extras.formatting.prettier" },
-    { import = "lazyvim.plugins.extras.lang.docker" },
-    { import = "lazyvim.plugins.extras.lang.go" },
-    { import = "lazyvim.plugins.extras.lang.json" },
-    { import = "lazyvim.plugins.extras.lang.python" },
-    { import = "lazyvim.plugins.extras.lang.tailwind" },
-    { import = "lazyvim.plugins.extras.lang.terraform" },
-    { import = "lazyvim.plugins.extras.lang.typescript" },
-    { import = "lazyvim.plugins.extras.lang.yaml" },
-    { import = "lazyvim.plugins.extras.linting.eslint" },
-    { import = "lazyvim.plugins.extras.ui.edgy" },
-    { import = "lazyvim.plugins.extras.ui.mini-animate" },
-    -- import/override with your plugins
     { import = "plugins" },
   },
   defaults = {
@@ -41,7 +36,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/config/options.lua

@@ -7,7 +7,7 @@ local opt = vim.opt
 opt.number = true
 opt.relativenumber = true
 opt.modeline = true
-opt.spelllang = { "en", "fi" }
+vim.g.root_spec = { "lsp", { ".git", "lua" }, "cwd" }
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

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",
-    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",
+    "williamboman/mason.nvim",
     opts = {
-      accept_keymap = "<C-e>",
-      dismiss_keymap = "<C-Esc>",
+      ensure_installed = {
+        "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/example.lua

@@ -103,7 +103,7 @@ return {
     dependencies = {
       "jose-elias-alvarez/typescript.nvim",
       init = function()
-        require("lazyvim.util").on_attach(function(_, buffer)
+        require("lazyvim.util.lsp").on_attach(function(_, buffer)
           -- stylua: ignore
           vim.keymap.set("n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
           vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })

config/nvim/lua/plugins/nvim-lspconfig.lua

@@ -7,7 +7,7 @@ return {
     },
     setup = {
       eslint = function()
-        require("lazyvim.util").on_attach(function(client)
+        require("lazyvim.util.lsp").on_attach(function(client)
           if client.name == "eslint" then
             client.server_capabilities.documentFormattingProvider = true
           elseif client.name == "tsserver" then

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/treesitter.lua

@@ -1,8 +1,8 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = {
-      ensure_installed = {
+    opts = function(_, opts)
+      vim.list_extend(opts.ensure_installed, {
         "bash",
         "html",
         "javascript",
@@ -17,7 +17,7 @@ return {
         "typescript",
         "vim",
         "yaml",
-      },
-    },
+      })
+    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/
   {
@@ -47,6 +9,20 @@ return {
     dependencies = {
       "kevinhwang91/promise-async",
       { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" },
+      {
+        "luukvbaal/statuscol.nvim",
+        config = function()
+          local builtin = require("statuscol.builtin")
+          require("statuscol").setup({
+            relculright = true,
+            segments = {
+              { text = { builtin.foldfunc }, click = "v:lua.ScFa" },
+              { text = { "%s" }, click = "v:lua.ScSa" },
+              { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
+            },
+          })
+        end,
+      },
     },
     init = function()
       vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
@@ -71,7 +47,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)
@@ -109,15 +85,15 @@ return {
   -- 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" },
   -- Neovim plugin for locking a buffer to a window
   -- https://github.com/stevearc/stickybuf.nvim
   { "stevearc/stickybuf.nvim", opts = {} },
+  -- A pretty window for previewing, navigating and editing your LSP locations
+  -- https://github.com/DNLHC/glance.nvim
+  { "dnlhc/glance.nvim" },
   -- Automatically expand width of the current window.
   -- Maximizes and restore it. And all this with nice animations!
   -- https://github.com/anuvyklack/windows.nvim

config/starship.toml

@@ -40,6 +40,8 @@ disabled = true
 [directory]
 read_only = " 󰌾"
 style = "blue"
+before_repo_root_style = "white"
+truncation_symbol = "…/"
 
 [docker_context]
 symbol = " "

config/tmux/tmux.conf

@@ -67,6 +67,9 @@ bind p paste-buffer
 #  │ Settings                                                 │
 #  ╰──────────────────────────────────────────────────────────╯
 
+# Expose window title
+set-option -g set-titles on
+
 # Mouse support
 set -g mouse on
 
@@ -82,61 +85,45 @@ set-option -g renumber-windows on
 # set vi-mode
 set-window-option -g mode-keys vi
 
-#  ╭──────────────────────────────────────────────────────────╮
-#  │ Plugins                                                  │
-#  ╰──────────────────────────────────────────────────────────╯
-
-# 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               \
-'
+# Set theme to tokyonight
+source-file ~/.dotfiles/config/tmux/tokyonight_storm.tmux
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Plugins related configurations                           │
 #  ╰──────────────────────────────────────────────────────────╯
 
-## https://github.com/jaclu/tmux-menus
-set -g @menus_trigger 'm'
+# Plugin that lets you suspend local tmux session,
+# 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'
 
 ## https://github.com/tmux-plugins/tmux-resurrect
 set -g @resurrect-strategy-nvim 'session'
+set -g @resurrect-dir '$HOME/.local/state/tmux/tmux-resurrect'
+
+# Modified from tokyonight_storm to include tmux_mode_indicator
+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-window-name/tmux_window_name.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
 
-# Finally run the tmux plugin manager
-run '~/.dotfiles/config/tmux/plugins/tpm/tpm'

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 ""

config/wtf/config.yml

@@ -20,62 +20,62 @@ wtf:
     # that support ten line of text and one of four.
     rows: [10, 10, 10, 20, 10, 4]
   refreshInterval: 1
-  openFileUtil: "open"
+  openFileUtil: 'open'
   mods:
     # You can have multiple widgets of the same type.
     # The "key" is the name of the widget and the type is the actual
     # widget you want to implement.
     europe_time:
-      title: "Europe"
+      title: 'Europe'
       type: clocks
       colors:
         rows:
-          even: "lightblue"
-          odd: "white"
+          even: 'lightblue'
+          odd: 'white'
       enabled: true
       locations:
-        GMT: "Etc/GMT"
-        Amsterdam: "Europe/Amsterdam"
-        Berlin: "Europe/Berlin"
-        Barcelona: "Europe/Madrid"
-        Copenhagen: "Europe/Copenhagen"
-        London: "Europe/London"
-        Rome: "Europe/Rome"
-        Stockholm: "Europe/Stockholm"
+        GMT: 'Etc/GMT'
+        Amsterdam: 'Europe/Amsterdam'
+        Berlin: 'Europe/Berlin'
+        Barcelona: 'Europe/Madrid'
+        Copenhagen: 'Europe/Copenhagen'
+        London: 'Europe/London'
+        Rome: 'Europe/Rome'
+        Stockholm: 'Europe/Stockholm'
       position:
         top: 0
         left: 0
         height: 1
         width: 1
       refreshInterval: 15
-      sort: "alphabetical"
+      sort: 'alphabetical'
     americas_time:
-      title: "Americas"
+      title: 'Americas'
       type: clocks
       colors:
         rows:
-          even: "lightblue"
-          odd: "white"
+          even: 'lightblue'
+          odd: 'white'
       enabled: true
       locations:
-        UTC: "Etc/UTC"
-        Vancouver: "America/Vancouver"
-        New_York: "America/New_York"
-        Sao_Paulo: "America/Sao_Paulo"
-        Denver: "America/Denver"
-        Iqaluit: "America/Iqaluit"
-        Bahamas: "America/Nassau"
-        Chicago: "America/Chicago"
+        UTC: 'Etc/UTC'
+        Vancouver: 'America/Vancouver'
+        New_York: 'America/New_York'
+        Sao_Paulo: 'America/Sao_Paulo'
+        Denver: 'America/Denver'
+        Iqaluit: 'America/Iqaluit'
+        Bahamas: 'America/Nassau'
+        Chicago: 'America/Chicago'
       position:
         top: 0
         left: 1
         height: 1
         width: 1
       refreshInterval: 15
-      sort: "alphabetical"
+      sort: 'alphabetical'
     battery:
       type: power
-      title: "⚡️"
+      title: '⚡️'
       enabled: true
       position:
         top: 1
@@ -85,14 +85,14 @@ wtf:
       refreshInterval: 15
     todolist:
       type: todo
-      checkedIcon: "X"
+      checkedIcon: 'X'
       colors:
         checked: gray
         highlight:
-          fore: "black"
-          back: "orange"
+          fore: 'black'
+          back: 'orange'
       enabled: true
-      filename: "todo.yml"
+      filename: 'todo.yml'
       position:
         top: 1
         left: 0
@@ -101,10 +101,10 @@ wtf:
       refreshInterval: 3600
     ip:
       type: ipinfo
-      title: "My IP"
+      title: 'My IP'
       colors:
-        name: "lightblue"
-        value: "white"
+        name: 'lightblue'
+        value: 'white'
       enabled: true
       position:
         top: 0
@@ -114,7 +114,7 @@ wtf:
       refreshInterval: 150
     security_info:
       type: security
-      title: "Staying safe"
+      title: 'Staying safe'
       enabled: true
       position:
         top: 1
@@ -126,9 +126,9 @@ wtf:
       type: textfile
       enabled: true
       filePaths:
-        - "~/.config/wtf/config.yml"
+        - '~/.config/wtf/config.yml'
       format: true
-      formatStyle: "monokai"
+      formatStyle: 'monokai'
       position:
         top: 3
         left: 0
@@ -137,7 +137,7 @@ wtf:
       refreshInterval: 15
     news:
       type: hackernews
-      title: "HackerNews"
+      title: 'HackerNews'
       enabled: true
       numberOfStories: 10
       position:
@@ -159,7 +159,7 @@ wtf:
     uptime:
       type: cmdrunner
       args: []
-      cmd: "uptime"
+      cmd: 'uptime'
       enabled: true
       position:
         top: 5
@@ -169,8 +169,8 @@ wtf:
       refreshInterval: 30
     disks:
       type: cmdrunner
-      cmd: "df"
-      args: ["-h"]
+      cmd: 'df'
+      args: ['-h']
       enabled: true
       position:
         top: 4

docs/nvim-keybindings.md

@@ -1,6 +1,6 @@
 # nvim keybindings
 
-```md
+```
 n  !           * <Cmd>lua require("which-key").show("!", {mode = "n", auto = true})<CR>
 n  '           * <Cmd>lua require("which-key").show("'", {mode = "n", auto = true})<CR>
 n  "           * <Cmd>lua require("which-key").show("\"", {mode = "n", auto = true})<CR>

docs/tmux-keybindings.md

@@ -1,9 +1,7 @@
 # tmux keybindings
 
-
 Leader: `<ctrl><space>`
 
-
 ```
 bind-key    -T copy-mode    C-Space              send-keys -X begin-selection
 bind-key    -T copy-mode    C-a                  send-keys -X start-of-line
@@ -298,4 +296,3 @@ bind-key    -T root         M-Right              select-pane -R
 bind-key    -T root         C-Tab                previous-window
 bind-key    -T root         C-S-Tab              next-window
 ```
-

hosts/air/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring air"
 - brewfile:
@@ -8,7 +8,7 @@
       force: true
       glob: true
       path: hosts/air/base/**
-      prefix: "."
+      prefix: '.'
     ~/.config/:
       glob: true
       force: true

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"

hosts/lakka/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring lakka"
 - link:
@@ -6,7 +6,7 @@
       force: true
       glob: true
       path: hosts/lakka/base/**
-      prefix: "."
+      prefix: '.'
     ~/.config/:
       glob: true
       force: true

hosts/tunkki/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring tunkki"
 - link:
@@ -6,8 +6,11 @@
       force: true
       glob: true
       path: hosts/tunkki/base/**
-      prefix: "."
+      prefix: '.'
     ~/.config/:
       glob: true
       force: true
       path: hosts/tunkki/config/**
+- snap:
+    - nvim:
+      classic: true

hosts/v/install.conf.yaml

@@ -1,14 +1,12 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - shell:
     - echo "Configuring v"
-- brewfile:
-    - Brewfile
 - link:
     ~/:
       force: true
       glob: true
       path: hosts/v/base/**
-      prefix: "."
+      prefix: '.'
     ~/.config/:
       glob: true
       force: true

install

@@ -18,18 +18,20 @@ git submodule update --init --recursive "${DOTBOT_DIR}"
   -d "${BASEDIR}" \
   --plugin-dir=tools/dotbot-brew \
   --plugin-dir=tools/dotbot-include \
+  --plugin-dir=tools/dotbot-pip \
   -c "${CONFIG}" \
   "${@}"
 
 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" ] \
-    && echo "(!) Found $DOTBOT_HOST_CONFIG" \
-    && "$DOTBOT_BIN_PATH" \
+  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] &&
+    echo "(!) Found $DOTBOT_HOST_CONFIG" &&
+    "$DOTBOT_BIN_PATH" \
       -d "$BASEDIR" \
       --plugin-dir=tools/dotbot-brew \
       --plugin-dir=tools/dotbot-include \
+      --plugin-dir=tools/dotbot-pip \
       -c "$DOTBOT_HOST_CONFIG" \
       "${@}"
 fi

install.conf.yaml

@@ -1,40 +1,58 @@
-- include: "tools/dotbot-defaults.yaml"
+- include: 'tools/dotbot-defaults.yaml'
 - clean:
     ~/:
     ~/.config:
       recursive: true
     ~/.local:
       recursive: true
+    ~/.ssh:
+      recursive: true
 - create:
     ~/.cache:
     ~/.cache/git:
     ~/.config:
-    ~/.config/cheat/cheatsheets/personal:
-    ~/.config/cheat/cheatsheets/pure-bash-bible:
-    ~/.config/cheat/cheatsheets/tldr:
     ~/.local:
+    ~/.local/bin:
     ~/.local/run:
     ~/.local/share:
     ~/.local/state:
     ~/.ssh:
       mode: 0700
+    ~/.ssh/local.d:
+      mode: 0700
     ~/Code:
 - link:
     ~/:
       force: true
       glob: true
-      path: base/**
-      prefix: "."
+      path: base/*
+      prefix: '.'
     ~/.config/:
       glob: true
-      path: config/**
-    ~/.local/:
+      relink: true
+      path: config/*
+      exclude: [config/nvm]
+    ~/.config/nvm/default-packages:
+      create: true
+      relink: true
+      path: config/nvm/default-packages
+    ~/.local/bin:
       glob: true
-      path: local/**
+      path: local/bin/*
+    ~/.local/man:
+      glob: true
+      path: local/man/**
+    ~/.local/share:
+      glob: true
+      path: local/share/*
     ~/.ssh/:
       glob: true
       mode: 0600
-      path: ssh/**
+      path: ssh/*
 - shell:
     - git submodule update --init --recursive --force
     - bash local/bin/dfm install all
+- pipx:
+    file: tools/requirements-pipx.txt
+    stdout: false
+    stderr: true

local/bin/README.md

@@ -13,7 +13,7 @@ Some problematic code has been fixed per `shellcheck` suggestions.
 ## Sourced
 
 | Script                  | Source            |
-|-------------------------|-------------------|
+| ----------------------- | ----------------- |
 | `x-dupes`               | skx/sysadmin-util |
 | `x-foreach`             | mvdan/dotfiles    |
 | `x-multi-ping`          | skx/sysadmin-util |

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,8 +16,12 @@ SCRIPT=$(basename "$0")
 
 VERSION_NVM="v0.39.5"
 
+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
 {
@@ -32,6 +34,7 @@ function section_install
     "cheat-databases:Install cheat external cheatsheet databases"
     "composer:Install composer"
     "dotenv:Install dotenv-linter"
+    "fonts:Install programming fonts"
     "gh:Install GitHub CLI Extensions"
     "go:Install Go Packages"
     "imagick:Install ImageMagick CLI"
@@ -41,15 +44,20 @@ function section_install
     "nvm:Install Node Version Manager (nvm)"
     "npm:Install NPM Packages"
     "ntfy:Install ntfy"
+    "ohmybash:Install oh-my-bash"
     "pip:Install pip/python packages"
     "z:Install z"
   )
 
   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
       $0 brew install
+      $0 install ohmybash
       $0 install pip
       $0 install cargo
       $0 install composer
@@ -64,81 +72,110 @@ 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)
+      msg "Installing antigen..."
       curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
         && msg_yay "New antigen installed!"
       ;;
     cargo)
+      msg "Installing cargo packages..."
       bash "$DOTFILES/scripts/install-cargo-packages.sh" \
         && msg_yay "cargo packages installed!"
       ;;
     cheat-databases)
+      msg "Installing cheat databases..."
       for database in "$DOTFILES"/scripts/install-cheat-*; do
         bash "$database" \
           && msg_yay "Cheat: $database run"
       done
       ;;
     composer)
+      msg "Installing composer..."
       bash "$DOTFILES/scripts/install-composer.sh" \
         && msg_yay "composer installed!"
       ;;
     dotenv)
+      msg "Installing dotenv-linter..."
       curl -sSfL \
         https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh \
         | sh -s -- -b "$XDG_BIN_HOME" \
         && msg_yay "dotenv-linter installed!"
       ;;
+    fonts)
+      msg "Installing fonts..."
+      bash "$DOTFILES/scripts/install-fonts.sh" \
+        && msg_yay "Installed fonts!"
+      ;;
     fzf)
+      msg "Installing fzf..."
       bash "$DOTFILES/scripts/install-fzf.sh" \
         && msg_yay "fzf installed!"
       ;;
     gh)
+      msg "Installing GitHub CLI Extensions..."
       bash "$DOTFILES/scripts/install-gh-extensions.sh" \
         && msg_yay "github cli extensions installed!"
       ;;
     go)
+      msg "Installing Go Packages..."
       bash "$DOTFILES/scripts/install-go-packages.sh" \
         && msg_yay "go packages installed!"
       ;;
     imagick)
+      msg "Installing ImageMagick CLI..."
       curl -L https://imagemagick.org/archive/binaries/magick > "$XDG_BIN_HOME/magick" \
         && chmod +x "$XDG_BIN_HOME/magick" \
         && msg_yay "imagick installed!"
       ;;
     starship)
+      msg "Installing starship.rs..."
       curl -sS https://starship.rs/install.sh | sh -s -- \
         --bin-dir ~/.local/bin \
         --yes \
         && msg_yay "starship installed!"
       ;;
     macos)
+      msg "Setting up macOS defaults..."
       bash "$DOTFILES/scripts/set-macos-defaults.sh" \
         && msg_yay "Brewfile defined apps has been installed!"
       ;;
     neofetch)
+      msg "Installing neofetch..."
       bash "$DOTFILES/scripts/install-neofetch.sh" \
         && msg_yay "neofetch installed!"
       ;;
     nvm)
+      msg "Installing nvm..."
       curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash \
         && nvm install --lts --latest-npm --default
       git checkout "$DOTFILES/base/zshrc"
       msg_yay "nvm installed!"
       ;;
     npm)
+      msg "NPM Packages install started..."
       bash "$DOTFILES/scripts/install-npm-packages.sh" \
         && msg_yay "NPM Packages have been installed!"
       ;;
     ntfy)
+      msg "ntfy install started..."
       bash "$DOTFILES/scripts/install-ntfy.sh" \
         && msg_yay "ntfy installed!"
       ;;
+    ohmybash)
+      msg "oh-my-bash install started..."
+      bash "$DOTFILES/scripts/install-ohmybash.sh" \
+        && msg_yay "oh-my-bash installed!"
+      ;;
     pip)
-      bash "$DOTFILES/scripts/install-pip-packages.sh" \
-        && msg_yay "pip/python packages installed!"
+      msg "pip install started..."
+      bash "$DOTFILES/scripts/install-pip-packages.sh"
       ;;
     z)
+      msg "Installing z..."
       bash "$DOTFILES/scripts/install-z.sh" \
         && msg_yay "z has been installed!"
       ;;
@@ -244,10 +281,8 @@ function section_dotfiles
         ~/.local/share/nvim \
         ~/.local/state/nvim \
         ~/.cache/nvim \
-        ~/.config/astronvim \
         ~/.config/nvim
-      msg_ok "Deleted old nvim files"
-      ln -s "$DOTFILES/config/astronvim" ~/.config/astronvim
+      msg_ok "Deleted old nvim files (share, state and cache + config)"
       ln -s "$DOTFILES/config/nvim" ~/.config/nvim
       msg_ok "Linked nvim and astronvim"
       have npm && $0 install npm

local/bin/git-update-dirs

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+#
+# Updates subfolders git projects.
+#
+# Actions taken: pull with rebase, autostashes own changes
+# and prunes branches no longer in the remote.
+#
+# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
+# License: MIT <https://opensource.org/license/mit/>
+
+for f in */; do (cd "$f" && echo "-> $f" && git pull --rebase --autostash --prune); done
+
+echo "Done."
+echo ""

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-dfm-docs-xterm-keybindings

@@ -4,6 +4,7 @@
 # Updates $HOME/.dotfiles/docs/tmux.md with my keybindings.
 
 # shellcheck source=./../../scripts/shared.sh
+DOTFILES_SHARED_LOADED=""
 source "$HOME/.dotfiles/scripts/shared.sh"
 
 have tmux || {
@@ -15,7 +16,7 @@ TMUX_KEYBINDINGS_DOCS="$DOTFILES/docs/tmux-keybindings.md"
 CB="\n\`\`\`\n"
 KB=$(tmux list-keys)
 H="# tmux keybindings\n"
-L="\n\nLeader: \`<ctrl><space>\`\n\n"
+L="\nLeader: \`<ctrl><space>\`\n"
 
 # Generalize expanded $HOME to "$HOME"
 KB="${KB//$HOME/\$HOME}"

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

@@ -1,136 +1,195 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Python script to find the largest files in a git repository.
 # The general method is based on the script in this blog post:
 # http://stubbisms.wordpress.com/2009/07/10/git-script-to-show-largest-pack-objects-and-trim-your-waist-line/
 #
-# The above script worked for me, but was very slow on my 11GB repository. This version has a bunch
-# of changes to speed things up to a more reasonable time. It takes less than a minute on repos with 250K objects.
+# The above script worked for me, but was very slow on my 11GB repository.
+# This version has a bunch of changes to speed things up to a more
+# reasonable time. It takes less than a minute on repos with 250K objects.
 #
 # The MIT License (MIT)
 # Copyright (c) 2015 Nick Kocharhook
+# Copyright (c) 2023 Ismo Vuorinen
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
-# associated documentation files (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge, publish, distribute,
-# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in all copies or
-# substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in all copies
+# or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT 
-# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
-# OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+# vim:tw=120:ts=4:ft=python:norl:
 
-from subprocess import check_output, CalledProcessError, Popen, PIPE
+from subprocess import check_output, Popen, PIPE
 import argparse
 import signal
 import sys
 
 sortByOnDiskSize = False
 
+class Blob(object):
+  sha1 = ''
+  size = 0
+  packedSize = 0
+  path = ''
+
+  def __init__(self, line):
+    cols = line.split()
+    self.sha1, self.size, self.packedSize = cols[0], int(cols[2]), int(cols[3])
+
+  def __repr__(self):
+    return '{} - {} - {} - {}'.format(
+      self.sha1, self.size, self.packedSize, self.path)
+
+  def __lt__(self, other):
+    if (sortByOnDiskSize):
+      return self.size < other.size
+    else:
+      return self.packedSize < other.packedSize
+
+  def csv_line(self):
+    return "{},{},{},{}".format(
+      self.size/1024, self.packedSize/1024, self.sha1, self.path)
+
+
 def main():
-	global sortByOnDiskSize
+  global sortByOnDiskSize
 
-	signal.signal(signal.SIGINT, signal_handler)
-	
-	args = parseArguments()
-	sortByOnDiskSize = args.sortByOnDiskSize
-	sizeLimit = 1024*args.filesExceeding
+  signal.signal(signal.SIGINT, signal_handler)
 
-	if args.filesExceeding > 0:
-		print "Finding objects larger than {}kB…".format(args.filesExceeding)
-	else:
-		print "Finding the {} largest objects…".format(args.matchCount)
+  args = parse_arguments()
+  sortByOnDiskSize = args.sortByOnDiskSize
+  sizeLimit = 1024*args.filesExceeding
 
-	blobs = getTopBlobs(args.matchCount, sizeLimit)
+  if args.filesExceeding > 0:
+    print("Finding objects larger than {}kB…".format(args.filesExceeding))
+  else:
+    print("Finding the {} largest objects…".format(args.matchCount))
 
-	populateBlobPaths(blobs)
-	printOutBlobs(blobs)
+  blobs = get_top_blobs(args.matchCount, sizeLimit)
 
-def getTopBlobs(count, sizeLimit):
-	sortColumn = 4
-	
-	if sortByOnDiskSize:
-		sortColumn = 3
-
-	verifyPack = "git verify-pack -v `git rev-parse --git-dir`/objects/pack/pack-*.idx | grep blob | sort -k{}nr".format(sortColumn)
-	output = check_output(verifyPack, shell=True).split("\n")[:-1]
-
-	blobs = dict()
-	compareBlob = Blob("a b {} {} c".format(sizeLimit, sizeLimit)) # use __lt__ to do the appropriate comparison
-
-	for objLine in output:
-		blob = Blob(objLine)
-
-		if sizeLimit > 0:
-			if compareBlob < blob:
-				blobs[blob.sha1] = blob
-			else:
-				break
-		else:
-			blobs[blob.sha1] = blob
-
-			if len(blobs) == count:
-				break
-
-	return blobs
+  populate_blob_paths(blobs)
+  print_out_blobs(blobs)
 
 
-def populateBlobPaths(blobs):
-	if len(blobs):
-		print "Finding object paths…"
+def get_top_blobs(count, sizeLimit):
+  """Get top blobs from git repository
 
-		# Only include revs which have a path. Other revs aren't blobs.
-		revList = "git rev-list --all --objects | awk '$2 {print}'"
-		allObjectLines = check_output(revList, shell=True).split("\n")[:-1]
+    Args:
+        count (int): How many items to return
+        sizeLimit (int): What is the size limit
 
-		outstandingKeys = blobs.keys()
+    Returns:
+        dict: Dictionary of Blobs
+  """
+  sortColumn = 4
 
-		for line in allObjectLines:
-			cols = line.split()
-			sha1, path = cols[0], " ".join(cols[1:])
+  if sortByOnDiskSize:
+    sortColumn = 3
 
-			if (sha1 in outstandingKeys):
-				outstandingKeys.remove(sha1)
-				blobs[sha1].path = path
+  verifyPack = "git verify-pack -v `git rev-parse --git-dir`/objects/pack/pack-*.idx | grep blob | sort -k{}nr".format(sortColumn)  # noqa: E501
+  output = check_output(verifyPack, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
 
-				# short-circuit the search if we're done
-				if not len(outstandingKeys):
-					break
+  blobs = dict()
+  # use __lt__ to do the appropriate comparison
+  compareBlob = Blob("a b {} {} c".format(sizeLimit, sizeLimit))
+  for objLine in output:
+    blob = Blob(objLine)
+
+    if sizeLimit > 0:
+      if compareBlob < blob:
+        blobs[blob.sha1] = blob
+      else:
+        break
+    else:
+      blobs[blob.sha1] = blob
+
+      if len(blobs) == count:
+        break
+
+  return blobs
 
 
-def printOutBlobs(blobs):
-	if len(blobs):
-		csvLines = ["size,pack,hash,path"]
+def populate_blob_paths(blobs):
+  """Populate blob paths that only have a path
 
-		for blob in sorted(blobs.values(), reverse=True):
-			csvLines.append(blob.csvLine())
+  Args:
+    blobs (Blob, dict): Dictionary of Blobs
+  """
+  if len(blobs):
+    print("Finding object paths…")
 
-		p = Popen(["column", "-t", "-s", "','"], stdin=PIPE, stdout=PIPE, stderr=PIPE)
-		stdout, stderr = p.communicate("\n".join(csvLines)+"\n")
+    # Only include revs which have a path. Other revs aren't blobs.
+    revList = "git rev-list --all --objects | awk '$2 {print}'"
+    all_object_lines = check_output(revList, shell=True).decode('utf-8').strip().split("\n")[:-1]  # noqa: E501
+    outstanding_keys = list(blobs.keys())
 
-		print "\nAll sizes in kB. The pack column is the compressed size of the object inside the pack file.\n"
-		print stdout.rstrip('\n')
-	else:
-		print "No files found which match those criteria."
+    for line in all_object_lines:
+      cols = line.split()
+      sha1, path = cols[0], " ".join(cols[1:])
+
+      if (sha1 in outstanding_keys):
+        outstanding_keys.remove(sha1)
+        blobs[sha1].path = path
+
+        # short-circuit the search if we're done
+        if not len(outstanding_keys):
+          break
 
 
-def parseArguments():
-	parser = argparse.ArgumentParser(description='List the largest files in a git repository')
-	parser.add_argument('-c', '--match-count', dest='matchCount', type=int, default=10,
-						help='The number of files to return. Default is 10. Ignored if --files-exceeding is used.')
-	parser.add_argument('--files-exceeding', dest='filesExceeding', type=int, default=0,
-						help='The cutoff amount, in KB. Files with a pack size (or pyhsical size, with -p) larger than this will be printed.')
-	parser.add_argument('-p', '--physical-sort', dest='sortByOnDiskSize', action='store_true', default=False,
-						help='Sort by the on-disk size of the files. Default is to sort by the pack size.')
+def print_out_blobs(blobs):
+  if len(blobs):
+    csvLines = ["size,pack,hash,path"]
 
-	return parser.parse_args()
+    for blob in sorted(blobs.values(), reverse=True):
+      csvLines.append(blob.csv_line())
+
+    command = ["column", "-t", "-s", ","]
+    p = Popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+
+    # Encode the input as bytes
+    input_data = ("\n".join(csvLines) + "\n").encode()
+
+    stdout, _ = p.communicate(input_data)
+
+    print("\nAll sizes in kB. The pack column is the compressed size of the object inside the pack file.\n")  # noqa: E501
+
+    print(stdout.decode("utf-8").rstrip('\n'))
+  else:
+    print("No files found which match those criteria.")
+
+
+def parse_arguments():
+  parser = argparse.ArgumentParser(
+    description='List the largest files in a git repository'
+  )
+  parser.add_argument(
+    '-c', '--match-count', dest='matchCount', type=int, default=10,
+    help='Files to return. Default is 10. Ignored if --files-exceeding is used.'
+  )
+  parser.add_argument(
+    '--files-exceeding', dest='filesExceeding', type=int, default=0,
+    help='The cutoff amount, in KB. Files with a pack size (or physical size, with -p) larger than this will be printed.' # noqa: E501
+  )
+  parser.add_argument(
+    '-p', '--physical-sort', dest='sortByOnDiskSize',
+    action='store_true', default=False,
+    help='Sort by the on-disk size. Default is to sort by the pack size.'
+  )
+
+  return parser.parse_args()
 
 
 def signal_handler(signal, frame):
@@ -138,29 +197,6 @@ def signal_handler(signal, frame):
     sys.exit(0)
 
 
-class Blob(object):
-	sha1 = ''
-	size = 0
-	packedSize = 0
-	path = ''
-
-	def __init__(self, line):
-		cols = line.split()
-		self.sha1, self.size, self.packedSize = cols[0], int(cols[2]), int(cols[3])
-
-	def __repr__(self):
-		return '{} - {} - {} - {}'.format(self.sha1, self.size, self.packedSize, self.path)
-
-	def __lt__(self, other):
-		if (sortByOnDiskSize):
-			return self.size < other.size
-		else:
-			return self.packedSize < other.packedSize
-
-	def csvLine(self):
-		return "{},{},{},{}".format(self.size/1024, self.packedSize/1024, self.sha1, self.path)
-
-
 # Default function is main()
 if __name__ == '__main__':
-	main()
+  main()

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

local/bin/x-welcome-banner

@@ -16,21 +16,22 @@ COLOR_S='\033[0;36m'
 RESET='\033[0m'
 
 # Print time-based personalized message, using figlet & lolcat if availible
-function welcome_greeting () {
+function welcome_greeting()
+{
   h=$(date +%H)
-  if [ "$h" -lt 04 ] || [ "$h" -gt 22 ];
-    then greeting="Good Night"
-  elif [ "$h" -lt 12 ];
-    then greeting="Good morning"
-  elif [ "$h" -lt 18 ];
-    then greeting="Good afternoon"
-  elif [ "$h" -lt 22 ];
-    then greeting="Good evening"
+  if [ "$h" -lt 04 ] || [ "$h" -gt 22 ]; then
+    greeting="Good Night"
+  elif [ "$h" -lt 12 ]; then
+    greeting="Good morning"
+  elif [ "$h" -lt 18 ]; then
+    greeting="Good afternoon"
+  elif [ "$h" -lt 22 ]; then
+    greeting="Good evening"
   else
     greeting="Hello"
   fi
   WELCOME_MSG="$greeting $USER!"
-  if hash lolcat 2>/dev/null && hash figlet 2>/dev/null; then
+  if hash lolcat 2> /dev/null && hash figlet 2> /dev/null; then
     echo "${WELCOME_MSG}" | figlet | lolcat
   else
     echo -e "$COLOR_P${WELCOME_MSG}${RESET}\n"
@@ -38,8 +39,9 @@ function welcome_greeting () {
 }
 
 # Print system information with neofetch, if it's installed
-function welcome_sysinfo () {
-  if hash neofetch 2>/dev/null; then
+function welcome_sysinfo()
+{
+  if hash neofetch 2> /dev/null; then
     neofetch --shell_version off \
       --disable kernel distro shell resolution cpu gpu de wm wm_theme theme icons terminal \
       --backend off \
@@ -50,7 +52,8 @@ function welcome_sysinfo () {
 }
 
 # Print todays info: Date, IP, weather, etc
-function welcome_today () {
+function welcome_today()
+{
   timeout=1
   echo -e "\033[1;34mToday\n------"
 
@@ -62,7 +65,7 @@ function welcome_today () {
   echo -e "${RESET}"
 
   # Print IP address
-  if hash ip 2>/dev/null; then
+  if hash ip 2> /dev/null; then
     ip_address=$(ip route get 8.8.8.8 | awk -F"src " 'NR==1{split($2,a," ");print a[1]}')
     ip_interface=$(ip route get 8.8.8.8 | awk -F"dev " 'NR==1{split($2,a," ");print a[1]}')
     echo -e "${COLOR_S}🌐 IP: $(curl -s -m $timeout 'https://ipinfo.io/ip') (${ip_address} on ${ip_interface})"
@@ -71,23 +74,11 @@ function welcome_today () {
 }
 
 # Putting it all together
-function welcome() {
+function welcome()
+{
   welcome_greeting
   welcome_sysinfo
   welcome_today
 }
 
-# Determine if file is being run directly or sourced
-([[ -n $ZSH_EVAL_CONTEXT && $ZSH_EVAL_CONTEXT =~ :file$ ]] \
-    || [[ -n $KSH_VERSION && $(cd "$(dirname -- "$0")" \
-    && printf '%s' "${PWD%/}/")$(basename -- "$0") != "${.sh.file}" ]] \
-  || [[ -n $BASH_VERSION ]] && (return 0 2>/dev/null)
-) && sourced=1 || sourced=0
-
-# If script being called directly run immediately
-if [ "$sourced" -eq 0 ]; then
-  welcome "$@"
-fi
-
-# EOF
-
+welcome "$@"

package.json

@@ -0,0 +1,33 @@
+{
+  "name": "ivuorinen-dotfiles",
+  "version": "1.0.0",
+  "description": "ivuorinen's dotfiles, this is for linting and formatters",
+  "main": "index.js",
+  "directories": {
+    "doc": "docs"
+  },
+  "scripts": {
+    "lint:markdown": "npx markdownlint -d .",
+    "fix:markdown": "npx markdownlint -df .",
+    "lint:prettier": "npx prettier . --check",
+    "fix:prettier": "npx prettier . --write",
+    "test": "echo \"Error: no test specified\" && exit 0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ivuorinen/dotfiles.git"
+  },
+  "keywords": [
+    "dotfiles",
+    "ivuorinen"
+  ],
+  "author": "Ismo Vuorinen",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/ivuorinen/dotfiles/issues"
+  },
+  "homepage": "https://github.com/ivuorinen/dotfiles#readme",
+  "devDependencies": {
+    "@ivuorinen/base-configs": "^1.1.0"
+  }
+}

scripts/install-cargo-packages.sh

@@ -4,20 +4,36 @@
 # shellcheck source=shared.sh
 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
+  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
   "difftastic"
-  # a modern replacement for ‘ls’.
+  # a modern replacement for ls.
   "eza"
   # A simple, fast and user-friendly alternative to 'find'
   "fd-find"
+  # A cargo subcommand for checking and applying
+  # updates to installed executables
+  "cargo-update"
+  # recursively searches directories for a
+  # regex pattern while respecting your gitignore
+  "ripgrep"
+  # A version manager for neovim
+  "bob-nvim"
 )
 
 for pkg in "${packages[@]}"; do
@@ -26,7 +42,19 @@ for pkg in "${packages[@]}"; do
   # Skip comments
   if [[ ${pkg:0:1} == "#" ]]; then continue; fi
 
-  cargo install $pkg
+  msg_run "Installing cargo package $pkg"
+  cargo install "$pkg"
 
   echo ""
 done
+
+msg_done "Installed cargo packages!"
+
+msg_run "Now doing the next steps for cargo packages"
+
+# use bob to install nvim
+have bob && {
+  bob use stable && path_append "$XDG_DATA_HOME/bob/nvim-bin"
+}
+
+msg_done "All next steps done!"

scripts/install-cheat-purebashbible.sh

@@ -3,9 +3,9 @@
 # shellcheck source=shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-PBB_REQUIRED_TOOLS=(basename git mkdir cheat ls grep head awk cp echo rm)
+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"
@@ -14,13 +14,19 @@ PBB_SYNTAX="syntax: bash"
 PBB_TAGS="tags: [bash]"
 
 PBB_TEMP_PREFIX=$(basename "$0")
-PBB_TEMP_DIR="/tmp/pbb-$(rnd)"
+PBB_TEMP_DIR="$XDG_CACHE_HOME/cheat/pbb"
 
 # If there's no .git, clone the folder
 if [ ! -d "$PBB_TEMP_DIR/.git" ]; then
   msg_run "Starting to clone $PBB_GIT"
   git clone --depth 1 --single-branch -q "$PBB_GIT" "$PBB_TEMP_DIR" \
     && msg_yay "Cloned $PBB_GIT"
+else
+  # Update the repo
+  msg_run "Starting to update $PBB_GIT"
+  git -C "$PBB_TEMP_DIR" reset --hard origin/master
+  git -C "$PBB_TEMP_DIR" pull -q \
+    && msg_yay "Updated $PBB_GIT"
 fi
 
 PBB_CHAPTERS=$(ls -1v "$PBB_TEMP_DIR"/manuscript/chapter*)
@@ -50,8 +56,3 @@ for f in ${PBB_CHAPTERS[@]}; do
     echo -e "---\n$T---\n$(cat "$CHEAT_FILE")" > "$CHEAT_FILE"
   fi
 done
-
-# Cleanup
-if [ -d "$PBB_TEMP_DIR" ]; then
-  rm -rf "$PBB_TEMP_DIR"
-fi

scripts/install-cheat-tldr.sh

@@ -3,9 +3,9 @@
 # shellcheck source=shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-TLDR_REQUIRED_TOOLS=(basename git mkdir cheat ls grep head awk cp echo rm)
+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"
@@ -13,13 +13,19 @@ TLDR_SOURCE="source: $TLDR_GIT"
 TLDR_SYNTAX="syntax: markdown"
 
 TLDR_TEMP_PREFIX=$(basename "$0")
-TLDR_TEMP_DIR="/tmp/cheat-tldr-$(rnd)"
+TLDR_TEMP_DIR="$XDG_CACHE_HOME/cheat/tldr"
 
 # If there's no .git, clone the folder
 if [ ! -d "$TLDR_TEMP_DIR/.git" ]; then
   msg_run "Starting to clone $TLDR_GIT"
   git clone --depth 1 --single-branch -q "$TLDR_GIT" "$TLDR_TEMP_DIR" \
     && msg_done "Cloned $TLDR_GIT"
+else
+  # Update the repo
+  msg_run "Starting to update $TLDR_GIT"
+  git -C "$TLDR_TEMP_DIR" reset --hard origin/main
+  git -C "$TLDR_TEMP_DIR" pull -q \
+    && msg_done "Updated $TLDR_GIT"
 fi
 
 # Fetch the destination directory from cheat defined directories.
@@ -67,8 +73,3 @@ for d in "$TLDR_TEMP_DIR"/pages/*; do
 
   done
 done
-
-# Cleanup
-if [ -d "$TLDR_TEMP_DIR" ]; then
-  rm -rf "$TLDR_TEMP_DIR"
-fi