chore(git): Update submodules (automated)

config/nvim v3.35.0

.gitattributes

@@ -219,3 +219,9 @@ git/*              text
 **/git/*           text
 **/alias           text
 ssh/*              text
+
+# Git Crypt special files
+*-secret   filter=git-crypt diff=git-crypt
+*.key      filter=git-crypt diff=git-crypt
+secrets/** filter=git-crypt diff=git-crypt
+

.github/dependabot.yml

@@ -1,6 +1,5 @@
 version: 2
 updates:
-
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"

.github/workflows/changelog.yml

@@ -1,22 +1,17 @@
----
 name: Debug Changelog # Workflow name displayed on GitHub
-
 on:
   workflow_dispatch: # Trigger manually
-
 jobs:
   debug-changelog:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
       - name: Create changelog text
         id: changelog
         uses: loopwerk/tag-changelog@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config_file: .github/tag-changelog-config.js
-
       - name: "Echo results"
         id: output-changelog
         run: |

.github/workflows/new-release.yml

@@ -1,14 +1,10 @@
----
 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
-
 permissions:
   contents: write
-
 jobs:
   new-daily-release:
     runs-on: ubuntu-latest
@@ -17,11 +13,9 @@ jobs:
       version: ${{ steps.daily-version.outputs.version }}
     steps:
       - uses: actions/checkout@v3 # Checkout our working repository
-
       - name: Create tag if necessary
         uses: fregante/daily-version-action@v2
         id: daily-version
-
       - name: Create changelog text
         if: steps.daily-version.outputs.created
         id: changelog
@@ -29,7 +23,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config_file: .github/tag-changelog-config.js
-
       - name: Create release
         if: steps.daily-version.outputs.created
         uses: actions/create-release@latest

.github/workflows/update-submodules.yml

@@ -1,13 +1,11 @@
 name: Update submodules
 on:
-  schedule: [cron: 0 3 * * *]
+  schedule: [{cron: 0 3 * * *}]
   workflow_dispatch:
-
 permissions:
   contents: write
   issues: write
   pull-requests: write
-
 jobs:
   update-submodules:
     runs-on: ubuntu-latest
@@ -18,12 +16,10 @@ jobs:
           submodules: true
           fetch-depth: 0
           token: ${{secrets.GITHUB_TOKEN}}
-
       - name: Config Git User
         run: |
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@users.noreply.github.com"
-
       - name: Update submodules
         run: |
           if git commit -am"chore(git): Update submodules (automated)

.gitignore

@@ -7,6 +7,10 @@ Brewfile.lock.json
 config/fzf
 config/cheat/cheatsheets/pure-bash-bible/*
 config/cheat/cheatsheets/tldr/*
+config/git/credentials
+config/zsh/.zcompdump
+ssh/local.d/*
+!ssh/local.d/.gitkeep
 !.gitkeep
 .env
 

.yamlfmt

@@ -18,7 +18,7 @@ include:
   - ./**/*.{yml,yaml}
 
 exclude:
-  - ./dotbot/**
-  - ./dotbot-*/**
+  - ./tools/dotbot/**
+  - ./tools/dotbot-*/**
   - ./config/astronvim/**
   - ./config/nvim/**

Brewfile

@@ -16,20 +16,46 @@ tap "teamookla/speedtest"
 tap "xwmx/taps"
 # Run your GitHub Actions locally
 brew "act"
+# Mozilla CA certificate store
+brew "ca-certificates"
 # Interpreted, interactive, object-oriented programming language
 brew "python@3.11"
+# YAML Parser
+brew "libyaml"
 # Automate deployment, configuration, and upgrading
 brew "ansible"
 # Checks ansible playbooks for practices and behaviour
 brew "ansible-lint"
+# Generic-purpose lossless compression algorithm by Google
+brew "brotli"
+# Library and utilities for processing GIFs
+brew "giflib"
+# Performance-portable, length-agnostic SIMD with runtime dispatch
+brew "highway"
+# Library of 2D and 3D vector, matrix, and math operations
+brew "imath"
+# JPEG image codec that aids compression and decompression
+brew "jpeg-turbo"
 # Zstandard is a real-time compression algorithm
 brew "zstd"
+# New file format for still image compression
+brew "jpeg-xl"
+# Codec library for encoding and decoding AV1 video streams
+brew "aom"
+# Apache Portable Runtime library
+brew "apr"
+# Companion library to apr, the Apache Portable Runtime library
+brew "apr-util"
+# Password hashing library and CLI utility
+brew "argon2"
 # Open Source Kubernetes Marketplace
 brew "arkade"
 # Automatic configure script builder
 brew "autoconf"
+# GNU multiple precision arithmetic library
+brew "gmp"
 # GNU File, Shell, and Text utilities
-brew "coreutils", link: false
+brew "coreutils"
 # Extendable version manager with support for Ruby, Node.js, Erlang & more
 brew "asdf"
 # Spell checker with better logic than ispell
@@ -42,6 +68,12 @@ brew "bat"
 brew "bottom"
 # Switch Apache / Valet / CLI configs between PHP versions
 brew "brew-php-switcher"
+# Software library to render fonts
+brew "freetype"
+# XML-based font configuration API for X Windows
+brew "fontconfig"
+# GNU internationalization (i18n) and localization (l10n) library
+brew "gettext"
 # Core application library for C
 brew "glib"
 # Manage compile and link flags for libraries
@@ -50,8 +82,6 @@ brew "pkg-config"
 brew "choose-rust"
 # Cross-platform make
 brew "cmake"
-# Dependency manager for Cocoa projects
-brew "cocoapods"
 # Get, unpack, build, and install modules from CPAN
 brew "cpanminus"
 # Open source suite of directory software
@@ -72,14 +102,10 @@ brew "dotenv-linter"
 brew "editorconfig-checker"
 # Useful examples at the command-line
 brew "eg-examples"
-# C/C++ and Java libraries for Unicode and globalization
-brew "icu4c"
-# 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
@@ -98,6 +124,8 @@ brew "gdu"
 brew "gh"
 # Distributed revision control system
 brew "git"
+# Enable transparent encryption/decryption of files in a git repo
+brew "git-crypt"
 # Small git utilities
 brew "git-extras"
 # See your latest local git branches, formatted real fancy
@@ -116,8 +144,16 @@ brew "gnutls"
 brew "gnupg"
 # Open source programming language to build simple/reliable/efficient software
 brew "go"
+# Library access to GnuPG
+brew "gpgme"
+# Manage your GnuPG keys with ease!
+brew "gpg-tui"
 # Image manipulation
 brew "netpbm"
+# C/C++ and Java libraries for Unicode and globalization
+brew "icu4c"
+# OpenType text shaping engine
+brew "harfbuzz"
 # Framework for layout and rendering of i18n text
 brew "pango"
 # Library to render SVG files using Cairo
@@ -142,10 +178,10 @@ brew "libheif"
 brew "imagemagick"
 # Lightweight and flexible command-line JSON processor
 brew "jq"
+# Network authentication protocol
+brew "krb5"
 # Lazier way to manage everything docker
 brew "lazydocker"
-# Postgres C API library
-brew "libpq"
 # Linguistic software and Finnish dictionary
 brew "libvoikko"
 # Rainbows and unicorns in your console!
@@ -156,14 +192,20 @@ brew "luarocks"
 brew "m-cli"
 # Mac App Store command-line interface
 brew "mas"
+# NCurses Disk Usage
+brew "ncdu"
 # Ambitious Vim-fork focused on extensibility and agility
 brew "neovim"
+# No Nonsense Neovim Client in Rust
+brew "neovide"
 # HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
 brew "nginx"
 # Port scanning utility for large networks
 brew "nmap"
 # Manage multiple Node.js versions
 brew "nvm"
+# Development kit for the Java programming language
+brew "openjdk@11"
 # Generate clients, server & docs from an OpenAPI spec (v2, v3)
 brew "openapi-generator"
 # Development kit for the Java programming language
@@ -186,12 +228,12 @@ brew "pyenv-virtualenv"
 brew "python@3.10"
 # Interpreted, interactive, object-oriented programming language
 brew "python@3.8"
+# Ruby version manager
+brew "rbenv"
 # RC file (dotfile) management
 brew "rcm"
 # Search tool like grep and The Silver Searcher
 brew "ripgrep"
-# Powerful, clean, object-oriented scripting language
-brew "ruby"
 # Safe, concurrent, practical language
 brew "rust"
 # Static analysis and lint tool, for (ba)sh scripts
@@ -202,6 +244,10 @@ brew "shfmt"
 brew "starship"
 # Version control system designed to be a better CVS
 brew "subversion"
+# Feature-rich console based todo list manager
+brew "task"
+# Terminal user interface for taskwarrior
+brew "taskwarrior-tui"
 # Send macOS User Notifications from the command-line
 brew "terminal-notifier"
 # Thin wrapper for Terraform e.g. for locking state
@@ -236,6 +282,8 @@ brew "wget"
 brew "wtfutil"
 # Check your $HOME for unwanted files and directories
 brew "xdg-ninja"
+# Hackable, minimal, fast TUI file explorer
+brew "xplr"
 # JavaScript package manager
 brew "yarn"
 # A vulnerability scanner for container images and filesystems
@@ -413,7 +461,6 @@ vscode "ms-vscode.cpptools"
 vscode "msjsdiag.vscode-react-native"
 vscode "mtxr.sqltools"
 vscode "neilbrayfield.php-docblocker"
-vscode "nemesarial.dust"
 vscode "nhoizey.gremlins"
 vscode "octref.vetur"
 vscode "oderwat.indent-rainbow"
@@ -427,6 +474,7 @@ vscode "tootone.org-mode"
 vscode "valeryanm.vscode-phpsab"
 vscode "Vue.volar"
 vscode "WakaTime.vscode-wakatime"
+vscode "withfig.fig"
 vscode "wix.vscode-import-cost"
 vscode "xdebug.php-debug"
 vscode "xdebug.php-pack"

base/bashrc

@@ -1,3 +1,5 @@
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.pre.bash"
 # this is my bashrc config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
@@ -21,3 +23,6 @@ x-load-configs
 ssh-add -A 2>/dev/null;
 
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.post.bash"

base/zshenv

@@ -0,0 +1 @@
+ZDOTDIR=~/.config/zsh

base/zshrc

@@ -1,51 +1,10 @@
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-autoload -U colors zsh/terminfo
-colors
-setopt correct
+export ZDOTDIR="$HOME/.config/zsh/"
+mkdir -p "$ZDOTDIR"
 
-# Add completion scripts to zsh path
-FPATH="~/.config/zsh/completion:$FPATH"
-autoload -Uz compinit && compinit -i
-
-# Defaults
-export DOTFILES="$HOME/.dotfiles"
-# shellcheck source=shared.sh
-source "$DOTFILES/scripts/shared.sh"
-
-# 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
-    [ -f "$file" ] && source "$file"
-    [ -f "$file-secret" ] && source "$file-secret"
-    [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-    [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
-  done
-}
-x-load-configs
-
-# Import ssh keys in keychain
-ssh-add -A 2>/dev/null;
-
-# Try to load antigen, if present
-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
-
-  # config/functions
-  x-default-antigen-bundles
-
-  antigen apply
-}
-
-# starship is present
-have starship && eval "$(starship init zsh)"
-
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
-  && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"

config/alias

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # shellcheck source="../scripts/shared.sh"
+# shellcheck disable=1091,2139
 source "$DOTFILES/scripts/shared.sh"
 
 # Get installed php versions from brew and setup aliases
@@ -83,3 +84,6 @@ if [[ -f "$HOME/.aliases.local" ]]; then
   # shellcheck disable=SC1091
   source "$HOME/.aliases.local"
 fi
+
+alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
+alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"

config/astronvim/lua/user/init.lua

@@ -1,3 +1,4 @@
+-- luacheck: globals vim
 return {
   -- Configure AstroNvim updates
   updater = {
@@ -78,6 +79,32 @@ return {
   -- augroups/autocommands and custom filetypes also this just pure lua so
   -- anything that doesn't fit in the normal config locations above can go here
   polish = function()
+    local function yaml_ft(path, bufnr)
+      -- get content of buffer as string
+      local content = vim.filetype.getlines(bufnr)
+      if type(content) == "table" then content = table.concat(content, "\n") end
+
+      -- check if file is in roles, tasks, or handlers folder
+      local path_regex = vim.regex "(tasks\\|roles\\|handlers)/"
+      if path_regex and path_regex:match_str(path) then return "yaml.ansible" end
+      -- check for known ansible playbook text and if found, return yaml.ansible
+      local regex = vim.regex "hosts:\\|tasks:"
+      if regex and regex:match_str(content) then return "yaml.ansible" end
+
+      -- return yaml if nothing else
+      return "yaml"
+    end
+
+    vim.filetype.add {
+      extension = {
+        yml = yaml_ft,
+        yaml = yaml_ft,
+      },
+    }
+
+    require("notify").setup({
+      background_colour = "#000000",
+    })
     -- Set up custom filetypes
     -- vim.filetype.add {
     --   extension = {

config/astronvim/lua/user/mappings.lua

@@ -17,12 +17,33 @@ return {
       end,
       desc = "Pick to close",
     },
-    -- tables with the `name` key will be registered with which-key if it's installed
-    -- this is useful for naming menus
+    -- tables with the `name` key will be registered with which-key
+    -- if it's installed this is useful for naming menus
     ["<leader>b"] = { name = "Buffers" },
-    -- quick save
-    -- ["<C-s>"] = { ":w!<cr>", desc = "Save File" },  -- change description but the same command
-    ["<leader>P"] = { ":Telescope projects<cr>", desc = "Update Projects listing" },
+    -- quick save (change description)
+    ["<C-s>"] = { ":w!<cr>", desc = "Save File" },
+    ["<leader>P"] = {
+      ":Telescope projects<cr>",
+      desc = "Update Projects listing"
+    },
+    -- close_buffers
+    ['<leader>bch'] = {
+      "<CMD>lua require('close_buffers').delete({type = 'hidden'})<CR>",
+      desc = "Delete hidden buffers"
+    },
+    -- comment-box
+    ["<leader>bb"] = {
+      "<cmd>lua require('comment-box').lbox()<cr>",
+      desc = "Left aligned fixed size box with left aligned text"
+    },
+    ["<leader>bc"] = {
+      "<cmd>lua require('comment-box').ccbox()<cr>",
+      desc = "Centered adapted box with centered text"
+    },
+    ["<leader>bl"] = {
+      "<cmd>lua require('comment-box').cline()<cr>",
+      desc = "Centered line"
+    },
   },
   t = {
     -- setting a mapping to false will disable it

config/astronvim/lua/user/plugins/community.lua

@@ -17,6 +17,7 @@ return {
     }
   },
   -- { import = "astrocommunity.completion.copilot-lua-cmp" },
+  { import = "astrocommunity.completion.tabnine-nvim" },
   { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" },
   {
     "m4xshen/smartcolumn.nvim",
@@ -33,22 +34,26 @@ return {
       position = "bottom"
     }
   },
+  { import = "astrocommunity.debugging.telescope-dap-nvim" },
+  { import = "astrocommunity.editing-support.comment-box-nvim" },
   { import = "astrocommunity.editing-support.refactoring-nvim" },
   { import = "astrocommunity.editing-support.neogen" },
   { import = "astrocommunity.editing-support.nvim-regexplainer" },
   { import = "astrocommunity.editing-support.todo-comments-nvim" },
   { import = "astrocommunity.indent.mini-indentscope" },
-  { import = "astrocommunity.markdown-and-latex.glow-nvim" },
+  { import = "astrocommunity.lsp.lsp-signature-nvim" },
   { import = "astrocommunity.motion.harpoon" },
   { import = "astrocommunity.pack.ansible" },
   { import = "astrocommunity.pack.bash" },
   { import = "astrocommunity.pack.docker" },
   { import = "astrocommunity.pack.go" },
   { import = "astrocommunity.pack.html-css" },
+  { import = "astrocommunity.pack.json" },
   { import = "astrocommunity.pack.markdown" },
   { import = "astrocommunity.pack.php" },
   { import = "astrocommunity.pack.typescript" },
   { import = "astrocommunity.pack.vue" },
+  { import = "astrocommunity.pack.yaml" },
   { import = "astrocommunity.project.nvim-spectre" },
   { import = "astrocommunity.project.project-nvim" },
   { import = "astrocommunity.test.neotest" },

config/astronvim/lua/user/plugins/user.lua

@@ -1,3 +1,4 @@
+-- luacheck: globals vim
 return {
   -- You can also add new plugins here as well:
   -- Add plugins, the lazy syntax
@@ -12,4 +13,95 @@ return {
     lazy = false,
     enabled = true,
   },
+  {
+    "nvim-treesitter/nvim-treesitter-context",
+    lazy = false,
+    enabled = true,
+    opts = {
+      enable = true,
+      mode = "cursor", -- cursor, or topline
+    },
+  },
+  { "kazhala/close-buffers.nvim" },
+  {
+    "folke/edgy.nvim",
+    event = "VeryLazy",
+    dependencies = {
+      {
+        'nvim-neo-tree/neo-tree.nvim',
+        config = function()
+          require('neo-tree').setup({
+            open_files_do_not_replace_types = {
+              'terminal', 'Trouble', 'qf', 'edgy'
+            },
+          })
+        end,
+      },
+      {
+        'simrat39/symbols-outline.nvim',
+        config = function()
+          require('symbols-outline').setup()
+        end,
+      },
+    },
+    init = function()
+      vim.opt.laststatus = 3
+      vim.opt.splitkeep = "screen"
+    end,
+    opts = {
+      bottom = {
+        -- toggleterm / lazyterm at the bottom with
+        -- a height of 40% of the screen
+        {
+          ft = "toggleterm",
+          size = { height = 0.4 },
+          -- exclude floating windows
+          filter = function(_, win)
+            return vim.api.nvim_win_get_config(win).relative == ""
+          end,
+        },
+        {
+          ft = "lazyterm",
+          title = "LazyTerm",
+          size = { height = 0.4 },
+          filter = function(buf)
+            return not vim.b[buf].lazyterm_cmd
+          end,
+        },
+        "Trouble",
+        { ft = "qf", title = "QuickFix" },
+        {
+          ft = "help",
+          size = { height = 20 },
+          -- only show help buffers
+          filter = function(buf)
+            return vim.bo[buf].buftype == "help"
+          end,
+        },
+        { ft = "spectre_panel", size = { height = 0.4 } },
+      },
+      left = {
+        -- Neo-tree filesystem always takes half the screen height
+        {
+          title = "Neo-Tree",
+          ft = "neo-tree",
+          filter = function(buf)
+            return vim.b[buf].neo_tree_source == "filesystem"
+          end,
+          size = { height = 0.5 },
+        },
+        {
+          title = "Neo-Tree Buffers",
+          ft = "neo-tree",
+          filter = function(buf)
+            return vim.b[buf].neo_tree_source == "buffers"
+          end,
+          pinned = true,
+          open = "Neotree position=top buffers",
+        },
+        -- any other neo-tree windows
+        "neo-tree",
+      },
+    },
+  },
 }

config/cheat/conf.yml

@@ -1,24 +1,19 @@
----
 # The editor to use with 'cheat -e <sheet>'. Defaults to $EDITOR or $VISUAL.
 # editor: $EDITOR
 
 # Should 'cheat' always colorize output?
 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"
-
 # Which 'chroma' "formatter" should be applied?
 # One of: "terminal", "terminal256", "terminal16m"
 formatter: terminal256
-
 # Through which pager should output be piped?
 # 'less -FRX' is recommended on Unix systems
 # 'more' is recommended on Windows
 pager: less -FRX
-
 # Cheatpaths are paths at which cheatsheets are available on your local
 # filesystem.
 #
@@ -63,21 +58,21 @@ cheatpaths:
   #   'readonly': shall user-created ('cheat -e') cheatsheets be saved here?
   - name: community
     path: ~/.config/cheat/cheatsheets/community
-    tags: [ community ]
+    tags: [community]
     readonly: true
   # If you have personalized cheatsheets, list them last. They will take
   # precedence over the more global cheatsheets.
   - name: personal
     path: ~/.dotfiles/config/cheat/cheatsheets/personal
-    tags: [ personal ]
+    tags: [personal]
     readonly: false
   - name: pure-bash-bible
     path: ~/.dotfiles/config/cheat/cheatsheets/pure-bash-bible
-    tags: [ pure-bash-bible ]
+    tags: [pure-bash-bible]
     readonly: true
   - name: tldr
     path: ~/.dotfiles/config/cheat/cheatsheets/tldr
-    tags: [ tldr ]
+    tags: [tldr]
     readonly: true
 
 # While it requires no configuration here, it's also worth noting that

config/exports

@@ -31,10 +31,7 @@ path_prepend "$XDG_BIN_HOME"
 
 # brew, https://brew.sh
 have brew && {
-  path_append "$(brew --prefix python)/bin"
-  path_append "$(brew --prefix coreutils)/libexec/gnubin"
-  path_append "$(brew --prefix ruby)/bin"
-  path_append "$(gem environment gemdir)/bin"
+  have_brew python && path_append "$(brew --prefix python)/bin"
 }
 
 source "$DOTFILES/config/exports-shell"

config/exports-apps

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # shellcheck enable=external-sources
-# shellcheck disable=1091
+# shellcheck disable=1091,2139
 # vim: filetype=zsh
 source "$DOTFILES/scripts/shared.sh"
 
@@ -13,42 +13,34 @@ export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
 
 # Ansible configuration
 # https://docs.ansible.com/ansible/latest/reference_appendices/config.html
+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 && {
-  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"
   x-dc "$ANSIBLE_HOME"
   x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
 }
 
-# brew configuration
-have brew && {
-  FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
-
-  autoload -Uz compinit
-  compinit
-}
+export ANDROID_HOME="$XDG_DATA_HOME/android"
 
 # composer, https://getcomposer.org/
+export COMPOSER_HOME="$XDG_STATE_HOME/composer"
+export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
 have composer && {
-  export COMPOSER_HOME="$XDG_STATE_HOME/composer"
-  export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
   export PATH="$COMPOSER_BIN:$PATH"
 }
 
 # docker, https://docs.docker.com/engine/reference/commandline/cli/
+export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
 have docker && {
-  export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
   x-dc "$DOCKER_CONFIG"
   # Docker: Disable snyk ad
   export DOCKER_SCAN_SUGGEST=false
 }
 
 # ffmpeg
-have ffmpeg && {
-  export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
-  x-dc "$FFMPEG_DATADIR"
-}
+export FFMPEG_DATADIR="$XDG_CONFIG_HOME/ffmpeg"
+have ffmpeg && x-dc "$FFMPEG_DATADIR"
 
 # gcloud
 have gcloud && {
@@ -57,20 +49,12 @@ have gcloud && {
   [[ -f "$GCLOUD_LOC/completion.zsh.inc" ]] && builtin source "$GCLOUD_LOC/completion.zsh.inc"
 }
 
-# gem, rubygems
-have gem && {
-  export GEM_HOME="$XDG_STATE_HOME/gem"
-  export GEM_PATH="$XDG_STATE_HOME/gem"
-  export PATH="$GEM_HOME/bin:$PATH"
-  path_append "$GEM_PATH/bin"
-}
+# GnuPG
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 
-# If we have go packages, include them to the PATH
-have go && {
-  export GOPATH="$XDG_DATA_HOME/go"
-  export GOBIN="$XDG_BIN_HOME"
-  x-dc "$GOPATH"
-}
+# Go
+export GOPATH="$XDG_DATA_HOME/go"
+export GOBIN="$XDG_BIN_HOME"
 
 # irssi
 have irssi && {
@@ -81,10 +65,8 @@ have irssi && {
 }
 
 # nb, https://xwmx.github.io/nb/
-have nb && {
-  export NB_DIR="$XDG_STATE_HOME/nb"
-  x-dc "$NB_DIR"
-}
+export NBRC_PATH="$XDG_CONFIG_HOME/nbrc"
+export NB_DIR="$XDG_STATE_HOME/nb"
 
 # nvm, the node version manager
 export NVM_LAZY_LOAD=true
@@ -101,22 +83,41 @@ have node && {
 }
 
 # op (1Password cli) is present
+export OP_CACHE="$XDG_STATE_HOME/1password"
 have op && {
-  export OP_CACHE="$XDG_STATE_HOME/1password"
-  x-dc "$OP_CACHE"
   eval "$(op completion zsh)"
   compdef _op op
 }
 
+# Python
+#
 # pyenv, python environments
+export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
+export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
 have pyenv && {
-  export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
-  x-dc "$PYENV_ROOT"
   path_append "$PYENV_ROOT/bin"
-
   eval "$(pyenv init -)"
 }
 
+# Ruby
+#
+# including: bundler, rbenv
+export GEM_HOME="${XDG_DATA_HOME}"/gem
+export GEM_SPEC_CACHE="${XDG_CACHE_HOME}"/gem
+export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle
+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)"
+
+# screen
+export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
+
+# tmux
+export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
+
 # wakatime, https://github.com/wakatime/wakatime-cli
 export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
 x-dc "$WAKATIME_HOME"
@@ -126,9 +127,6 @@ export _Z_DATA="$XDG_STATE_HOME/z"
 [[ -f "$XDG_BIN_HOME/z/z.sh" ]] && source "$XDG_BIN_HOME/z/z.sh"
 
 # Misc
-export ANDROID_HOME="$XDG_DATA_HOME/android"
-export GNUPGHOME="$XDG_DATA_HOME/gnupg"
-export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
-export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
 export BAT_THEME="ansi"
 export CHEAT_USE_FZF=true
+export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history

config/functions

@@ -31,10 +31,10 @@ digga()
   dig +nocmd "$1" any +multiline +noall +answer
 }
 
-# Rector project to php version 8.0 by default.
+# Rector project to php version 8.2 by default.
 rector()
 {
-  local php="${1:-80}"
+  local php="${1:-82}"
   docker run -v "$(pwd)":/project rector/rector:latest process \
     "/project/$1" \
     --set "php${php}" \
@@ -100,7 +100,7 @@ x-default-antigen-bundles()
   have docker-compose && antigen bundle sroze/docker-compose-zsh-plugin
   have jq && antigen bundle reegnz/jq-zsh-plugin
   have nvm && antigen bundle nvm
-  have nvm && antigen bundle $DOTFILES/config/zsh/plugins/nvm-auto-use
+  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/git/shared

@@ -11,9 +11,6 @@
 [pull]
   rebase = true
 
-[gpg]
-  format = ssh
-
 [alias]
   branchbydate = for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)'
   branchcolor = "!for ref in $(git for-each-ref --sort=-committerdate --format=\"%(refname)\" refs/heads/ refs/remotes ); do git log -n1 $ref --pretty=format:\"%Cgreen%cr%Creset %C(yellow)%d%Creset %C(bold blue)<%an>%Creset%n\" | cat ; done | awk '! a[$0]++'"

config/gpg-tui/gpg-tui.toml

@@ -0,0 +1,32 @@
+[general]
+  splash = false
+  tick_rate = 250
+  color = "gray"
+  style = "plain"
+  file_explorer = "xplr"
+  detail_level = "minimum"
+  # key_bindings = [
+  #   { keys = [ "?" ], command = ":help" },
+  #   { keys = [ "o" ], command = ":options" },
+  #   { keys = [ "n" ], command = ":normal" },
+  #   { keys = [ "v" ], command = ":visual" },
+  #   { keys = [ "c" ], command = ":copy" },
+  #   { keys = [ "p", "C-v" ], command = ":paste" },
+  #   { keys = [ "x" ], command = ":export" },
+  #   { keys = [ "s" ], command = ":set prompt :sign" },
+  #   { keys = [ "e" ], command = ":set prompt :edit" },
+  #   { keys = [ "i" ], command = ":set prompt :import"},
+  #   { keys = [ "f" ], command = ":set prompt :receive" },
+  #   { keys = [ "u" ], command = ":set prompt :send" },
+  #   { keys = [ "g" ], command = ":generate" },
+  #   { keys = [ "d", "backspace" ], command = ":delete" },
+  #   { keys = [ "C-r" ], command = ":refresh" },
+  # ]
+
+[gpg]
+  armor = false
+  # homedir = "~/.gnupg"
+  # outdir = "~/.gnupg/out"
+  # outfile = "{type}_{query}.{ext}"
+  # default_key = "0xA1B2C3XY"
+

config/task/taskrc

@@ -42,3 +42,40 @@ data.location=$XDG_DATA_HOME/task/
 weekstart=monday
 
 news.version=2.6.0
+
+default.project=Inbox
+calendar.details=full
+calendar.holidays=sparse
+
+uda.taskwarrior-tui.keyconfig.quit=q
+uda.taskwarrior-tui.keyconfig.refresh=r
+uda.taskwarrior-tui.keyconfig.go-to-bottom=G
+uda.taskwarrior-tui.keyconfig.go-to-top=g
+uda.taskwarrior-tui.keyconfig.down=j
+uda.taskwarrior-tui.keyconfig.up=k
+uda.taskwarrior-tui.keyconfig.page-down=J
+uda.taskwarrior-tui.keyconfig.page-up=K
+uda.taskwarrior-tui.keyconfig.delete=x
+uda.taskwarrior-tui.keyconfig.done=d
+uda.taskwarrior-tui.keyconfig.start-stop=s
+uda.taskwarrior-tui.keyconfig.quick-tag=t
+uda.taskwarrior-tui.keyconfig.undo=u
+uda.taskwarrior-tui.keyconfig.edit=e
+uda.taskwarrior-tui.keyconfig.modify=m
+uda.taskwarrior-tui.keyconfig.shell=!
+uda.taskwarrior-tui.keyconfig.log=l
+uda.taskwarrior-tui.keyconfig.add=a
+uda.taskwarrior-tui.keyconfig.annotate=A
+uda.taskwarrior-tui.keyconfig.filter=/
+uda.taskwarrior-tui.keyconfig.zoom=z
+uda.taskwarrior-tui.keyconfig.context-menu=c
+uda.taskwarrior-tui.keyconfig.next-tab=.
+uda.taskwarrior-tui.keyconfig.previous-tab=,
+
+taskd.certificate=$XDG_DATA_HOME/task/private.certificate.pem
+taskd.key=$XDG_DATA_HOME/task/private.key.pem
+taskd.ca=$XDG_DATA_HOME/task/ca.cert.pem
+taskd.server=inthe.am:53589
+taskd.credentials=inthe_am/ivuorinen/b99a4970-94fb-4fb8-b9fe-e1a8140dd44d
+taskd.trust=strict
+

config/tmux/tmux.conf

@@ -14,6 +14,8 @@ set -g @tpm_plugins '           \
   yardnsm/tmux-1password         \
   jaclu/tmux-menus               \
   sainnhe/tmux-fzf               \
+  MunifTanjim/tmux-mode-indicator \
+  MunifTanjim/tmux-suspend       \
   tmux-plugins/tmux-continuum    \
   tmux-plugins/tmux-resurrect    \
   tmux-plugins/tmux-sensible     \
@@ -21,6 +23,9 @@ set -g @tpm_plugins '           \
   tmux-plugins/tmux-yank         \
 '
 
+# Set plugins install dir
+set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.config/tmux/plugins/'
+
 set-option -sa terminal-overrides ",xterm*:Tc"
 
 # Mouse support
@@ -61,7 +66,7 @@ bind -n M-H previous-window
 bind -n M-L next-window
 
 # Reload tmux config with <prefix> + r
-bind r source-file ~/.config/tmux/tmux.conf \; display "tmux cfg reloaded!"
+bind r source-file ~/.dotfiles/config/tmux/tmux.conf \; display "tmux cfg reloaded!"
 
 # Open a new window with <prefix> + N
 bind N new-window
@@ -78,6 +83,25 @@ set -g @1password-key 'x'
 set -g @catppuccin_flavour 'mocha' # latte/frappe/macchiato/mocha
 set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs
 
+## https://github.com/MunifTanjim/tmux-mode-indicator
+set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}'
+
+set -g @mode_indicator_prefix_prompt ' WAIT '
+set -g @mode_indicator_copy_prompt ' COPY '
+set -g @mode_indicator_sync_prompt ' SYNC '
+set -g @mode_indicator_empty_prompt ' TMUX '
+set -g @mode_indicator_prefix_mode_style 'bg=blue,fg=black'
+set -g @mode_indicator_copy_mode_style 'bg=yellow,fg=black'
+set -g @mode_indicator_sync_mode_style 'bg=red,fg=black'
+set -g @mode_indicator_empty_mode_style 'bg=cyan,fg=black'
+
+## https://github.com/MunifTanjim/tmux-suspend
+set -g @suspend_key 'F12'
+set -g @suspend_suspended_options " \
+  @mode_indicator_custom_prompt:: ---- , \
+  @mode_indicator_custom_mode_style::bg=brightblack\\,fg=black, \
+"
+
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'
 set -g @continuum-boot 'on'
@@ -87,7 +111,7 @@ set -g @continuum-boot-options 'iterm'
 set -g @resurrect-strategy-nvim 'session'
 
 ## https://github.com/b0o/tmux-autoreload
-set-option -g @tmux-autoreload-configs '~/.config/tmux/tmux.conf'
+set-option -g @tmux-autoreload-configs '~/.dotfiles/config/tmux/tmux.conf'
 
 ## https://github.com/sainnhe/tmux-fzf
 TMUX_FZF_LAUNCH_KEY="l"
@@ -103,7 +127,7 @@ bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
 bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
 
 bind '"' split-window -v -c "#{pane_current_path}"
-bind % split-window -h -c "#{pane_current_path}"
+bind '!' split-window -h -c "#{pane_current_path}"
 
 # synchronize all panes in a window
 bind y setw synchronize-panes

config/zsh/.zshrc

@@ -0,0 +1,52 @@
+autoload -U colors zsh/terminfo
+colors
+setopt correct
+
+# Add completion scripts to zsh path
+FPATH="~/.config/zsh/completion:$FPATH"
+autoload -Uz compinit && compinit -i
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+
+# Defaults
+export DOTFILES="$HOME/.dotfiles"
+# shellcheck source=shared.sh
+source "$DOTFILES/scripts/shared.sh"
+
+# 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
+    [ -f "$file" ] && source "$file"
+    [ -f "$file-secret" ] && source "$file-secret"
+    [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
+    [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
+  done
+}
+x-load-configs
+
+# Import ssh keys in keychain
+ssh-add -A 2>/dev/null;
+
+# Try to load antigen, if present
+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
+
+  # config/functions
+  x-default-antigen-bundles
+
+  antigen apply
+}
+
+# starship is present
+have starship && eval "$(starship init zsh)"
+
+[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
+  && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
+
+export LESSHISTFILE="$XDG_CACHE_HOME"/less_history
+

config/zsh/completion/_nb

@@ -1,174 +0,0 @@
-#compdef nb
-###############################################################################
-# __          _
-# \ \   _ __ | |__
-#  \ \ | '_ \| '_ \
-#  / / | | | | |_) |
-# /_/  |_| |_|_.__/
-#
-# [nb] Command line and local web note-taking, bookmarking, and archiving with
-# plain text data storage, encryption, filtering and search, pinning, #tagging,
-# Git-backed versioning and syncing, Pandoc-backed conversion, global and local
-# notebooks, customizable color themes, [[wiki-style linking]], plugins, and
-# more in a single portable, user-friendly script.
-#
-# https://github.com/xwmx/nb
-###############################################################################
-_nb_subcommands() {
-  # _nb_cache_completions()
-  #
-  # Usage:
-  #   _nb_cache_completions <path>
-  #
-  # Description:
-  #   Cache completions for `nb`. Generating completions can be slow and
-  #   native shell caching doesn't appear to help.
-  _nb_cache_completions() {
-    local _cache_path="${1:-}"
-
-    [[ -z "${_cache_path:-}" ]] && return 0
-
-    # Remove outdated cache files.
-
-    local _base_cache_path="${_cache_path%-*}"
-
-    local __suffix=
-    for   __suffix in "zsh" "v1"
-    do
-      if [[ -e "${_base_cache_path:?}-${__suffix:?}" ]]
-      then
-        rm -f  "${_base_cache_path:?}-${__suffix:?}"
-      fi
-    done
-
-    # Rebuild completion cache.
-
-    local _commands=
-    IFS=$'\n' _commands=($(nb subcommands))
-
-    local _notebooks=
-    IFS=$'\n' _notebooks=($(nb notebooks --names --no-color --unarchived))
-
-    local _completions=()
-    IFS=$'\n' _completions=(${_commands[@]})
-
-    local _commands_cached=
-    local _notebooks_cached=
-
-    if [[ -e "${_cache_path}"       ]]
-    then
-      local _counter=0
-
-      local               __line=
-      while IFS= read -r  __line
-      do
-        _counter=$((_counter+1))
-
-        if [[   "${_counter}" == 1  ]]
-        then
-          _commands_cached="${__line}"
-        elif [[ "${_counter}" == 2  ]]
-        then
-          _notebooks_cached="${__line}"
-        else
-          break
-        fi
-      done < "${_cache_path}"
-    fi
-
-    if [[ "${_commands_cached}"  != "${_commands[*]:-}"   ]] ||
-       [[ "${_notebooks_cached}" != "${_notebooks[*]:-}"  ]]
-    then
-      # Construct <notebook>:<subcommand> completions.
-      local __notebook=
-      for   __notebook in "${_notebooks[@]}"
-      do
-        local __command=
-        for   __command in "${_commands[@]}"
-        do
-          if [[ -n "${__notebook:-}"  ]] &&
-             [[ -n "${__command:-}"   ]]
-          then
-            _completions+=("${__notebook}:${__command}")
-          fi
-        done
-      done
-
-      local _directory_path=
-      _directory_path="$(dirname "${_cache_path}")"
-
-      mkdir -p "${_directory_path}"
-
-      if [[ -f "${_cache_path:?}" ]]
-      then
-        rm -f "${_cache_path:?}"
-      fi
-
-      touch "${_cache_path:?}"
-
-      {
-        (IFS=$' '; printf "%s\\n" "${_commands[*]}")
-        (IFS=$' '; printf "%s\\n" "${_notebooks[*]}")
-        printf "%s\\n" "${_completions[@]}"
-      } >> "${_cache_path}"
-    fi
-  }
-
-  local _nb_dir=
-  _nb_dir="$(nb env | grep 'NB_DIR' | cut -d = -f 2)"
-
-  if [[ -z "${_nb_dir:?}" ]] ||
-     [[ ! -e "${_nb_dir}" ]]
-  then
-    return 0
-  elif [[ -L "${_nb_dir}" ]]
-  then
-    if hash "realpath" 2>/dev/null
-    then
-      _nb_dir="$(realpath "${_nb_dir}")"
-    else
-      _nb_dir="$(readlink "${_nb_dir}")"
-    fi
-  fi
-
-  if [[ ! -d "${_nb_dir}" ]]
-  then
-    return 0
-  fi
-
-  local _cache_path="${_nb_dir:?}/.cache/nb-completion-cache-v2"
-  local _completions_cached=()
-
-  if [[ ! -e "${_cache_path}" ]]
-  then
-    _nb_cache_completions "${_cache_path}"
-  fi
-
-  if [[ -e "${_cache_path}"   ]]
-  then
-    local _counter=0
-
-    local               __line=
-    while IFS= read -r  __line
-    do
-      _counter=$((_counter+1))
-
-      if [[ "${_counter}" -gt 2 ]]
-      then
-        _completions_cached+=("${__line}")
-      fi
-    done < "${_cache_path}"
-
-    (_nb_cache_completions "${_cache_path}" &)
-  fi
-
-  if [[ "${?}" -eq 0            ]]
-  then
-    compadd -- "${_completions_cached[@]}"
-    return 0
-  else
-    return 1
-  fi
-}
-
-_nb_subcommands "$@"

docs/tmux-keybindings.md

@@ -31,7 +31,7 @@ bind-key    -T copy-mode    P                    send-keys -X toggle-position
 bind-key    -T copy-mode    R                    send-keys -X rectangle-toggle
 bind-key    -T copy-mode    T                    command-prompt -1 -p "(jump to backward)" { send-keys -X jump-to-backward "%%" }
 bind-key    -T copy-mode    X                    send-keys -X set-mark
-bind-key    -T copy-mode    Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
+bind-key    -T copy-mode    Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer -p"
 bind-key    -T copy-mode    f                    command-prompt -1 -p "(jump forward)" { send-keys -X jump-forward "%%" }
 bind-key    -T copy-mode    g                    command-prompt -p "(goto line)" { send-keys -X goto-line "%%" }
 bind-key    -T copy-mode    n                    send-keys -X search-again
@@ -75,7 +75,7 @@ bind-key    -T copy-mode    M-r                  send-keys -X middle-line
 bind-key    -T copy-mode    M-v                  send-keys -X page-up
 bind-key    -T copy-mode    M-w                  send-keys -X copy-pipe-and-cancel
 bind-key    -T copy-mode    M-x                  send-keys -X jump-to-mark
-bind-key    -T copy-mode    M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer"
+bind-key    -T copy-mode    M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer -p"
 bind-key    -T copy-mode    "M-{"                send-keys -X previous-paragraph
 bind-key    -T copy-mode    "M-}"                send-keys -X next-paragraph
 bind-key    -T copy-mode    M-Up                 send-keys -X halfpage-up
@@ -136,7 +136,7 @@ bind-key    -T copy-mode-vi T                    command-prompt -1 -p "(jump to
 bind-key    -T copy-mode-vi V                    send-keys -X select-line
 bind-key    -T copy-mode-vi W                    send-keys -X next-space
 bind-key    -T copy-mode-vi X                    send-keys -X set-mark
-bind-key    -T copy-mode-vi Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
+bind-key    -T copy-mode-vi Y                    send-keys -X copy-pipe-and-cancel "tmux paste-buffer -p"
 bind-key    -T copy-mode-vi ^                    send-keys -X back-to-indentation
 bind-key    -T copy-mode-vi b                    send-keys -X previous-word
 bind-key    -T copy-mode-vi e                    send-keys -X next-word-end
@@ -171,7 +171,7 @@ bind-key    -T copy-mode-vi Down                 send-keys -X cursor-down
 bind-key    -T copy-mode-vi Left                 send-keys -X cursor-left
 bind-key    -T copy-mode-vi Right                send-keys -X cursor-right
 bind-key    -T copy-mode-vi M-x                  send-keys -X jump-to-mark
-bind-key    -T copy-mode-vi M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer"
+bind-key    -T copy-mode-vi M-y                  send-keys -X copy-pipe-and-cancel "pbcopy; tmux paste-buffer -p"
 bind-key    -T copy-mode-vi C-Up                 send-keys -X scroll-up
 bind-key    -T copy-mode-vi C-Down               send-keys -X scroll-down
 bind-key    -T join-pane    \"                   run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-v'"
@@ -183,6 +183,7 @@ bind-key    -T join-pane    h                    run-shell "'/Users/ivuorinen/.c
 bind-key    -T join-pane    v                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-v'"
 bind-key    -T join-pane    |                    run-shell "'/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh' 'join-pane' '-b' '-h'"
 bind-key    -T prefix       C-Space              run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/promote_window.sh '#{session_name}' '#{window_id}' '#{window_name}' '#{pane_current_path}'"
+bind-key    -T prefix       Enter                run-shell -b "/Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/notify.sh false true"
 bind-key    -T prefix       C-n                  next-window
 bind-key    -T prefix       C-o                  rotate-window
 bind-key    -T prefix       C-p                  previous-window
@@ -191,7 +192,7 @@ bind-key    -T prefix       C-s                  run-shell /Users/ivuorinen/.con
 bind-key    -T prefix       C-z                  suspend-client
 bind-key    -T prefix       Escape               copy-mode
 bind-key    -T prefix       Space                next-layout
-bind-key    -T prefix       !                    break-pane
+bind-key    -T prefix       !                    split-window -h -c "#{pane_current_path}"
 bind-key    -T prefix       \"                   split-window -v -c "#{pane_current_path}"
 bind-key    -T prefix       \#                   list-buffers
 bind-key    -T prefix       \$                   command-prompt -I "#S" { rename-session "%%" }
@@ -226,7 +227,7 @@ bind-key    -T prefix       D                    choose-client -Z
 bind-key    -T prefix       E                    select-layout -E
 bind-key    -T prefix       I                    run-shell /Users/ivuorinen/.config/tmux/plugins/tpm/bindings/install_plugins
 bind-key    -T prefix       L                    switch-client -l
-bind-key    -T prefix       M                    select-pane -M
+bind-key    -T prefix       M                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/cancel.sh
 bind-key    -T prefix       N                    new-window
 bind-key    -T prefix       R                    run-shell " 			tmux source-file /Users/ivuorinen/.config/tmux/tmux.conf > /dev/null; 			tmux display-message 'Sourced /Users/ivuorinen/.config/tmux/tmux.conf!'"
 bind-key    -T prefix       S                    switch-client -l
@@ -252,7 +253,7 @@ bind-key    -T prefix       r                    source-file /Users/ivuorinen/.d
 bind-key    -T prefix       s                    choose-tree -Zs
 bind-key    -T prefix       t                    run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-sessionist/scripts/join_pane.sh 'join-pane' '-b'"
 bind-key    -T prefix       w                    choose-tree -Zw
-bind-key    -T prefix       x                    confirm-before -p "kill-pane #P? (y/n)" kill-pane
+bind-key    -T prefix       x                    run-shell "tmux split-window -l 10 \"/Users/ivuorinen/.config/tmux/plugins/tmux-1password/scripts/main.sh '#{pane_id}'\""
 bind-key    -T prefix       y                    run-shell -b /Users/ivuorinen/.config/tmux/plugins/tmux-yank/scripts/copy_line.sh
 bind-key    -T prefix       z                    resize-pane -Z
 bind-key    -T prefix       \{                   swap-pane -U
@@ -264,11 +265,13 @@ bind-key -r -T prefix       Up                   select-pane -U
 bind-key -r -T prefix       Down                 select-pane -D
 bind-key -r -T prefix       Left                 select-pane -L
 bind-key -r -T prefix       Right                select-pane -R
+bind-key    -T prefix       M-Enter              run-shell -b "/Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/notify.sh true true"
 bind-key    -T prefix       M-1                  select-layout even-horizontal
 bind-key    -T prefix       M-2                  select-layout even-vertical
 bind-key    -T prefix       M-3                  select-layout main-horizontal
 bind-key    -T prefix       M-4                  select-layout main-vertical
 bind-key    -T prefix       M-5                  select-layout tiled
+bind-key    -T prefix       M-m                  run-shell -b "/Users/ivuorinen/.config/tmux/plugins/tmux-notify/scripts/notify.sh true"
 bind-key    -T prefix       M-n                  next-window -a
 bind-key    -T prefix       M-o                  rotate-window -D
 bind-key    -T prefix       M-p                  previous-window -a
@@ -303,6 +306,7 @@ bind-key    -T root         WheelUpStatus        previous-window
 bind-key    -T root         WheelDownStatus      next-window
 bind-key    -T root         DoubleClick1Pane     select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -H ; send-keys -X select-word ; run-shell -d 0.3 ; send-keys -X copy-pipe-and-cancel }
 bind-key    -T root         TripleClick1Pane     select-pane -t = \; if-shell -F "#{||:#{pane_in_mode},#{mouse_any_flag}}" { send-keys -M } { copy-mode -H ; send-keys -X select-line ; run-shell -d 0.3 ; send-keys -X copy-pipe-and-cancel }
+bind-key    -T root         F12                  run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-suspend/scripts/suspend.sh \"\" \"   @mode_indicator_custom_prompt:: ---- ,   @mode_indicator_custom_mode_style::bg=brightblack\,fg=black, \""
 bind-key    -T root         M-H                  previous-window
 bind-key    -T root         M-L                  next-window
 bind-key    -T root         M-MouseDown3Pane     display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -t = -x M -y M "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z }
@@ -312,5 +316,6 @@ bind-key    -T root         M-Left               select-pane -L
 bind-key    -T root         M-Right              select-pane -R
 bind-key    -T root         S-Left               previous-window
 bind-key    -T root         S-Right              next-window
+bind-key    -T suspended    F12                  run-shell "/Users/ivuorinen/.config/tmux/plugins/tmux-suspend/scripts/resume.sh \"\""
 ```
 

hosts/v/config/git/config

@@ -1,6 +1,9 @@
 [include]
   path = ~/.dotfiles/config/git/shared
 
+[gpg]
+  format = ssh
+
 [user]
   name = Ismo Vuorinen
   email = ismo.vuorinen@vincit.fi

local/bin/dfm

@@ -175,6 +175,22 @@ function section_brew
   ! have brew && menu_section "$USAGE_PREFIX" "brew not available on this system"
 }
 
+function section_helpers
+{
+  USAGE_PREFIX="$SCRIPT helpers <command>"
+  MENU=(
+    "path:Show \$PATH dir by dir"
+  )
+
+  case "$1" in
+    path)
+      # shellcheck disable=2001
+      for i in $(echo "$PATH" | sed 's/:/ /g'); do echo "$i"; done;
+    ;;
+    *) menu_usage "$USAGE_PREFIX" "${MENU[@]}" ;;
+  esac
+}
+
 function section_docs
 {
   USAGE_PREFIX="$SCRIPT docs <command>"
@@ -323,6 +339,8 @@ function usage
   section_dotfiles
   echo ""
   section_docs
+  echo ""
+  section_helpers
 }
 
 # The main loop. first keyword after $0 triggers section, or help.
@@ -331,6 +349,7 @@ case "$1" in
   brew) section_brew "$2" ;;
   check) section_check "$2" ;;
   dotfiles) section_dotfiles "$2" ;;
+  helpers) section_helpers "$2" ;;
   docs) section_docs "$2" ;;
   tests) section_tests "$2" ;;
   *) usage && exit 0 ;;

local/bin/pushover

@@ -0,0 +1,150 @@
+#!/usr/bin/env sh
+#
+# Send Pushover messages from cli
+# Based on https://github.com/mrusme/dotfiles/blob/master/usr/local/bin/pushover
+#
+# Modified by Ismo Vuorinen <https://github.com/ivuorinen> 2023
+
+__pushover_usage()
+{
+  printf "pushover <options> <message>\n"
+  printf " -c <callback>\n"
+  printf " -d <device>\n"
+  printf " -D <timestamp>\n"
+  printf " -e <expire>\n"
+  printf " -p <priority>\n"
+  printf " -r <retry>\n"
+  printf " -t <title>\n"
+  printf " -T <TOKEN> (required if not in 'PUSHOVER_TOKEN' env)\n"
+  printf " -s <sound>\n"
+  printf " -u <url>\n"
+  printf " -U <USER> (required if not in 'PUSHOVER_USER' env)\n"
+  printf " -a <url_title>\n"
+  return 1
+}
+
+__pushover_opt_field()
+{
+  field=$1
+  shift
+  value="${*}"
+  if [ -n "${value}" ]; then
+    printf "%s \"%s=%s\"\n" "-F" "$field" "$value"
+  fi
+}
+
+__pushover_send_message()
+{
+  device="${1:-}"
+
+  curl_cmd="\"${CURL}\" -s -S \
+    ${CURL_OPTS} \
+    -F \"token=${TOKEN}\" \
+    -F \"user=${USER}\" \
+    -F \"message=${message}\" \
+    $(__pushover_opt_field device "${device}") \
+    $(__pushover_opt_field callback "${callback}") \
+    $(__pushover_opt_field timestamp "${timestamp}") \
+    $(__pushover_opt_field priority "${priority}") \
+    $(__pushover_opt_field retry "${retry}") \
+    $(__pushover_opt_field expire "${expire}") \
+    $(__pushover_opt_field title "${title}") \
+    $(__pushover_opt_field sound "${sound}") \
+    $(__pushover_opt_field url "${url}") \
+    $(__pushover_opt_field url_title "${url_title}") \
+    \"${PUSHOVER_URL}\""
+
+  response="$(eval "${curl_cmd}")"
+  printf "%s\n" "$response"
+  # TODO: Parse response
+  r="${?}"
+  if [ "${r}" -ne 0 ]; then
+    printf "%s: Failed to send message\n" "${0}" >&2
+  fi
+
+  return "${r}"
+}
+
+CURL="$(which curl)"
+PUSHOVER_URL="https://api.pushover.net/1/messages.json"
+TOKEN=$PUSHOVER_TOKEN
+USER=$PUSHOVER_USER
+CURL_OPTS=""
+devices="${devices} ${device}"
+optstring="c:d:D:e:f:p:r:t:T:s:u:U:a:h"
+
+OPTIND=1
+while getopts ${optstring} c; do
+  case ${c} in
+    c)
+      callback="${OPTARG}"
+      ;;
+    d)
+      devices="${devices} ${OPTARG}"
+      ;;
+    D)
+      timestamp="${OPTARG}"
+      ;;
+    e)
+      expire="${OPTARG}"
+      ;;
+    p)
+      priority="${OPTARG}"
+      ;;
+    r)
+      retry="${OPTARG}"
+      ;;
+    t)
+      title="${OPTARG}"
+      ;;
+    k)
+      TOKEN="${OPTARG}"
+      ;;
+    s)
+      sound="${OPTARG}"
+      ;;
+    u)
+      url="${OPTARG}"
+      ;;
+    U)
+      USER="${OPTARG}"
+      ;;
+    a)
+      url_title="${OPTARG}"
+      ;;
+
+    [h\?])
+      __pushover_usage
+      exit 1
+      ;;
+  esac
+done
+shift $((OPTIND - 1))
+
+if [ "$#" -lt 1 ]; then
+  __pushover_usage
+  exit 1
+fi
+message="$*"
+
+if [ ! -x "${CURL}" ]; then
+  printf "CURL is unset, empty, or does not point to curl executable.\n \
+    This script requires curl!\n" >&2
+  exit 1
+fi
+
+devices="$(printf "${devices}" | xargs -n1 | sort -u | uniq)\n"
+
+if [ -z "${devices}" ]; then
+  __pushover_send_message
+  r=${?}
+else
+  for device in ${devices}; do
+    __pushover_send_message "${device}"
+    r=${?}
+    if [ "${r}" -ne 0 ]; then
+      break
+    fi
+  done
+fi
+exit "${r}"

local/bin/x-sha256sum-matcher

@@ -14,7 +14,8 @@ file_2="$2"
 
 # return sha256sum for file
 # $1 - filename (string)
-get_sha256sum() {
+get_sha256sum()
+{
   sha256sum "$1" | head -c 64
 }
 
@@ -22,11 +23,13 @@ get_sha256sum() {
   echo "Usage: $0 file1.sh file2.sh" && exit 1
 }
 
-msg() {
+msg()
+{
   [[ "$VERBOSE" -eq 1 ]] && echo "$1"
 }
 
-error() {
+error()
+{
   msg "(!) ERROR: $1" && exit 1
 }
 
@@ -45,6 +48,5 @@ if [ "$file_1_hash" != "$file_2_hash" ]; then
   error "Files do not match"
 else
   msg "(*) Success: Files do match"
-  exit 0;
+  exit 0
 fi
-

local/bin/x-welcome-banner

@@ -18,7 +18,7 @@ RESET='\033[0m'
 # Print time-based personalized message, using figlet & lolcat if availible
 function welcome_greeting () {
   h=$(date +%H)
-  if [ "$h" -lt 04 ] || [[ $h -gt 22 ]];
+  if [ "$h" -lt 04 ] || [ "$h" -gt 22 ];
     then greeting="Good Night"
   elif [ "$h" -lt 12 ];
     then greeting="Good morning"
@@ -41,7 +41,7 @@ function welcome_greeting () {
 function welcome_sysinfo () {
   if hash neofetch 2>/dev/null; then
     neofetch --shell_version off \
-      --disable kernel distro shell resolution de wm wm_theme theme icons terminal \
+      --disable kernel distro shell resolution cpu gpu de wm wm_theme theme icons terminal \
       --backend off \
       --colors 4 8 4 4 8 6 \
       --color_blocks off \

scripts/install-cheat-tldr.sh

@@ -51,14 +51,15 @@ for d in "$TLDR_TEMP_DIR"/pages/*; do
     TLDR_FILE="$SECTION_DIR/${FILENAME}"
     # echo "-> dest: $TLDR_FILE"
 
-    replacable "$FILE" "$TLDR_FILE"
-    override=$?
-    if [ "$override" -ne 1 ]; then
-      cp "$FILE" "$TLDR_FILE" && msg_run "Updated: $TLDR_FILE"
+    # Update the original file for making the replacable value comparable
+    if [ -f "$FILE" ] && [ '---' != "$(head -1 < "$FILE")" ]; then
+      echo -e "---\n$TLDR_SYNTAX\n$TLDR_TAGS\n$TLDR_SOURCE\n---\n$(cat "$FILE")" > "$FILE"
     fi
 
-    if [ -f "$TLDR_FILE" ] && [ '---' != "$(head -1 < "$TLDR_FILE")" ]; then
-      echo -e "---\n$TLDR_SYNTAX\n$TLDR_TAGS\n$TLDR_SOURCE\n---\n$(cat "$TLDR_FILE")" > "$TLDR_FILE"
+    replacable "$FILE" "$TLDR_FILE"
+    override=$?
+    if [ "$override" -ne 0 ]; then
+      cp "$FILE" "$TLDR_FILE" && msg_run "Updated: $TLDR_FILE"
     fi
 
   done

scripts/shared.sh

@@ -2,7 +2,9 @@
 #
 # Shared bash functions and helpers
 # that can be sourced to other scripts.
-#
+
+# Helper env variables. Use like this: VERBOSE=1 ./script.sh
+: "${VERBOSE:=0}"
 
 # -- Colors -- #
 CLR_RED="\033[1;31m"
@@ -202,6 +204,19 @@ function have
   command -v "$1" >&/dev/null
 }
 
+# shorthand for checking if brew package is installed
+# usage: have_brew php && php -v
+function have_brew
+{
+  ! have brew && return 125
+
+  if brew list "$1" &> /dev/null; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 # Remove directory from the PATH variable
 # usage: path_remove ~/.local/bin
 function path_remove
@@ -249,23 +264,33 @@ function replacable()
   FILE1="$1"
   FILE2="$2"
 
-  [[ ! -r "$FILE1" ]] && { msg_err "File 1 ($FILE1) does not exist" && return 1; }
-  [[ ! -r "$FILE2" ]] && { msg_err "File 2 ($FILE2) does not exist" && return 1; }
+  [[ ! -r "$FILE1" ]] && {
+    [[ $VERBOSE -eq 1 ]] && msg_err "File 1 ($FILE1) does not exist"
+    return 0
+  }
+  [[ ! -r "$FILE2" ]] && {
+    [[ $VERBOSE -eq 1 ]] && msg_err "File 2 ($FILE2) does not exist, replacable"
+    return 1
+  }
 
   FILE1_HASH=$(get_sha256sum "$FILE1")
   FILE2_HASH=$(get_sha256sum "$FILE2")
 
   [[ $FILE1_HASH = "" ]] && {
-    msg_err "Could not get hash for file 1 ($FILE1)" && return 1;
+    [[ $VERBOSE -eq 1 ]] && msg_err "Could not get hash for file 1 ($FILE1)"
+    return 0
   }
   [[ $FILE2_HASH = "" ]] && {
-    msg_err "Could not get hash for file 2 ($FILE2)" && return 1;
+    [[ $VERBOSE -eq 1 ]] && msg_err "Could not get hash for file 2 ($FILE2), replacable"
+    return 1
   }
 
   [[ "$FILE1_HASH" == "$FILE2_HASH" ]] && {
-    msg_ok "Files match, not replacable" && return 0;
+    [[ $VERBOSE -eq 1 ]] && msg_ok "Files match, not replacable: $FILE1"
+    return 0
   }
 
-  return 1;
-}
+  [[ $VERBOSE -eq 1 ]] && msg_warn "Files do not match ($FILE1_HASH != $FILE2_HASH), replacable"
 
+  return 1
+}

ssh/config

@@ -1,11 +1,9 @@
-Host github.com
-  User git
-
-Host lakka
-  User viir
-  HostName lakka.kapsi.fi
-  IdentityFile ~/.ssh/id_rsa
+Include shared.d/*
+Include local.d/*
 
 Host *
 #  IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
 
+# Fig ssh integration. Keep at the bottom of this file.
+Match all
+  Include ~/.fig/ssh

ssh/shared.d/github

@@ -0,0 +1,3 @@
+Host github.com
+  User git
+

ssh/shared.d/lakka

@@ -0,0 +1,5 @@
+Host lakka
+  User viir
+  HostName lakka.kapsi.fi
+  IdentityFile ~/.ssh/id_rsa
+

tools/dotbot-defaults.yaml

@@ -4,6 +4,6 @@
     link:
       create: true
       relink: true
-      exclude: [ "*.md", "*renovate*", "LICENSE" ]
+      exclude: ["*.md", "*renovate*", "LICENSE"]
     shell:
       stdout: true