merge main into docker branch for new neovim and bash updates

.config/bash/alias.sh

@@ -7,8 +7,6 @@ if [[ $(uname) == *"Darwin"* ]]; then
     # Always use GNU sed
     alias sed='gsed'
 else
-    # wezterm requires this if it's installed via flatpak
-    # alias wezterm='flatpak run org.wezfurlong.wezterm'
     # freetube only seems to work through flatpak on debian
     alias freetube="flatpak run io.freetubeapp.FreeTube"
     # lutris works better through flatpak
@@ -32,8 +30,9 @@ alias tere='tree'
 # can't spell docker
 alias docekr='docker'
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Python 🐍 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
 # can't spell python
-alias pip="pip3.11"
+alias pip="pip$PYTHON_VERSION"
 alias pthyon="python$PYTHON_VERSION"
 alias ptyhon="python$PYTHON_VERSION"
 alias pythong="python$PYTHON_VERSION"
@@ -42,6 +41,9 @@ alias python="python$PYTHON_VERSION"
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ General ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
 
+# allow setting wezterm tab title more easily
+alias tab='wezterm cli set-tab-title'
+
 # makes wget XDG compliant (this goes to ~/.local/share/wget/wget-hsts)
 mkdir -p $XDG_DATA_HOME/wget/wget-hsts
 alias wget='wget --hsts-file="$XDG_DATA_HOME/wget/wget-hsts"'

.config/bash/completion.sh

@@ -47,3 +47,341 @@ fi
 # remembers directories overtime and helps with auto-completion
 # I never use this though...
 # eval "$(jump shell bash)"
+# bash completion V2 for limactl                              -*- shell-script -*-
+
+__limactl_debug()
+{
+    if [[ -n ${BASH_COMP_DEBUG_FILE-} ]]; then
+        echo "$*" >> "${BASH_COMP_DEBUG_FILE}"
+    fi
+}
+
+# Macs have bash3 for which the bash-completion package doesn't include
+# _init_completion. This is a minimal version of that function.
+__limactl_init_completion()
+{
+    COMPREPLY=()
+    _get_comp_words_by_ref "$@" cur prev words cword
+}
+
+# This function calls the limactl program to obtain the completion
+# results and the directive.  It fills the 'out' and 'directive' vars.
+__limactl_get_completion_results() {
+    local requestComp lastParam lastChar args
+
+    # Prepare the command to request completions for the program.
+    # Calling ${words[0]} instead of directly limactl allows to handle aliases
+    args=("${words[@]:1}")
+    requestComp="${words[0]} __complete ${args[*]}"
+
+    lastParam=${words[$((${#words[@]}-1))]}
+    lastChar=${lastParam:$((${#lastParam}-1)):1}
+    __limactl_debug "lastParam ${lastParam}, lastChar ${lastChar}"
+
+    if [[ -z ${cur} && ${lastChar} != = ]]; then
+        # If the last parameter is complete (there is a space following it)
+        # We add an extra empty parameter so we can indicate this to the go method.
+        __limactl_debug "Adding extra empty parameter"
+        requestComp="${requestComp} ''"
+    fi
+
+    # When completing a flag with an = (e.g., limactl -n=<TAB>)
+    # bash focuses on the part after the =, so we need to remove
+    # the flag part from $cur
+    if [[ ${cur} == -*=* ]]; then
+        cur="${cur#*=}"
+    fi
+
+    __limactl_debug "Calling ${requestComp}"
+    # Use eval to handle any environment variables and such
+    out=$(eval "${requestComp}" 2>/dev/null)
+
+    # Extract the directive integer at the very end of the output following a colon (:)
+    directive=${out##*:}
+    # Remove the directive
+    out=${out%:*}
+    if [[ ${directive} == "${out}" ]]; then
+        # There is not directive specified
+        directive=0
+    fi
+    __limactl_debug "The completion directive is: ${directive}"
+    __limactl_debug "The completions are: ${out}"
+}
+
+__limactl_process_completion_results() {
+    local shellCompDirectiveError=1
+    local shellCompDirectiveNoSpace=2
+    local shellCompDirectiveNoFileComp=4
+    local shellCompDirectiveFilterFileExt=8
+    local shellCompDirectiveFilterDirs=16
+    local shellCompDirectiveKeepOrder=32
+
+    if (((directive & shellCompDirectiveError) != 0)); then
+        # Error code.  No completion.
+        __limactl_debug "Received error from custom completion go code"
+        return
+    else
+        if (((directive & shellCompDirectiveNoSpace) != 0)); then
+            if [[ $(type -t compopt) == builtin ]]; then
+                __limactl_debug "Activating no space"
+                compopt -o nospace
+            else
+                __limactl_debug "No space directive not supported in this version of bash"
+            fi
+        fi
+        if (((directive & shellCompDirectiveKeepOrder) != 0)); then
+            if [[ $(type -t compopt) == builtin ]]; then
+                # no sort isn't supported for bash less than < 4.4
+                if [[ ${BASH_VERSINFO[0]} -lt 4 || ( ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -lt 4 ) ]]; then
+                    __limactl_debug "No sort directive not supported in this version of bash"
+                else
+                    __limactl_debug "Activating keep order"
+                    compopt -o nosort
+                fi
+            else
+                __limactl_debug "No sort directive not supported in this version of bash"
+            fi
+        fi
+        if (((directive & shellCompDirectiveNoFileComp) != 0)); then
+            if [[ $(type -t compopt) == builtin ]]; then
+                __limactl_debug "Activating no file completion"
+                compopt +o default
+            else
+                __limactl_debug "No file completion directive not supported in this version of bash"
+            fi
+        fi
+    fi
+
+    # Separate activeHelp from normal completions
+    local completions=()
+    local activeHelp=()
+    __limactl_extract_activeHelp
+
+    if (((directive & shellCompDirectiveFilterFileExt) != 0)); then
+        # File extension filtering
+        local fullFilter filter filteringCmd
+
+        # Do not use quotes around the $completions variable or else newline
+        # characters will be kept.
+        for filter in ${completions[*]}; do
+            fullFilter+="$filter|"
+        done
+
+        filteringCmd="_filedir $fullFilter"
+        __limactl_debug "File filtering command: $filteringCmd"
+        $filteringCmd
+    elif (((directive & shellCompDirectiveFilterDirs) != 0)); then
+        # File completion for directories only
+
+        local subdir
+        subdir=${completions[0]}
+        if [[ -n $subdir ]]; then
+            __limactl_debug "Listing directories in $subdir"
+            pushd "$subdir" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1 || return
+        else
+            __limactl_debug "Listing directories in ."
+            _filedir -d
+        fi
+    else
+        __limactl_handle_completion_types
+    fi
+
+    __limactl_handle_special_char "$cur" :
+    __limactl_handle_special_char "$cur" =
+
+    # Print the activeHelp statements before we finish
+    if ((${#activeHelp[*]} != 0)); then
+        printf "\n";
+        printf "%s\n" "${activeHelp[@]}"
+        printf "\n"
+
+        # The prompt format is only available from bash 4.4.
+        # We test if it is available before using it.
+        if (x=${PS1@P}) 2> /dev/null; then
+            printf "%s" "${PS1@P}${COMP_LINE[@]}"
+        else
+            # Can't print the prompt.  Just print the
+            # text the user had typed, it is workable enough.
+            printf "%s" "${COMP_LINE[@]}"
+        fi
+    fi
+}
+
+# Separate activeHelp lines from real completions.
+# Fills the $activeHelp and $completions arrays.
+__limactl_extract_activeHelp() {
+    local activeHelpMarker="_activeHelp_ "
+    local endIndex=${#activeHelpMarker}
+
+    while IFS='' read -r comp; do
+        if [[ ${comp:0:endIndex} == $activeHelpMarker ]]; then
+            comp=${comp:endIndex}
+            __limactl_debug "ActiveHelp found: $comp"
+            if [[ -n $comp ]]; then
+                activeHelp+=("$comp")
+            fi
+        else
+            # Not an activeHelp line but a normal completion
+            completions+=("$comp")
+        fi
+    done <<<"${out}"
+}
+
+__limactl_handle_completion_types() {
+    __limactl_debug "__limactl_handle_completion_types: COMP_TYPE is $COMP_TYPE"
+
+    case $COMP_TYPE in
+    37|42)
+        # Type: menu-complete/menu-complete-backward and insert-completions
+        # If the user requested inserting one completion at a time, or all
+        # completions at once on the command-line we must remove the descriptions.
+        # https://github.com/spf13/cobra/issues/1508
+        local tab=$'\t' comp
+        while IFS='' read -r comp; do
+            [[ -z $comp ]] && continue
+            # Strip any description
+            comp=${comp%%$tab*}
+            # Only consider the completions that match
+            if [[ $comp == "$cur"* ]]; then
+                COMPREPLY+=("$comp")
+            fi
+        done < <(printf "%s\n" "${completions[@]}")
+        ;;
+
+    *)
+        # Type: complete (normal completion)
+        __limactl_handle_standard_completion_case
+        ;;
+    esac
+}
+
+__limactl_handle_standard_completion_case() {
+    local tab=$'\t' comp
+
+    # Short circuit to optimize if we don't have descriptions
+    if [[ "${completions[*]}" != *$tab* ]]; then
+        IFS=$'\n' read -ra COMPREPLY -d '' < <(compgen -W "${completions[*]}" -- "$cur")
+        return 0
+    fi
+
+    local longest=0
+    local compline
+    # Look for the longest completion so that we can format things nicely
+    while IFS='' read -r compline; do
+        [[ -z $compline ]] && continue
+        # Strip any description before checking the length
+        comp=${compline%%$tab*}
+        # Only consider the completions that match
+        [[ $comp == "$cur"* ]] || continue
+        COMPREPLY+=("$compline")
+        if ((${#comp}>longest)); then
+            longest=${#comp}
+        fi
+    done < <(printf "%s\n" "${completions[@]}")
+
+    # If there is a single completion left, remove the description text
+    if ((${#COMPREPLY[*]} == 1)); then
+        __limactl_debug "COMPREPLY[0]: ${COMPREPLY[0]}"
+        comp="${COMPREPLY[0]%%$tab*}"
+        __limactl_debug "Removed description from single completion, which is now: ${comp}"
+        COMPREPLY[0]=$comp
+    else # Format the descriptions
+        __limactl_format_comp_descriptions $longest
+    fi
+}
+
+__limactl_handle_special_char()
+{
+    local comp="$1"
+    local char=$2
+    if [[ "$comp" == *${char}* && "$COMP_WORDBREAKS" == *${char}* ]]; then
+        local word=${comp%"${comp##*${char}}"}
+        local idx=${#COMPREPLY[*]}
+        while ((--idx >= 0)); do
+            COMPREPLY[idx]=${COMPREPLY[idx]#"$word"}
+        done
+    fi
+}
+
+__limactl_format_comp_descriptions()
+{
+    local tab=$'\t'
+    local comp desc maxdesclength
+    local longest=$1
+
+    local i ci
+    for ci in ${!COMPREPLY[*]}; do
+        comp=${COMPREPLY[ci]}
+        # Properly format the description string which follows a tab character if there is one
+        if [[ "$comp" == *$tab* ]]; then
+            __limactl_debug "Original comp: $comp"
+            desc=${comp#*$tab}
+            comp=${comp%%$tab*}
+
+            # $COLUMNS stores the current shell width.
+            # Remove an extra 4 because we add 2 spaces and 2 parentheses.
+            maxdesclength=$(( COLUMNS - longest - 4 ))
+
+            # Make sure we can fit a description of at least 8 characters
+            # if we are to align the descriptions.
+            if ((maxdesclength > 8)); then
+                # Add the proper number of spaces to align the descriptions
+                for ((i = ${#comp} ; i < longest ; i++)); do
+                    comp+=" "
+                done
+            else
+                # Don't pad the descriptions so we can fit more text after the completion
+                maxdesclength=$(( COLUMNS - ${#comp} - 4 ))
+            fi
+
+            # If there is enough space for any description text,
+            # truncate the descriptions that are too long for the shell width
+            if ((maxdesclength > 0)); then
+                if ((${#desc} > maxdesclength)); then
+                    desc=${desc:0:$(( maxdesclength - 1 ))}
+                    desc+="…"
+                fi
+                comp+="  ($desc)"
+            fi
+            COMPREPLY[ci]=$comp
+            __limactl_debug "Final comp: $comp"
+        fi
+    done
+}
+
+__start_limactl()
+{
+    local cur prev words cword split
+
+    COMPREPLY=()
+
+    # Call _init_completion from the bash-completion package
+    # to prepare the arguments properly
+    if declare -F _init_completion >/dev/null 2>&1; then
+        _init_completion -n =: || return
+    else
+        __limactl_init_completion -n =: || return
+    fi
+
+    __limactl_debug
+    __limactl_debug "========= starting completion logic =========="
+    __limactl_debug "cur is ${cur}, words[*] is ${words[*]}, #words[@] is ${#words[@]}, cword is $cword"
+
+    # The user could have moved the cursor backwards on the command-line.
+    # We need to trigger completion from the $cword location, so we need
+    # to truncate the command-line ($words) up to the $cword location.
+    words=("${words[@]:0:$cword+1}")
+    __limactl_debug "Truncated words[*]: ${words[*]},"
+
+    local out directive
+    __limactl_get_completion_results
+    __limactl_process_completion_results
+}
+
+if [[ $(type -t compopt) = "builtin" ]]; then
+    complete -o default -F __start_limactl limactl
+else
+    complete -o default -o nospace -F __start_limactl limactl
+fi
+
+# ex: ts=4 sw=4 et filetype=sh

.config/nvim/init.lua

@@ -59,6 +59,22 @@ vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
     end,
 })
 
+-- autocommand to set the file type to helm based on files ending in tpl
+vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
+  pattern = {"*/charts/*/templates/*.tpl"},
+  callback = function()
+        vim.cmd("set filetype=helm")
+    end,
+})
+
+-- autocommand to set the file type to cfg for wireguard configs
+vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
+  pattern = {"*/etc/wireguard/wg*.conf"},
+  callback = function()
+        vim.cmd("set filetype=cfg")
+    end,
+})
+
 require('user.tree-sitter')
 
 -- folding and indentation

.config/nvim/lua/user/keymap.lua

@@ -1,31 +1,121 @@
--- map leader to <Space>
+-- ~~~~~~~~~~~~~~~~~~~~~~~ Key Mappings for Neovim ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-- leader key is the default modifier key for neovim. We map leader to <Space>
 vim.g.mapleader = " "
 
--- enter to fold code (collapses code block)
+-- Enter to fold code (collapses code block)
 vim.keymap.set('n', '<enter>', 'za')
 
--- ---------------------- toggleterm windows ----------------------------
+-- neotree - launches a file browser on the left hand side of the screen
--- CTRL+t keybindings to toggle terminal
+vim.keymap.set(
-vim.keymap.set('n', '<C-t>', '<CMD>ToggleTerm<CR>')
+    'n',
-vim.keymap.set('t', '<C-t>', '<C-\\><C-n><CMD>ToggleTerm<CR>')
+    '<leader>n',
+    '<cmd>NeoTreeShowToggle<cr>',
+    { desc = "🌳 Neotree - a file browser tree for neovim" }
+)
 
--- cmatrix
+-- ---------------------- markdown table formatting -------------------------
-vim.keymap.set('n', '<leader>M', '<cmd>Matrix<cr>', { desc = "󰘨  The Matrix™️" })
+vim.keymap.set(
--- gitui
+    'n',
-vim.keymap.set('n', '<leader>g', '<cmd>Gitui<cr>', { desc = "  gitui - terminal UI for git" })
+    '<leader>tm',
--- k9s
+    '<cmd>TableModeToggle<cr>',
-vim.keymap.set('n', '<leader>K', '<cmd>K9s<cr>', { desc = "󱃾 k9s - kubernetes dashboard" })
+    { desc = "󰓱  Table Mode - format your markdown tables as you go" }
--- bpython
+)
-vim.keymap.set('n', '<leader>p', '<cmd>Bpython<cr>', { desc = "  bpython - color + docs in interactive python" })
+
+-- ------------------------ terminal windows ----------------------------
+
+-- CTRL+t keybindings to toggle terminal
+vim.keymap.set(
+    'n',
+    '<C-t>',
+    '<CMD>ToggleTerm<CR>',
+    { desc = "  ToggleTerm - terminal for neovim" }
+)
+vim.keymap.set(
+    't',
+    '<C-t>',
+    '<C-\\><C-n><CMD>ToggleTerm<CR>',
+    { desc = "  ToggleTerm - terminal for neovim" }
+)
+
+-- ------------------------ external app windows -----------------------------
+
+-- cmatrix - goofy "The Matrix" terminal wallpaper
+vim.keymap.set(
+    'n',
+    '<leader>M',
+    '<cmd>Matrix<cr>',
+    { desc = "󰘨  The Matrix™️" }
+)
+
+-- gitui - a TUI for git
+vim.keymap.set(
+    'n',
+    '<leader>g',
+    '<cmd>Gitui<cr>',
+    { desc = "  gitui - terminal UI for git" }
+)
+
+-- k9s - a TUI dashboard for k8s
+vim.keymap.set(
+    'n',
+    '<leader>K',
+    '<cmd>K9s<cr>',
+    { desc = "󱃾  k9s - kubernetes dashboard" }
+)
+
+-- bpython - colorful and rich python interpretter
+vim.keymap.set(
+    'n',
+    '<leader>p',
+    '<cmd>Bpython<cr>',
+    { desc = "  bpython - color + docs in interactive python" }
+)
 
 -- ---------------------- Telescope windows ----------------------------
-vim.keymap.set('n', "<leader>:", "<cmd>Telescope commands<cr>", { desc = "All Commands" })
+vim.keymap.set(
-vim.keymap.set('n', '<leader>H', '<cmd>Telescope highlights<CR>', { desc = "Telescope for highlight groups in current buffer" })
+    'n',
-vim.keymap.set('n', '<leader>h', '<cmd>Telescope command_history<CR>', { desc = "Telescope for command history" })
+    "<leader>:",
-vim.keymap.set('n', "<leader>ff", "<cmd>Telescope find_files<cr>", { desc = "Find Files (cwd)" })
+    "<cmd>Telescope commands<cr>",
-vim.keymap.set('n', "<leader>fr", "<cmd>Telescope oldfiles<cr>", { desc = "Files Recently Opened in Neovim" })
+    { desc = "🔭 All Commands" }
-
+)
--- --------------------------- Diagnostics ------------------------------
+
-vim.keymap.set("n", "<leader>d", "<cmd>TroubleToggle<cr>",
+vim.keymap.set(
-  {silent = true, noremap = true}
+    'n',
+    '<leader>H',
+    '<cmd>Telescope highlights<CR>',
+    { desc = "🔭 Telescope for highlight groups in current buffer" }
+)
+
+vim.keymap.set(
+    'n',
+    '<leader>h',
+    '<cmd>Telescope command_history<CR>',
+    { desc = "🔭 Telescope for command history" }
+)
+
+vim.keymap.set(
+    'n',
+    "<leader>ff",
+    "<cmd>Telescope find_files<cr>",
+    { desc = "🔭 Find Files (cwd)" }
+)
+
+vim.keymap.set(
+    'n',
+    "<leader>fr",
+    "<cmd>Telescope oldfiles<cr>",
+    { desc = "🔭 Files Recently Opened in Neovim" }
+)
+
+-- --------------------------- Diagnostics ------------------------------ 
+vim.keymap.set(
+    "n",
+    "<leader>d",
+    "<cmd>TroubleToggle<cr>",
+    {
+        silent = true,
+        noremap = true,
+        desc = "🐛 Diagnostics for the active buffer"
+    }
 )

.config/nvim/lua/user/lazy.lua

@@ -231,10 +231,19 @@ local plugins = {
         'folke/twilight.nvim'
     },
     -- for markdown tables -- maybe not working?
-    -- {'dhruvasagar/vim-table-mode'},
-    --
     {
-        'towolf/vim-helm'
+        'dhruvasagar/vim-table-mode'
+    },
+
+    -- markdown table of contents generator
+    {
+        'mzlogin/vim-markdown-toc'
+    },
+
+    -- formatting helm charts properly
+    {
+        'towolf/vim-helm',
+        ft = {'helm'},
     },
     -- ---------------- Language Server Protocol Plugins ---------------------
     -- snippets

.config/onboardme/config.yml

@@ -69,13 +69,55 @@ package:
       # things like zoom and slack
       - work
 
+# 🚧 this section is under construction
+# cron:
+#   reminders:
+#     lunch:
+#       enabled:
+#         Linux: true
+#         Darwin: true
+#       # daily at noon
+#       schedule: "0 12 * * *"
+#       # whether or not to use the macOS "say" program
+#       # not sure equivilent on linux 🤔
+#       text_to_speech: true
+#       blurb: "It is snack time!"
+# 
+#     take_breaks:
+#       enabled:
+#         Linux: true
+#         Darwin: true
+#       # hourly by default
+#       schedule: "0 * * * *"
+#       text_to_speech: true
+#       blurb: "Take a break from your screen! Consider a glass of water and a short walk to stretch your legs."
+# 
+#   backups:
+#     freetube:
+#       # defaults to daily at 6PM in your local timezone
+#       # you can use this site for schedules: https://crontab-generator.org/
+#       schedule: "0 18 * * *"
+#       files:
+#         - history.db
+#         - playlists.db
+#         - profiles.db
+#         - settings.db
+#       from_dir:
+#         Linux: "~/.config/FreeTube"
+#         Darwin: "~/Library/Application\ Support/FreeTube"
+#       to_dir:
+#         Linux: "~/Nextcloud/freetube/linux"
+#         Darwin: "~/Nextcloud/freetube/macos"
+
+# 🚧 this section is under construction
 # known safe remote hosts that you expect to be able to ping and SSH into
 remote_hosts: []
   # - 192.168.42.42
 
+# 🚧 this section is under construction
 # setup iptable on Linux only
 firewall: false
 
-### TODO: make this work, it's a nice dream though.
+# 🚧 this section is under construction
-# any URL we can curl to download a folder from
+# set wallpapers directory. MacOS: https://apple.stackexchange.com/a/348454
-# wallpapers_download_url: ""
+# wallpapers_dir: ""