diff --git a/dot_config/fish/conf.d/20-aliases.fish b/dot_config/fish/conf.d/20-aliases.fish index daff14e..e222a34 100644 --- a/dot_config/fish/conf.d/20-aliases.fish +++ b/dot_config/fish/conf.d/20-aliases.fish @@ -9,7 +9,7 @@ alias e.f 'cd ~/.local/share/chezmoi/dot_config/fish && yazi' alias e.h 'cd ~/.local/share/chezmoi/dot_config/hypr && yazi' alias e.k 'yazi ~/.local/share/chezmoi/dot_config/kitty' alias e.n 'yazi ~/.local/share/chezmoi/dot_config/niri' -alias e.y 'yazi ~/.local/share/chezmoi/dot_config/yazi' +alias e.y 'yazi ~/.local/share/chezmoi/yazi' alias e.t 'nvim ~/.local/share/chezmoi/dot_config/tmux/tmux.conf' alias e.v 'yazi ~/.config/nvim/lua' diff --git a/dot_config/fish/functions/gh-wiki.fish b/dot_config/fish/functions/gh-wiki.fish index 34309c3..d989567 100644 --- a/dot_config/fish/functions/gh-wiki.fish +++ b/dot_config/fish/functions/gh-wiki.fish @@ -49,7 +49,7 @@ function gh-wiki --description "Clone a GitHub wiki and build one PDF from its M set -q _flag_output; and set out $_flag_output # --- Clone ---------------------------------------------------------- - gum spin --spinner dot --title "Cloning $url" -- \ + gum spin --show-error --spinner dot --title "Cloning $url" -- \ git clone --quiet --depth 1 $url $clone_dir or begin gum log --level error "Clone failed: $url" @@ -94,7 +94,6 @@ function gh-wiki --description "Clone a GitHub wiki and build one PDF from its M --shift-heading-level-by=1 \ --toc --toc-depth=2 \ --number-sections \ - --syntax-highlighting idiomatic \ -M title="$repo Wiki" \ -M date=(date +%Y-%m-%d) \ -V titlepage=true \ @@ -106,7 +105,7 @@ function gh-wiki --description "Clone a GitHub wiki and build one PDF from its M # pandoc/extra ships pandoc, LaTeX and Eisvogel. Mount the clone as # /data, write the PDF there, then move it to the requested path. set -l tmp_pdf _out.pdf - gum spin --spinner line --title "Rendering $out" -- \ + gum spin --show-error --spinner line --title "Rendering $out" -- \ docker run --rm \ --volume "$clone_dir:/data" \ --user (id -u):(id -g) \ @@ -128,7 +127,7 @@ function gh-wiki --description "Clone a GitHub wiki and build one PDF from its M else gum log --level warn "Template '$template' not found; using the pandoc default" end - gum spin --spinner line --title "Rendering $out" -- \ + gum spin --show-error --spinner line --title "Rendering $out" -- \ pandoc $src -o $out \ --resource-path $clone_dir \ $pandoc_args \ diff --git a/dot_config/ghostty/config b/dot_config/ghostty/config index f736152..c6a1d64 100644 --- a/dot_config/ghostty/config +++ b/dot_config/ghostty/config @@ -1,7 +1,7 @@ # Font Configuration -font-size = 11.5 -font-family = IoskeleyMonoTerm Nerd Font Mono -adjust-cell-height = 15% +font-size = 11 +font-family = VictorMono Nerd Font +adjust-cell-height = 10% background-blur = true # Window Configuration @@ -42,8 +42,10 @@ keybind = ctrl+shift+period=reload_config keybind = shift+enter=text:\x1b[13;2u # command palette: ctrl+space is tmux's root-table C-Space (tmux-palette); -# sent explicitly as NUL so no keyboard-protocol mode can turn it into a CSI +# sent explicitly as NUL so no keyboard-protocol mode can turn it into a CSI. +# ctrl+backspace is a second key for the same palette. keybind = ctrl+space=text:\x00 +keybind = ctrl+backspace=text:\x00 # project tasks palette (pj): tmux prefix t keybind = ctrl+shift+p=text:\x02t keybind = ctrl+shift+space=text:\x02t diff --git a/dot_config/hypr/bindings.lua b/dot_config/hypr/bindings.lua index 8ccae04..9e317bc 100644 --- a/dot_config/hypr/bindings.lua +++ b/dot_config/hypr/bindings.lua @@ -156,6 +156,8 @@ end hl.unbind("SUPER + O") -- was: pop window out hl.unbind("SUPER + SHIFT + O") -- was: Obsidian (moved to SUPER + CTRL + ALT + O) +o.bind("SUPER + O", "Focus next monitor", hl.dsp.focus({ monitor = "+1" })) +o.bind("SUPER + SHIFT + O", "Move window to next monitor", hl.dsp.window.move({ monitor = "+1" })) o.bind("ALT + SHIFT + J", "Move window to next monitor", hl.dsp.window.move({ monitor = "+1" })) o.bind("ALT + SHIFT + K", "Move window to previous monitor", hl.dsp.window.move({ monitor = "-1" })) diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index dc843c8..b9b16f0 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -1,5 +1,5 @@ # ── base.conf · shared ── -font_family IoskeleyMono Nerd Font Term +font_family VictorMono Nerd Font font_size 13.0 bold_italic_font auto window_padding_width 8 diff --git a/dot_config/symlink_yazi.tmpl b/dot_config/symlink_yazi.tmpl new file mode 100644 index 0000000..d59a515 --- /dev/null +++ b/dot_config/symlink_yazi.tmpl @@ -0,0 +1 @@ +{{ .chezmoi.sourceDir }}/yazi diff --git a/dot_config/tmux-palette/commands.json b/dot_config/tmux-palette/commands.json index 9a43a94..e135f70 100644 --- a/dot_config/tmux-palette/commands.json +++ b/dot_config/tmux-palette/commands.json @@ -25,6 +25,14 @@ "aliases": ["top", "htop"], "action": { "popup": "btop" } }, + { + "icon": "󰡨", + "title": "Lazydocker", + "description": "popup in the pane's directory", + "category": "Tools", + "aliases": ["dd"], + "action": { "tmux": "display-popup -E -w 90% -h 90% -d '#{pane_current_path}' lazydocker" } + }, { "icon": "", "title": "mandible", diff --git a/run_onchange_after_install-yazi-plugins.sh.tmpl b/run_onchange_after_install-yazi-plugins.sh.tmpl index 8548574..01f9163 100755 --- a/run_onchange_after_install-yazi-plugins.sh.tmpl +++ b/run_onchange_after_install-yazi-plugins.sh.tmpl @@ -1,7 +1,14 @@ #!/bin/sh -# Reinstall yazi plugins from the manifest whenever it changes. -# package.toml hash: {{ include "dot_config/yazi/package.toml" | sha256sum }} +# Install the yazi plugins pinned in yazi/package.toml whenever it changes. +# ~/.config/yazi links to the source dir, so they land in yazi/plugins/ +# (gitignored, except the vendored bunny.yazi). +# package.toml hash: {{ include "yazi/package.toml" | sha256sum }} set -eu command -v ya >/dev/null 2>&1 || exit 0 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/yazi/package.toml" ] || exit 0 -ya pkg install +# ya's clone cache is disposable and clones made by an older ya can break a +# newer one, so rebuild it once before giving up. +ya pkg install || { + rm -rf "${XDG_CACHE_HOME:-$HOME/.cache}/yazi/packages" + ya pkg install +}