added ansi2txt to chezmoiexternal

removed wezterm default keybindings in the normal mode except a few essentials

.chezmoi.toml.tmpl

@@ -3,28 +3,36 @@
 # which of the _home.* dirs will be set as the .chezmoiroot
 #
 
-{{- $githubToken := or (env "CHEZMOI_GITHUB_ACCESS_TOKEN") (env "GITHUB_ACCESS_TOKEN") (env "GITHUB_TOKEN") }}
-{{- if not ($githubToken) }}
-{{-   $githubToken = promptStringOnce . "githubToken" "Public GITHUB token (mostly for rate limits - !insecure!)" }}
-{{- end }}
+{{- $githubToken := promptStringOnce . "githubToken" "Public GITHUB token (mostly for rate limits - !insecure!)" (or (
+        env "CZ_GITHUB_ACCESS_TOKEN"
+    ) ( env "CHEZMOI_GITHUB_ACCESS_TOKEN"
+    ) ( env "GITHUB_ACCESS_TOKEN"
+    ) ( env "GITHUB_TOKEN"
+    )) -}}
 {{- $scriptTempDir := "~/.cache/chezmoi/tmp" }}
+
 {{- $chassisType := "desktop" }}
 {{- $sysType := "posix" }}
 {{- $sysVendor := "unknown" }}
 {{- if eq .chezmoi.os "darwin" }}
 {{-   $sysType = "macos" }}
+{{-   $sysVendor = "apple" }}
 {{-   if contains "BatteryData" (output "ioreg" "-c" "AppleSmartBattery") }}
 {{-     $chassisType = "laptop" }}
 {{-   else }}
 {{-     $chassisType = "desktop" }}
 {{-   end }}
 {{- else if eq .chezmoi.os "linux" }}
-#  $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
-{{-   $chassisType = "server" }}
+{{-   $chassisType = or (and
+          (lookPath "hostnamectl") (output "hostnamectl" "--json=short" | mustFromJson).Chassis
+        )
+        "server"
+}}
 {{- else if eq .chezmoi.os "windows" }}
 {{-   $sysType = "windows" }}
+{{-   $sysVendor = "pc" }}
 {{-   $chassisType = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "if ((Get-CimInstance -Class Win32_Battery | Measure-Object).Count -gt 0) { Write-Output 'laptop' } else { Write-Output 'desktop' }") | trim }}
-{{- end -}}
+{{- end }}
 
 scriptTempDir={{- $scriptTempDir | quote }}
 
@@ -34,3 +42,5 @@ scriptTempDir={{- $scriptTempDir | quote }}
   CZ_SYS={{- $sysType | quote }}
   CZ_OS={{- .chezmoi.os | quote }}
   CZ_GITHUB_ACCESS_TOKEN={{- $githubToken | quote }}
+  CZ_VENDOR={{- $sysVendor | quote }}
+

.chezmoiscripts/run_init.sh.tmpl

@@ -2,18 +2,19 @@
 
 set -e
 
-env | grep -E 'chezmoi|^CZ'
+[ -z "$SET_X" ] || env | grep -E 'chezmoi|^CZ'
 cd "$CHEZMOI_SOURCE_DIR"
 #CZ_MODEL="$(ioreg -l | grep "product-name" | sed -Ee 's/^.*\<"(.*)\"\>.*$/\1/')"
-set | grep '^CZ_'
+${SET_X:-:} | grep '^CZ_' || true
 printf 'System detected as %s/%s, setting up .chezmoiroot and initializing...\n' "$CZ_SYS" "$CZ_CHASSIS"
-set -x
-if [ -r "base.chezmoiroot.$CZ_SYS.$CZ_CHASSIS" ]; then
-    ln -s "base.chezmoiroot.$CZ_SYS.$CZ_CHASSIS" .chezmoiroot
-elif [ -r "base.chezmoiroot.$CZ_SYS" ]; then
-    ln -s "base.chezmoiroot.$CZ_SYS" .chezmoiroot
-elif [ -r "base.chezmoiroot.$CZ_CHASSIS" ]; then
-    ln -s "base.chezmoiroot.$CZ_CHASSIS" .chezmoiroot
+${SET_X:-:} -x
+CZROOTLINK=chezmoi.roots/__root_links/base.chezmoiroot
+if [ -r "${CZROOTLINK}.$CZ_SYS.$CZ_CHASSIS" ]; then
+    ln -s "${CZROOTLINK}.$CZ_SYS.$CZ_CHASSIS" .chezmoiroot
+elif [ -r "${CZROOTLINK}.$CZ_SYS" ]; then
+    ln -s "${CZROOTLINK}.$CZ_SYS" .chezmoiroot
+elif [ -r "${CZROOTLINK}.$CZ_CHASSIS" ]; then
+    ln -s "${CZROOTLINK}.$CZ_CHASSIS" .chezmoiroot
 else
     printf 'Failed to find a matching .chezmoiroot. Aborting!\n'
     false

.init.me.sh

@@ -1,6 +1,39 @@
 #! /usr/bin/env bash
 
-set -ex
+CZ_DEBUG=
+while true; do
+    case "$1" in
+        --init) break;;
+        --debug) [[ -z "$SET_X" ]] && export SET_X=set || CZ_DEBUG=--debug;;
+        *)  printf '%s\n' \
+                'Re-initialize chezmoi based environment, reloading it from source' \
+                '' \
+                'Usage:' \
+                "  ${0##*/} [--init]" \
+                '' \
+                'Arguments:' \
+                '  without any (or unknown) arguments, displays this usage message.' \
+                '' \
+                '  --init    Perform initialization' \
+                '' \
+                'Description:' \
+                '  Deletes ~/.config/chezmoi and the .chezmoiroot and performs' \
+                '    chezmoi init --apply' \
+                '  This, in effect, will trigger .chezmoiscripts/run_init.sh template' \
+                '' \
+                '  the init script template determins the type of OS and hardware we are' \
+                '  running on and assigns (creates a symlink) the proper root to' \
+                '  .chezmoiroot at which point, it re-initializes the local chezmoi' \
+                ''
+            exit 2
+            ;;
+    esac
+    shift
+done
+
+set -e
+${SET_X:-:} -x
 
 rm -fR ~/.config/chezmoi ~/.local/share/chezmoi/.chezmoiroot
-chezmoi init --apply
+chezmoi init ${CZ_DEBUG} --apply
+unset SET_X

_home.macos/private_dot_config/sz.env/.aliases.macos.env

@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/.aliases.macos.env

_home.macos/private_dot_config/sz.env/zza_atuin.env

@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/zza_atuin.env

_home.macos/private_dot_config/sz.env/zzz_chezmoi.env.tmpl

@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/zzz_chezmoi.env.tmpl

_home.macos/private_dot_config/sz.env/zzz_fzf.env.off

@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/zzz_fzf.env.off

_home.macos/private_dot_config/wezterm/wezterm.lua

@@ -1 +0,0 @@
-../../../_src.all/private_dot_config/wezterm/wezterm.lua

_home/private_dot_config/sz.env/.aliases.macos.env

@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/.aliases.macos.env

_home/private_dot_config/sz.env/zza_atuin.env

@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/zza_atuin.env

_home/private_dot_config/sz.env/zzz_chezmoi.env.tmpl

@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/zzz_chezmoi.env.tmpl

_home/private_dot_config/sz.env/zzz_fzf.env.off

@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/zzz_fzf.env.off

_home/private_dot_config/wezterm/wezterm.lua

@@ -1 +0,0 @@
-../../../_src.all/private_dot_config/wezterm/wezterm.lua

_src.all/.chezmoi.toml.tmpl

@@ -1,97 +0,0 @@
-{{- $githubToken := or (env "CZ_GITHUB_ACCESS_TOKEN") (env "CHEZMOI_GITHUB_ACCESS_TOKEN") (env "GITHUB_ACCESS_TOKEN") (env "GITHUB_TOKEN") }}
-{{- if not ($githubToken) }}
-{{-   $githubToken = promptStringOnce . "githubToken" "Public GITHUB token (mostly for rate limits - !insecure!)" }}
-{{- end }}
-{{- $sysname := promptStringOnce . "sysname" "System name" }}
-{{- $sysgroup := promptStringOnce . "sysgroup" "System group" }}
-{{- $sysarea := promptStringOnce . "sysarea" "System area" }}
-{{- $gitEmail := promptStringOnce . "gitEmail" "email address (for git commits)" }}
-{{- $gitName := promptStringOnce . "gitName" "Full name (for git commits)" }}
-{{- $chassisType := "desktop" }}
-{{- $sysType := "posix" }}
-{{- $arch_alt := "x86_64" }}
-{{- $arch_alt_dash := "x86-64" }}
-{{- $sysVendor := "unknown" }}
-{{- $clib_flavor := "" }}
-{{- if eq .chezmoi.os "darwin" }}
-{{-   $arch_alt = "aarch64" }}
-{{-   $arch_alt_dash = $arch_alt }}
-{{-   $sysType = "macos" }}
-{{-   $sysVendor = "apple" }}
-{{-   if contains "BatteryData" (output "ioreg" "-c" "AppleSmartBattery") }}
-{{-     $chassisType = "laptop" }}
-{{-   else }}
-{{-     $chassisType = "desktop" }}
-{{-   end }}
-{{- else if eq .chezmoi.os "linux" }}
-{{-   $clib_flavor = "-musl" }}
-#  $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
-{{-   $chassisType = "server" }}
-{{- else if eq .chezmoi.os "windows" }}
-{{-   $clib_flavor = "-msvc" }}
-{{-   $sysType = "windows" }}
-{{-   $sysVendor = "pc" }}
-{{-   $chassisType = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "if ((Get-CimInstance -Class Win32_Battery | Measure-Object).Count -gt 0) { Write-Output 'laptop' } else { Write-Output 'desktop' }") | trim }}
-{{- end }}
-
-{{- $scriptTempDir := "~/.cache/chezmoi/tmp" }}
-scriptTempDir={{- $scriptTempDir | quote }}
-
-[data.sz.os]
-{{- if eq .chezmoi.os "linux" }}
-    short={{- .chezmoi.os | quote }}
-{{- else if eq .chezmoi.os "darwin" }}
-    short="mac"
-{{- else }}
-    short={{- substr 0 3 (.chezmoi.os) | quote }}
-{{- end }}
-    rust_rel_target={{- printf "%s-%s%s" $sysVendor .chezmoi.os $clib_flavor | quote }}
-{{- if ($arch_alt) }}
-    arch_alt={{- $arch_alt | quote }}
-{{- end }}
-{{- if ($arch_alt_dash) }}
-    arch_alt_dash={{- $arch_alt_dash | quote }}
-{{- end }}
-{{- if ($chassisType) }}
-    chassisType={{- $chassisType | quote }}
-{{- end }}
-{{- if ($sysType) }}
-    sysType={{- $sysType | quote }}
-{{- end }}
-
-[data]
-{{- if ($githubToken) }}
-    githubToken={{- $githubToken | quote }}
-{{- end }}
-{{- if ($sysname) }}
-    sysname = {{ $sysname | quote }}
-{{- end }}
-{{- if ($sysgroup) }}
-    sysgroup = {{ $sysgroup | quote }}
-{{- end }}
-{{- if ($sysarea) }}
-    sysarea = {{ $sysarea | quote }}
-{{ end }}
-
-{{- if ($gitEmail) }}
-    gitEmail = {{ $gitEmail | quote }}
-{{- end }}
-{{- if ($gitName) }}
-    gitName = {{ $gitName | quote }}
-{{- end }}
-{{- if not ($githubToken) }}
-    githubToken={{- $githubToken | quote }}
-{{- end }}
-
-[scriptEnv]
-    GITHUB_ACCESS_TOKEN={{- $githubToken | quote }}
-    GITHUB_TOKEN={{- $githubToken | quote }}
-
-[diff]
-#   command = "nvim"
-#   args = ["-d",  "{{ "{{ .Destination }}" }}", "{{ "{{ .Target }}" }}"]
-
-    command = "delta"
-    args = ["--paging=never", "{{ "{{ .Destination }}" }}", "{{ "{{ .Target }}" }}"]
-    pager = "moar"
-

_src.all/private_dot_config/wezterm/wezterm.lua

@@ -1,246 +0,0 @@
--- Pull in the wezterm API
-local wezterm = require 'wezterm'
-local act = wezterm.action
-
--- This table will hold the configuration.
-local config = {}
-
--- In newer versions of wezterm, use the config_builder which will
--- help provide clearer error messages
-if wezterm.config_builder then
-  config = wezterm.config_builder()
-end
-
-config.window_background_opacity = 0.97
-config.text_background_opacity = 0.9
-
--- This is where you actually apply your config choices
-config.audible_bell = "Disabled"
-
-config.visual_bell = {
-  fade_in_function = 'EaseIn',
-  fade_in_duration_ms = 50,
-  fade_out_function = 'Constant',
-  fade_out_duration_ms = 0,
-}
--- config.colors = {
---   visual_bell = '#202020',
--- }
-
--- For example, changing the color scheme:
--- config.color_scheme = 'AdventureTime'
--- config.color_scheme = 'Batman'
--- config.color_scheme = 'Apple System Colors'
--- config.color_scheme = 'Azu (Gogh)'
--- config.color_scheme = 'Bim (Gogh)'
--- config.color_scheme = 'Cai (Gogh)'
--- config.color_scheme = 'CGA'
--- config.color_scheme = 'Chalkboard'
--- config.color_scheme = 'Dark Pastel'
--- config.color_scheme = 'Dark Violet (base16)'
--- config.color_scheme = 'Default Dark (base16)'
--- config.color_scheme = 'Dotshare (terminal.sexy)'
--- config.color_scheme = 'Dracula'
--- config.color_scheme = 'Dracula (Official)'
--- config.color_scheme = 'Dracula+'
--- config.color_scheme = 'duckbones'
--- config.color_scheme = 'Floraverse' -- *****
--- config.color_scheme = 'Galizur'
--- config.color_scheme = 'Github Dark (Gogh)'
--- config.color_scheme = 'Glacier'
--- config.color_scheme = 'Gnometerm (terminal.sexy)'
--- config.color_scheme = 'Gotham (Gogh)'
--- config.color_scheme = 'Grayscale Dark (base16)'
--- config.color_scheme = 'Hardcore (Gogh)'
--- config.color_scheme = 'Highway'
--- config.color_scheme = 'Hybrid (terminal.sexy)'
--- config.color_scheme = 'Ibm3270 (Gogh)'
--- config.color_scheme = 'Iiamblack (terminal.sexy)'
--- config.color_scheme = 'iTerm2 Default'
--- config.color_scheme = 'iTerm2 Smoooooth'
--- config.color_scheme = 'iTerm2 Tango Dark'
--- config.color_scheme = 'Jason Wryan (terminal.sexy)'
--- config.color_scheme = 'Kibble'
--- config.color_scheme = 'Kibble (Gogh)'
--- config.color_scheme = 'Konsolas'
--- config.color_scheme = 'LiquidCarbonTransparent'
--- config.color_scheme = 'MaterialDark'
--- config.color_scheme = 'MaterialDesignColors'
--- config.color_scheme = 'Muse (terminal.sexy)'
--- config.color_scheme = 'niji'
--- config.color_scheme = 'Oceanic Next (Gogh)'
--- config.color_scheme = 'Pasque (base16)' -- Purple/Lavendar hues
-config.color_scheme = 'Pencil Dark (Gogh)' -- ****1/2
--- config.color_scheme = 'PencilDark'
--- config.color_scheme = 'Popping and Locking'
--- config.color_scheme = 'Rasi (terminal.sexy)'
--- config.color_scheme = 'Rezza (terminal.sexy)'
--- config.color_scheme = 'Rosé Pine (Gogh)'
--- config.color_scheme = 'Rouge 2'
--- config.color_scheme = 'Royal' -- ****1/2
--- config.color_scheme = 'Sea Shells (Gogh)'
--- config.color_scheme = 'Seti'
--- config.color_scheme = 'shades-of-purple'
--- config.color_scheme = 'SpaceGray Eighties'
--- config.color_scheme = 'Tango (terminal.sexy)'
--- config.color_scheme = 'Twilight (dark) (terminal.sexy)'
--- config.color_scheme = 'VibrantInk'
--- config.color_scheme = 'Vice Alt (base16)'
--- config.color_scheme = 'Vice Dark (base16)'
-
--- config.font = wezterm.font 'CaskaydiaCove Nerd Font Mono Regular'
-config.font = wezterm.font_with_fallback {
-    'FiraCode Nerd Font Mono'
-  , 'FiraCode Nerd Font Mono SemBd'
-  , 'FiraCode Nerd Font Mono Ret'
-  , 'FiraMono Nerd Font Mono'
-  , 'DroidSansM Nerd Font'
-  , 'DroidSansMono NF'
-  , 'DroidSansMono'
-  , 'Consolas'
-  , 'Courier New'
-  , 'monospace'
-}
---config.default_prog = { 'pwsh' }
-
--- config.keys = {
---   {
---     key = ',',
---     mods = 'CMD',
---     action = act.SpawnCommandInNewTab {
---       cwd = os.getenv('WEZTERM_CONFIG_DIR'),
---       set_environment_variables = {
---         TERM = 'screen-256color',
---       },
---       args = {
---         'code',
---         os.getenv('WEZTERM_CONFIG_FILE'),
---       },
---     },
---   },
---   {
---     key = 'R',
---     mods = 'CMD|SHIFT',
---     action = act.PromptInputLine {
---       description = 'Enter new name for tab',
---       action = wezterm.action_callback(function(window, _, line)
---         -- line will be `nil` if they hit escape without entering anything
---         -- An empty string if they just hit enter
---         -- Or the actual line of text they wrote
---         if line then
---           window:active_tab():set_title(line)
---         end
---       end),
---     },
---   },
---   -- other keys
---   -- {
---   --   key = "n",
---   --   mods = "CTRL",
---   --   action = wezterm.action.SpawnCommandInNewTab({
---   --     args = {"code ."}
---   --   })
---   -- },
--- }
-
-config.window_background_gradient = {
-  -- Can be "Vertical" or "Horizontal".  Specifies the direction
-  -- in which the color gradient varies.  The default is "Horizontal",
-  -- with the gradient going from left-to-right.
-  -- Linear and Radial gradients are also supported; see the other
-  -- examples below
-  orientation = 'Vertical',
-
-  -- Specifies the set of colors that are interpolated in the gradient.
-  -- Accepts CSS style color specs, from named colors, through rgb
-  -- strings and more
-  colors = {
-    '#0f0c29',
-    '#302b63',
-    '#24243e',
-  },
-
-  -- Instead of specifying `colors`, you can use one of a number of
-  -- predefined, preset gradients.
-  -- A list of presets is shown in a section below.
-  -- preset = "Warm",
-
-  -- Specifies the interpolation style to be used.
-  -- "Linear", "Basis" and "CatmullRom" as supported.
-  -- The default is "Linear".
-  interpolation = 'Linear',
-
-  -- How the colors are blended in the gradient.
-  -- "Rgb", "LinearRgb", "Hsv" and "Oklab" are supported.
-  -- The default is "Rgb".
-  blend = 'Rgb',
-
-  -- To avoid vertical color banding for horizontal gradients, the
-  -- gradient position is randomly shifted by up to the `noise` value
-  -- for each pixel.
-  -- Smaller values, or 0, will make bands more prominent.
-  -- The default value is 64 which gives decent looking results
-  -- on a retina macbook pro display.
-  -- noise = 64,
-
-  -- By default, the gradient smoothly transitions between the colors.
-  -- You can adjust the sharpness by specifying the segment_size and
-  -- segment_smoothness parameters.
-  -- segment_size configures how many segments are present.
-  -- segment_smoothness is how hard the edge is; 0.0 is a hard edge,
-  -- 1.0 is a soft edge.
-
-  -- segment_size = 11,
-  -- segment_smoothness = 0.0,
-}
-config.window_background_gradient = null
-config.prefer_to_spawn_tabs = true
-
-wezterm.on("format-tab-title", function(tab, tabs, panes, config, hover, max_width)
-  local pane_title = tab.active_pane.title
-  local user_title = tab.active_pane.user_vars.panetitle
-
-  if user_title ~= nil and #user_title > 0 then
-    pane_title = user_title
-  end
-
-  return {
-    -- {Background={Color="blue"}},
-    -- {Foreground={Color="white"}},
-    {Text=" " .. pane_title .. " "},
-  }
-end)
-
--- # First and only argument is the desired term title
--- function rename_wezterm_title { printf "\x1b]1337;SetUserVar=panetitle=%s\x07" "$(echo -n "$*" | base64)"; }; rename_wezterm_title Serial:$(hostname)
-
--- wezterm.on("merge_all_windows", function(window, pane)
---   local workspace = wezterm.mux.get_active_workspace()
---   local all_windows = wezterm.mux.all_windows()
-
---   -- Find the first window in the workspace to move all tabs into
---   local target_window = nil
---   for _, win in ipairs(all_windows) do
---     if win:get_workspace() == workspace then
---       target_window = win
---       break
---     end
---   end
-
---   if not target_window then return end
-
---   -- Move all tabs from other windows into target_window
---   for _, win in ipairs(all_windows) do
---     if win ~= target_window and win:get_workspace() == workspace then
---       for _, tab in ipairs(win:tabs()) do
---         tab:move_to_window(target_window)
---       end
---       -- Close the now empty window
---       win:perform_action(wezterm.action.CloseCurrentPane { confirm = false }, win:active_pane())
---     end
---   end
--- end)
-
--- and finally, return the configuration to wezterm
-return config
-

base.chezmoiroot.macos

@@ -1 +0,0 @@
-_home.macos

base.chezmoiroot.posix

@@ -1 +0,0 @@
-_home

chezmoi.roots/__root_links/base.chezmoiroot.macos

@@ -0,0 +1 @@
+chezmoi.roots/_home.macos

chezmoi.roots/__root_links/base.chezmoiroot.posix

@@ -0,0 +1 @@
+chezmoi.roots/_home

chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zza_atuin.env

@@ -0,0 +1 @@
+../../../_src.posix/private_dot_config/sz.env/remove_zza_atuin.env

chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl

@@ -0,0 +1 @@
+../../../_src.posix/private_dot_config/sz.env/remove_zzz_chezmoi.env.tmpl

chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_zzz_fzf.env.off

@@ -0,0 +1 @@
+../../../_src.posix/private_dot_config/sz.env/remove_zzz_fzf.env.off

chezmoi.roots/_home.macos/private_dot_config/sz.env/zzk_fzf.env

@@ -0,0 +1 @@
+../../../_src.posix/private_dot_config/sz.env/zzk_fzf.env

chezmoi.roots/_home.macos/private_dot_config/sz.env/zzy_atuin.env

@@ -0,0 +1 @@
+../../../_src.posix/private_dot_config/sz.env/zzy_atuin.env

chezmoi.roots/_home.macos/private_dot_config/sz.env/zzy_chezmoi.env.tmpl

@@ -0,0 +1 @@
+../../../_src.posix/private_dot_config/sz.env/zzy_chezmoi.env.tmpl

chezmoi.roots/_home.macos/private_dot_config/wezterm/wezterm.lua.tmpl

@@ -0,0 +1 @@
+../../../_src.posix/private_dot_config/wezterm/wezterm.lua.tmpl