chore(config): tweak oh-my-posh config

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.editorconfig

@@ -19,7 +19,7 @@ indent_size = 1
 indent_size = 1
 indent_style = tab
 
-[{local/bin/*,**/*.sh,**/zshrc,config/*}]
+[{local/bin/*,**/*.sh,**/zshrc,config/*,scripts/*}]
 shell_variant      = bash # --language-variant
 binary_next_line   = true
 switch_case_indent = true # --case-indent

.github/workflows/changelog.yml

@@ -1,3 +1,4 @@
+---
 name: Debug Changelog # Workflow name displayed on GitHub
 on:
   workflow_dispatch: # Trigger manually

.github/workflows/linters.yml

@@ -1,3 +1,4 @@
+---
 name: reviewdog
 on: [push]
 jobs:

.github/workflows/new-release.yml

@@ -1,13 +1,14 @@
+---
 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: self-hosted
+    permissions:
+      contents: write
     outputs:
       created: ${{ steps.daily-version.outputs.created }}
       version: ${{ steps.daily-version.outputs.version }}

.github/workflows/semantic-pr.yml

@@ -1,3 +1,4 @@
+---
 name: Semantic PR
 
 on:

.github/workflows/update-submodules.yml

@@ -1,13 +1,14 @@
+---
 name: Update submodules
 on:
   schedule: [{ cron: 0 3 * * * }]
   workflow_dispatch:
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
 jobs:
   update-submodules:
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
     runs-on: self-hosted
     steps:
       - name: Checkout repository

.python-version

@@ -1 +1 @@
-3.12.5
+3.12.6

base/tool-versions

@@ -1,30 +1,30 @@
+asdf-plugin-manager 1.3.1
+nodejs 22.8.0
+golang 1.23.1
+python 3.12.6
+ruby 3.3.4
+rust 1.81.0
+direnv 2.34.0
+eza 0.19.3
+fd 10.2.0
 1password-cli 2.30.0
 age 1.2.0
-asdf-plugin-manager 1.3.1
 bottom 0.10.2
-direnv 2.34.0
 dotenv-linter 3.3.0
 editorconfig-checker 2.8.0
-eza 0.19.0
+github-cli 2.56.0
-fd 10.2.0
-github-cli 2.55.0
-golang 1.23.0
 hadolint 2.12.0
-kubectl 1.31.0
+kubectl 1.31.1
-lazygit 0.43.1
-markdownlint-cli2 0.13.0
-nodejs 22.7.0
 pipx 1.7.1
 pre-commit 3.8.0
-python 3.12.5
+ripgrep 14.1.1
-ripgrep 14.1.0
-ruby 3.3.4
-rust 1.80.1
-semgrep system
 shellcheck 0.10.0
 shfmt 3.9.0
-terragrunt 0.67.0
+terragrunt 0.67.5
 tf-summarize 0.3.10
-vault 1.17.4+ent
 yamllint 1.35.1
 yq 4.44.3
+bats 1.11.0
+gitleaks 8.18.4
+delta 0.18.1
+lazygit 0.44.0

config/alias

@@ -122,6 +122,7 @@ X_ALIAS_FILES=(
   "$HOME/.config/alias-$(hostname)-secret"
 )
 for aliasFile in "${X_ALIAS_FILES[@]}"; do
+  # shellcheck source=$HOME/.config/alias-secret
   [ -f "$aliasFile" ] && source "$aliasFile" && msg "Sourced $aliasFile"
 done
 unset X_ALIAS_FILES

config/asdf-direnv/zshrc

@@ -0,0 +1,3 @@
+### Do not edit. This was autogenerated by 'asdf direnv setup' ###
+export ASDF_DIRENV_BIN="$(asdf where direnv)/bin/direnv"
+eval "$($ASDF_DIRENV_BIN hook zsh)"

config/asdf/plugin-versions

@@ -12,7 +12,6 @@ golang                https://github.com/asdf-community/asdf-golang.git
 hadolint              https://github.com/devlincashman/asdf-hadolint.git                   335e230
 kubectl               https://github.com/asdf-community/asdf-kubectl.git                   cbe6df4
 lazygit               https://github.com/nklmilojevic/asdf-lazygit.git                     78e04f1
-markdownlint-cli2     https://github.com/paulo-ferraz-oliveira/asdf-markdownlint-cli2.git  6acd080
 nodejs                https://github.com/asdf-vm/asdf-nodejs.git                           c5b7c40
 pipx                  https://github.com/yozachar/asdf-pipx.git                            31db618
 pre-commit            https://github.com/jonathanmorley/asdf-pre-commit.git                26bfc42
@@ -20,13 +19,9 @@ python                https://github.com/asdf-community/asdf-python
 ripgrep               https://gitlab.com/wt0f/asdf-ripgrep.git                             e836665
 ruby                  https://github.com/asdf-vm/asdf-ruby.git                             27f78c9
 rust                  https://github.com/code-lever/asdf-rust.git                          95acf4f
-semgrep               https://github.com/brentjanderson/asdf-semgrep.git                   13ff78b
 shellcheck            https://github.com/luizm/asdf-shellcheck.git                         780d78d
 shfmt                 https://github.com/luizm/asdf-shfmt.git                              a42c5ff
-terraform-ls          https://github.com/asdf-community/asdf-hashicorp.git                 f1602b6
-terraform-lsp         https://github.com/bartlomiejdanek/asdf-terraform-lsp.git            bba7106
 terragrunt            https://github.com/ohmer/asdf-terragrunt.git                         4a6651a
 tf-summarize          https://github.com/adamcrews/asdf-tf-summarize.git                   880ad26
-vault                 https://github.com/asdf-community/asdf-hashicorp.git                 f1602b6
 yamllint              https://github.com/ericcornelissen/asdf-yamllint.git                 2f4fd4c
 yq                    https://github.com/sudermanjr/asdf-yq.git                            772992f

config/exports

@@ -448,6 +448,7 @@ msg "Setting up Rust/Cargo configuration"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export PATH="$CARGO_HOME/bin:$PATH"
+export RUST_WITHOUT=rust-docs
 
 # screen
 # https://www.gnu.org/software/screen/manual/screen.html

config/git/shared

@@ -17,11 +17,12 @@
   llog = log --pretty=fuller
   logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
   nah = !git reset --hard && git clean -df
+  recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
   reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
   reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
-  recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
   rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
   tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
+  undo = reset --soft HEAD^
   undo-commit = reset HEAD~ --soft
 
 [filter "lfs"]
@@ -30,15 +31,6 @@
   process = git-lfs filter-process
   required = true
 
-[diff]
-  tool = difftastic
-
-[difftool]
-  prompt = false
-
-[difftool "difftastic"]
-  cmd = difft "$LOCAL" "$REMOTE"
-
 [color]
   ui = true
   diff = auto

config/nvim/lazyvim.json

@@ -32,4 +32,4 @@
     "NEWS.md": "6077"
   },
   "version": 6
-}
+}

config/nvim/lua/config/keymaps.lua

@@ -6,17 +6,11 @@ local wk = require("which-key")
 -- ╭──────────────────────────────────────────────────────────╮
 -- │                       Comment box                        │
 -- ╰──────────────────────────────────────────────────────────╯
-wk.register({
+wk.add({
-  ["<Leader>"] = {
+  { "<Leader>bc", group = "□ Comment box" },
-    b = {
+  { "<Leader>bcb", "<Cmd>CBccbox<CR>", desc = "Box Title" },
-      c = {
+  { "<Leader>bcd", "<Cmd>CBd<CR>", desc = "Remove a box" },
-        name = "□ Comment boxes",
+  { "<Leader>bcl", "<Cmd>CBline<CR>", desc = "Simple Line" },
-        b = { "<Cmd>CBccbox<CR>", "Box Title" },
+  { "<Leader>bcm", "<Cmd>CBllbox14<CR>", desc = "Marked" },
-        t = { "<Cmd>CBllline<CR>", "Titled Line" },
+  { "<Leader>bct", "<Cmd>CBllline<CR>", desc = "Titled Line" },
-        l = { "<Cmd>CBline<CR>", "Simple Line" },
-        m = { "<Cmd>CBllbox14<CR>", "Marked" },
-        d = { "<Cmd>CBd<CR>", "Remove a box" },
-      },
-    },
-  },
 })

config/nvm/default-packages

@@ -1,7 +0,0 @@
-blade-formatter
-corepack
-editorconfig-checker
-github-release-notes
-neovim
-stylelint-lsp
-

config/omp/own.toml

@@ -29,13 +29,15 @@ type = "prompt"
     style = "mixed"
 
     [blocks.segments.mapped_locations]
-    "~/Code/*" = ""
+    "~/Code/*" = ""
+    "~/Code/ivuorinen/" = ""
 
   [[blocks.segments]]
   type = "git"
   style = "plain"
   foreground = "lightGreen"
-  template = "{{ .UpstreamIcon }}{{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uF046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}){{ end }}"
+  # template = "{{ .UpstreamIcon }}{{ .HEAD }} {{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uF046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}){{ end }}"
+  template = "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}"
 
     [blocks.segments.properties]
     fetch_status = true

local/bin/dfm

@@ -161,7 +161,7 @@ section_install()
       ;;
     asdf)
       msg "Installing asdf..."
-      bash "$DOTFILES/scripts/install-asdf.sh" \
+      bash "$DOTFILES/scripts/install-asdf.sh both" \
         && msg_yay "asdf installed!"
       ;;
     cargo)

local/bin/x-term-colors

@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+#
+#   This file echoes a bunch of 24-bit color codes
+#   to the terminal to demonstrate its functionality.
+#   The foreground escape sequence is ^[38;2;<r>;<g>;<b>m
+#   The background escape sequence is ^[48;2;<r>;<g>;<b>m
+#   <r> <g> <b> range from 0 to 255 inclusive.
+#   The escape sequence ^[0m returns output to default
+
+setBackgroundColor()
+{
+    echo -en "\x1b[48;2;$1;$2;$3""m"
+}
+
+resetOutput()
+{
+    echo -en "\x1b[0m\n"
+}
+
+# Gives a color $1/255 % along HSV
+# Who knows what happens when $1 is outside 0-255
+# Echoes "$red $green $blue" where
+# $red $green and $blue are integers
+# ranging between 0 and 255 inclusive
+rainbowColor()
+{
+    let h=$1/43
+    let f=$1-43*$h
+    let t=$f*255/43
+    let q=255-t
+
+    if [ $h -eq 0 ]
+    then
+        echo "255 $t 0"
+    elif [ $h -eq 1 ]
+    then
+        echo "$q 255 0"
+    elif [ $h -eq 2 ]
+    then
+        echo "0 255 $t"
+    elif [ $h -eq 3 ]
+    then
+        echo "0 $q 255"
+    elif [ $h -eq 4 ]
+    then
+        echo "$t 0 255"
+    elif [ $h -eq 5 ]
+    then
+        echo "255 0 $q"
+    else
+        # execution should never reach here
+        echo "0 0 0"
+    fi
+}
+
+for i in $(seq 0 127); do
+    setBackgroundColor "$i" 0 0
+    echo -en " "
+done
+resetOutput
+for i in $(seq 255 128); do
+    setBackgroundColor "$i" 0 0
+    echo -en " "
+done
+resetOutput
+
+for i in $(seq 0 127); do
+    setBackgroundColor 0 "$i" 0
+    echo -n " "
+done
+resetOutput
+for i in $(seq 255 128); do
+    setBackgroundColor 0 "$i" 0
+    echo -n " "
+done
+resetOutput
+
+for i in $(seq 0 127); do
+    setBackgroundColor 0 0 "$i"
+    echo -n " "
+done
+resetOutput
+for i in $(seq 255 128); do
+    setBackgroundColor 0 0 "$i"
+    echo -n " "
+done
+resetOutput
+
+for i in $(seq 0 127); do
+    setBackgroundColor $(rainbowColor "$i")
+    echo -n " "
+done
+resetOutput
+for i in $(seq 255 128); do
+    setBackgroundColor $(rainbowColor "$i")
+    echo -n " "
+done
+resetOutput
+

scripts/install-asdf.sh

@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 #
-# Install asdf
+# Install asdf and plugins I use
+#
+# It also updates asdf and the plugins, and then reshim asdf.
+#
+# Usage: ./install-asdf.sh [both|install|add_plugins]
+# Author: Ismo Vuorinen <https://github.com/ivuorinen>
+# License: MIT
+#
 source "${DOTFILES}/config/shared.sh"
 
 export ASDF_DIR="${XDG_BIN_HOME}/asdf"
@@ -40,19 +47,16 @@ install_asdf_plugins()
     "hadolint:github.com/devlincashman/asdf-hadolint.git"
     "kubectl:github.com/asdf-community/asdf-kubectl.git"
     "lazygit:github.com/nklmilojevic/asdf-lazygit.git"
-    "markdownlint-cli2:github.com/paulo-ferraz-oliveira/asdf-markdownlint-cli2.git"
     "nodejs:github.com/asdf-vm/asdf-nodejs.git"
     "pipx:github.com/yozachar/asdf-pipx.git"
     "pre-commit:github.com/jonathanmorley/asdf-pre-commit.git"
     "python:github.com/asdf-community/asdf-python.git"
     "ripgrep:gitlab.com/wt0f/asdf-ripgrep.git"
     "rust:github.com/code-lever/asdf-rust.git"
-    "semgrep:github.com/brentjanderson/asdf-semgrep.git"
     "shellcheck:github.com/luizm/asdf-shellcheck.git"
     "shfmt:github.com/luizm/asdf-shfmt.git"
     "terragrunt:github.com/ohmer/asdf-terragrunt.git"
     "tf-summarize:github.com/adamcrews/asdf-tf-summarize.git"
-    "vault:github.com/asdf-community/asdf-hashicorp.git"
     "yamllint:github.com/ericcornelissen/asdf-yamllint.git"
     "yq:github.com/sudermanjr/asdf-yq.git"
   )
@@ -83,13 +87,18 @@ reshim()
 # create usage function
 usage()
 {
-  echo "Usage: $0 [install|add_plugins]"
+  echo "Usage: $0 [both|install|add_plugins]"
   exit 1
 }
 
 main()
 {
   case $1 in
+    "both")
+      install_asdf_plugins
+      update_asdf
+      reshim
+      ;;
     "install")
       update_asdf
       reshim

scripts/install-cargo-packages.sh

@@ -2,6 +2,10 @@
 # Install cargo/rust packages.
 #
 # shellcheck source=shared.sh
+
+echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+exit 0
+
 eval "$HOME/.dotfiles/config/shared.sh"
 
 msg "Starting to install rust/cargo packages"

scripts/install-go-packages.sh

@@ -2,6 +2,10 @@
 # Install Go packages
 #
 # shellcheck source=shared.sh
+
+echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+exit 0
+
 eval "$DOTFILES/config/shared.sh"
 
 # Enable verbosity with VERBOSE=1

scripts/install-npm-packages.sh

@@ -2,6 +2,10 @@
 # Install npm packages globally.
 #
 # shellcheck source=shared.sh
+
+echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+exit 0
+
 eval "$DOTFILES/config/shared.sh"
 
 # Enable verbosity with VERBOSE=1

scripts/install-pip-packages.sh

@@ -2,6 +2,10 @@
 # Install python/pip packages.
 #
 # shellcheck source=shared.sh
+
+echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+exit 0
+
 source "${DOTFILES}/config/shared.sh"
 
 # Enable verbosity with VERBOSE=1