From 51cb60e67ff4d3d1c28eed6c3c328fc27ff2cc3e Mon Sep 17 00:00:00 2001 From: Collie Tsai Date: Sun, 30 Aug 2026 00:02:39 +0800 Subject: [PATCH 1/2] chore(theme): use upstream tmux template Remove the Linux user-template downloader now that tmux is published in the Noctalia community catalog. Point the macOS Matugen input at the upstream merge commit and refresh the theme documentation. --- README.md | 5 ++--- home/.chezmoiexternal.toml | 4 ++-- home/dot_config/noctalia/config.toml | 19 +------------------ 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index aec5301..94a2fd6 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ chezmoi init --apply collieiscute -v - Linux uses Noctalia's wallpaper-derived **light** palette; macOS and Windows use Matugen with the same per-app theme paths. - Generated app themes stay outside chezmoi. [`.chezmoiexternal.toml`](home/.chezmoiexternal.toml) only pins the Matugen template inputs. -- Fish and cursor themes stay independent. +- Fish inherits the terminal ANSI palette; cursor themes stay independent. - Font: **JetBrainsMono Nerd Font** across every terminal / bar / lock screen. ### chezmoi quirks I keep tripping over (that this repo handles) @@ -204,7 +204,7 @@ AeroSpace restores the swapped root layouts and window states where possible; it - [`aerospace`](https://github.com/nikitabobko/AeroSpace) — tiling WM. - [`karabiner-elements`](https://karabiner-elements.pqrs.org) — keyboard remapper. - [`raycast`](https://raycast.com) — launcher. -- Desktop wallpaper is deployed by chezmoi to `~/.config/wallpapers` and applied by `run_onchange_after_3-configure-macos-wallpaper.sh.tmpl`. +- Desktop wallpaper is deployed by chezmoi to `~/.config/wallpapers`; `run_onchange_after_6-apply-theme.sh.tmpl` applies the initial wallpaper and Matugen palette, and `chezmoi theme [IMAGE]` changes both later. ### CLI tooling @@ -228,7 +228,6 @@ AeroSpace restores the swapped root layouts and window states where possible; it ### Fish plugins (managed by [`fisher`](https://github.com/jorgebucaran/fisher)) -- `catppuccin/fish` — colour theme. - `edc/bass` — run bash scripts in fish. - `jorgebucaran/nvm.fish` — Node version manager. - `patrickf1/fzf.fish` — fzf integrations. diff --git a/home/.chezmoiexternal.toml b/home/.chezmoiexternal.toml index 9ff6bd9..7e0a698 100644 --- a/home/.chezmoiexternal.toml +++ b/home/.chezmoiexternal.toml @@ -14,12 +14,12 @@ checksum.sha256 = "65284a68c482fa5226cb937bb7e9fc094e14eb66f2688fc8a646503300a46 {{ if eq .chezmoi.os "darwin" -}} [".config/matugen/templates/tmux/tmux.conf"] type = "file" -url = "https://raw.githubusercontent.com/CollieIsCute/community-templates/6d7e23d9ca015dcdab68d73a896c2f99c9086a92/tmux/tmux.conf" +url = "https://raw.githubusercontent.com/noctalia-dev/community-templates/12b4e17e371de6aa8ee56303d1d4ee5374ff5565/tmux/tmux.conf" checksum.sha256 = "1e0ec6100855f3f303ed02fb22c3cac1d608a06db2ec23b61217b2556800c54a" [".config/matugen/templates/tmux/apply.sh"] type = "file" -url = "https://raw.githubusercontent.com/CollieIsCute/community-templates/6d7e23d9ca015dcdab68d73a896c2f99c9086a92/tmux/apply.sh" +url = "https://raw.githubusercontent.com/noctalia-dev/community-templates/12b4e17e371de6aa8ee56303d1d4ee5374ff5565/tmux/apply.sh" checksum.sha256 = "8e5e7adaa14588251924e926e4a6378523d8b42d64ba991e9094f0bafe8c3a70" {{ end -}} diff --git a/home/dot_config/noctalia/config.toml b/home/dot_config/noctalia/config.toml index 4fa755a..b5a4a12 100644 --- a/home/dot_config/noctalia/config.toml +++ b/home/dot_config/noctalia/config.toml @@ -53,24 +53,7 @@ wallpaper_scheme = "faithful" enable_builtin_templates = true enable_community_templates = true builtin_ids = ["alacritty", "btop", "ghostty", "gtk3", "gtk4", "hyprland", "kitty", "qt", "wezterm"] -community_ids = ["opencode", "discord", "telegram", "neovim", "steam", "fastfetch", "zellij", "bat", "lazygit"] - -# Temporary until https://github.com/noctalia-dev/community-templates/pull/101 lands. -[theme.templates.user.tmux] -input_path = "$XDG_CACHE_HOME/noctalia/community-templates/tmux-6d7e23d/tmux.conf" -output_path = "$XDG_CONFIG_HOME/tmux/themes/noctalia.conf" -pre_hook = ''' -set -eu -cache="${XDG_CACHE_HOME:-$HOME/.cache}/noctalia/community-templates/tmux-6d7e23d" -if [ ! -s "$cache/tmux.conf" ] || [ ! -s "$cache/apply.sh" ]; then - mkdir -p "$cache" - curl -fsSL "https://raw.githubusercontent.com/CollieIsCute/community-templates/6d7e23d9ca015dcdab68d73a896c2f99c9086a92/tmux/tmux.conf" -o "$cache/tmux.conf.tmp" - curl -fsSL "https://raw.githubusercontent.com/CollieIsCute/community-templates/6d7e23d9ca015dcdab68d73a896c2f99c9086a92/tmux/apply.sh" -o "$cache/apply.sh.tmp" - mv "$cache/tmux.conf.tmp" "$cache/tmux.conf" - mv "$cache/apply.sh.tmp" "$cache/apply.sh" -fi -''' -post_hook = 'bash "${XDG_CACHE_HOME:-$HOME/.cache}/noctalia/community-templates/tmux-6d7e23d/apply.sh"' +community_ids = ["opencode", "discord", "telegram", "neovim", "steam", "fastfetch", "zellij", "bat", "lazygit", "tmux"] [notification] enable_daemon = true From 19c70af653cbd542f6c8d912129b63994f8a98e2 Mon Sep 17 00:00:00 2001 From: Collie Tsai Date: Sun, 30 Aug 2026 00:09:57 +0800 Subject: [PATCH 2/2] chore(theme): track latest tmux template --- home/.chezmoiexternal.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/.chezmoiexternal.toml b/home/.chezmoiexternal.toml index 7e0a698..e4981f2 100644 --- a/home/.chezmoiexternal.toml +++ b/home/.chezmoiexternal.toml @@ -14,13 +14,13 @@ checksum.sha256 = "65284a68c482fa5226cb937bb7e9fc094e14eb66f2688fc8a646503300a46 {{ if eq .chezmoi.os "darwin" -}} [".config/matugen/templates/tmux/tmux.conf"] type = "file" -url = "https://raw.githubusercontent.com/noctalia-dev/community-templates/12b4e17e371de6aa8ee56303d1d4ee5374ff5565/tmux/tmux.conf" -checksum.sha256 = "1e0ec6100855f3f303ed02fb22c3cac1d608a06db2ec23b61217b2556800c54a" +url = "https://raw.githubusercontent.com/noctalia-dev/community-templates/main/tmux/tmux.conf" +refreshPeriod = "24h" [".config/matugen/templates/tmux/apply.sh"] type = "file" -url = "https://raw.githubusercontent.com/noctalia-dev/community-templates/12b4e17e371de6aa8ee56303d1d4ee5374ff5565/tmux/apply.sh" -checksum.sha256 = "8e5e7adaa14588251924e926e4a6378523d8b42d64ba991e9094f0bafe8c3a70" +url = "https://raw.githubusercontent.com/noctalia-dev/community-templates/main/tmux/apply.sh" +refreshPeriod = "24h" {{ end -}} [".config/matugen/templates/neovim.lua"]