feat(dfm): dfm apt helper commands

.pre-commit-config.yaml

@@ -49,7 +49,7 @@ repos:
       - id: actionlint
 
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 39.100.1
+    rev: 39.107.2
     hooks:
       - id: renovate-config-validator
 

config/nvim/lua/autogroups.lua

@@ -104,8 +104,4 @@ autocmd({ 'BufRead', 'BufNewFile' }, {
   command = 'set filetype=sshconfig',
 })
 
-autocmd('QuickFixCmdPost', {
-  callback = function() vim.cmd [[Trouble qflist open]] end,
-})
-
 -- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/plugins/lsp.lua

@@ -42,12 +42,6 @@ local lsp_servers = {
         diagnostics = {
           globals = {
             'vim',
-            -- busted
-            'describe',
-            'it',
-            'before_each',
-            'after_each',
-            'assert',
           },
           disable = {
             -- Ignore lua_ls noisy `missing-fields` warnings
@@ -55,7 +49,7 @@ local lsp_servers = {
           },
         },
         hint = {
-          enable = false,
+          enable = true,
           arrayIndex = 'Auto',
           await = true,
           paramName = 'All',

config/nvim/lua/plugins/other.lua

@@ -10,6 +10,28 @@ return {
         '~/Downloads',
         '~/Library',
       },
+      bypass_save_filetypes = {
+        'PlenaryTestPopup',
+        'alpha',
+        'checkhealth',
+        'dashboard',
+        'dbout',
+        'gitsigns.blame',
+        'grug-far',
+        'help',
+        'lspinfo',
+        'man',
+        'neo-tree',
+        'neotest-output',
+        'neotest-output-panel',
+        'neotest-summary',
+        'notify',
+        'qf',
+        'spectre_panel',
+        'startuptime',
+        'trouble',
+        'tsplayground',
+      },
       -- log_level = 'debug',
     },
   },

docs/aerospace-keybindings.md

@@ -0,0 +1,66 @@
+# aerospace keybindings
+
+## main
+
+| Key             | Command(s) and actions                        |
+|-----------------|-----------------------------------------------|
+| alt-a           | mode apps                                     |
+| alt-h           | focus left                                    |
+| alt-j           | focus down                                    |
+| alt-k           | focus up                                      |
+| alt-l           | focus right                                   |
+| alt-m           | mode move                                     |
+| alt-s           | mode service                                  |
+| alt-shift-1     | workspace 1                                   |
+| alt-shift-2     | workspace 2                                   |
+| alt-shift-tab   | workspace-back-and-forth                      |
+| ctrl-shift-1    | move-node-to-workspace 1                      |
+| ctrl-shift-2    | move-node-to-workspace 2                      |
+| ctrl-shift-tab  | move-workspace-to-monitor --wrap-around prev  |
+
+## apps
+
+| Key  | Command(s) and actions                                               |
+|------|----------------------------------------------------------------------|
+| b    | exec-and-forget  open -a /Applications/Brave Browser.app; mode main  |
+| c    | exec-and-forget  open -a /Applications/Ferdium.app; mode main        |
+| esc  | reload-config; mode main                                             |
+| g    | exec-and-forget  open -a /Applications/Ghostty.app; mode main        |
+| o    | exec-and-forget  open -a /Applications/Obsidian.app; mode main       |
+| s    | exec-and-forget  open -a /Applications/Slack.app; mode main          |
+| t    | exec-and-forget  open -a /Applications/TIDAL.app; mode main          |
+| w    | exec-and-forget  open -a /Applications/WezTerm.app; mode main        |
+
+## move
+
+| Key          | Command(s) and actions                           |
+|--------------|--------------------------------------------------|
+| 1            | move-node-to-workspace 1 --focus-follows-window  |
+| 2            | move-node-to-workspace 2 --focus-follows-window  |
+| ctrl-h       | resize smart -70                                 |
+| ctrl-l       | resize smart +70                                 |
+| esc          | reload-config; mode main                         |
+| h            | move left                                        |
+| j            | move down                                        |
+| k            | move up                                          |
+| l            | move right                                       |
+| r            | flatten-workspace-tree; mode main                |
+| shift-h      | join-with left                                   |
+| shift-j      | join-with down                                   |
+| shift-k      | join-with up                                     |
+| shift-l      | join-with right                                  |
+| shift-left   | resize smart +70                                 |
+| shift-right  | resize smart -70                                 |
+
+## service
+
+| Key        | Command(s) and actions                    |
+|------------|-------------------------------------------|
+| backspace  | close-all-windows-but-current; mode main  |
+| esc        | reload-config; mode main                  |
+| f          | layout floating tiling; mode main         |
+| r          | flatten-workspace-tree; mode main         |
+
+File generated: 2025-01-15 13:32:41
+
+Config file: [config/aerospace/aerospace.toml](./../config/aerospace/aerospace.toml)

local/bin/dfm

@@ -436,6 +436,7 @@ section_helpers()
     "colors:Show colors"
     "env:Show environment variables"
     "functions:Show functions"
+    "aerospace:Show aerospace keybindings"
     "nvim:Show nvim keybindings"
     'path:Show $PATH dir by dir'
     "tmux:Show tmux keybindings"
@@ -494,6 +495,7 @@ section_helpers()
 
     "env") env | sort ;;
     "functions") declare -F ;;
+    "aerospace") cat "$DOTFILES/docs/aerospace-keybindings.md" ;;
     "nvim") cat "$DOTFILES/docs/nvim-keybindings.md" ;;
     "tmux") cat "$DOTFILES/docs/tmux-keybindings.md" ;;
     "wezterm") cat "$DOTFILES/docs/wezterm-keybindings.md" ;;
@@ -501,12 +503,76 @@ section_helpers()
   esac
 }
 
+section_apt()
+{
+  USAGE_PREFIX="$SCRIPT apt <command>"
+  MENU=(
+    "upkeep:Run update, upgrade, autoremove and clean"
+    'install:Install packages from $DOTFILES/tools/apt.txt'
+    "update:Update apt packages"
+    "upgrade:Upgrade apt packages"
+    "autoremove:Remove unused apt packages"
+    "clean:Clean apt cache"
+  )
+
+  x-have apt && {
+    case "$1" in
+      upkeep)
+        sudo apt update \
+          && sudo apt upgrade -y \
+          && sudo apt autoremove -y \
+          && sudo apt clean
+        ;;
+
+      install)
+        # if apt.txt is not found, exit
+        [ ! -f "$DOTFILES/tools/apt.txt" ] && msgr err "apt.txt not found" && exit 0
+
+        # Load apt.txt, remove comments (even if trailing comment) and empty lines.
+        #
+        # Ignoring "Quote this to prevent word splitting."
+        # shellcheck disable=SC2046
+        sudo apt install \
+          -y $(
+            grep -vE '^\s*#' "$DOTFILES/tools/apt.txt" \
+              | sed -e 's/#.*//' \
+              | tr '\n' ' '
+          )
+
+        # If there's a apt.txt file under hosts/$hostname/apt.txt,
+        # run install on those lines too.
+        HOSTNAME=$(hostname -s)
+        HOST_APT="$DOTFILES/hosts/$HOSTNAME/apt.txt"
+        [[ -f $HOST_APT ]] && {
+          # shellcheck disable=SC2046
+          sudo apt install -y $(
+            grep -vE '^\s*#' "$HOST_APT" \
+              | sed -e 's/#.*//' \
+              | tr '\n' ' '
+          )
+        }
+
+        # Try this for an alternative way to install packages
+        # xargs -a <(awk '! /^ *(#|$)/' "$packagelist") -r -- sudo apt-get install -y
+        ;;
+
+      update) sudo apt update ;;
+      upgrade) sudo apt upgrade -y ;;
+      autoremove) sudo apt autoremove -y ;;
+      clean) sudo apt clean ;;
+      *) menu_builder "$USAGE_PREFIX" "${MENU[@]}" ;;
+    esac
+  }
+  ! x-have apt && menu_builder "$USAGE_PREFIX" "apt not available on this system"
+}
+
 section_docs()
 {
   USAGE_PREFIX="$SCRIPT docs <command>"
 
   MENU=(
     "all:Update all keybindings documentations"
+    "aerospace:Update aerospace keybindings documentation"
     "tmux:Update tmux keybindings documentation"
     "nvim:Update nvim keybindings documentation"
     "wezterm:Update wezterm keybindings documentation"
@@ -514,10 +580,12 @@ section_docs()
 
   case "$1" in
     all)
+      $0 docs aerospace
       $0 docs tmux
       $0 docs nvim
       $0 docs wezterm
       ;;
+    aerospace) bash "$DOTFILES/scripts/create-aerospace-keymaps.php" ;;
     tmux) bash "$DOTFILES/local/bin/x-dfm-docs-xterm-keybindings" ;;
     nvim) bash "$DOTFILES/scripts/create-nvim-keymaps.sh" ;;
     wezterm) bash "$DOTFILES/scripts/create-wezterm-keymaps.sh" ;;
@@ -708,6 +776,8 @@ usage()
   echo ""
   section_install
   echo ""
+  section_apt
+  echo ""
   section_asdf
   echo ""
   section_brew
@@ -730,6 +800,7 @@ main()
   # The main loop. The first keyword after $0 triggers section, or help.
   case "$SECTION" in
     install) section_install "$@" ;;
+    apt) section_apt "$@" ;;
     asdf) section_asdf "$@" ;;
     brew) section_brew "$@" ;;
     check) section_check "$@" ;;

local/bin/t

@@ -21,7 +21,26 @@ get_directories()
 {
   local dirs=''
   dirs+='# Directories\n'
-  dirs+=$(find "$T_ROOT" -maxdepth 2 -mindepth 1 -type d ! -name '.git' ! -name '.svn')
+  dirs+=$(
+    find "$T_ROOT" \
+      -maxdepth 3 \
+      -mindepth 1 \
+      -type d \
+      -not -path '*/dist/*' \
+      -not -path '*/dist' \
+      -not -path '*/node_modules/*' \
+      -not -path '*/node_modules' \
+      -not -path '*/vendor/*' \
+      -not -path '*/vendor' \
+      -not -path '*/.idea/*' \
+      -not -path '*/.idea' \
+      -not -path '*/.vscode/*' \
+      -not -path '*/.vscode' \
+      -not -path '*/.git/*' \
+      -not -path '*/.git' \
+      -not -path '*/.svn/*' \
+      -not -path '*/.svn'
+  )
   dirs+="$(printf "\n%s" "$DOTFILES")"
 
   echo "$dirs"
@@ -56,9 +75,9 @@ items=''
 if [[ $# -eq 1 ]]; then
   selected="$1"
 else
-  items+=$(get_sessions)
+  items+=$(get_sessions | sort)
   items+='\n'
-  items+=$(get_directories)
+  items+=$(get_directories | sort)
 
   selected=$(echo -e "$items" | fzf) || exit 0 # Exit if no selection is made
 fi
@@ -77,7 +96,11 @@ session_name=$(basename "$selected")
 session_name="${session_name//./}"
 
 # Try to switch to the tmux session
-if tmux switch-client -t "=$session_name" 2> /dev/null; then
+tmux switch-client -t "=$session_name"
+
+active_session=$(tmux display-message -p -F '#{session_name}' 2> /dev/null)
+# echo "active session: $active_session"
+if [ -n "$active_session" ] && [ "$active_session" == "$session_name" ]; then
   exit 0
 fi
 

scripts/create-aerospace-keymaps.php

@@ -0,0 +1,67 @@
+#!/usr/bin/env php
+<?php
+// @description Create file containing key mappings for aerospace
+// Usage: ./create-aerospace-keymaps.sh
+// vim: ft=php ts=4 sw=4 sts=4 sr et
+
+$dotfiles_env = getenv("DOTFILES") ?? '~/.dotfiles';
+
+$dest = "$dotfiles_env/docs/aerospace-keybindings.md";
+
+exec("aerospace config --get mode --json", $output);
+$output = join(' ', $output);
+$config = json_decode($output, true);
+
+$main = $config['main'];
+unset($config['main']);
+
+function process_section(string $title, array $array)
+{
+    $bindings = $array['binding'] ?? [];
+    ksort($bindings);
+
+    $output = [];
+    $output[] = sprintf("\n## %s\n", $title);
+
+    $k_len = max(array_map('strlen', array_keys($bindings)));
+    $v_len = max(array_map('strlen', array_values($bindings)));
+
+    $output[] = sprintf(
+        "| %s | %s |",
+        str_pad('Key', $k_len + 1),
+        str_pad('Command(s) and actions', $v_len + 1)
+    );
+    $output[] = sprintf(
+        "|%s|%s|",
+        str_repeat('-', $k_len + 3),
+        str_repeat('-', $v_len + 3)
+    );
+
+    foreach ($bindings as $key => $value) {
+        $k = str_pad($key, $k_len + 1);
+        $v = str_pad($value, $v_len + 1);
+        $output[] = sprintf("| %s | %s |", $k, $v);
+    }
+
+    return implode("\n", $output);
+}
+
+$contents = [];
+$contents[] = "# aerospace keybindings";
+
+$contents[] = process_section("main", $main);
+
+ksort($config);
+
+foreach ($config as $mode => $bindings) {
+    $contents[] = process_section($mode, $bindings);
+}
+
+$contents[] = "\nFile generated: " . date("Y-m-d H:i:s") . "\n";
+
+$config_file_name = 'config/aerospace/aerospace.toml';
+$config_file_source = './../config/aerospace/aerospace.toml';
+$contents[] = "Config file: [$config_file_name]($config_file_source)\n";
+
+$file = implode("\n", $contents);
+file_put_contents($dest, $file);

tools/apt.txt

@@ -0,0 +1 @@
+# apt install list