refactor(themes): move theme assets under omarchy-themes

mise.toml

@@ -3,7 +3,6 @@ USER_FULLNAME = "Steve Beaulac"
 USER_EMAIL = "steve@beaulac.me"
 DOTFILES_DIR = "{{config_root}}"
 SECOND_BRAIN = "~/Documents/sjb-brain"
-THEMES_STATE_DIR = ".local/state/omarchy/current/theme"
 
 [env]
 DOTFILES_DIR = "{{config_root}}"
@@ -60,6 +59,8 @@ dotfiles.default_mode = "symlink-each"
 "~/.config/zero" = "config/zero"
 "~/.sandboxec" = "config/sandboxec"
 
+"~/.config/omarchy/themed" = { source = "default/themed", mode = "symlink-each" }
+
 "~/.local/share/fonts/" = { source = "fonts", mode = "copy" }
 
 # Desktop files
@@ -104,34 +105,6 @@ dotfiles.default_mode = "symlink-each"
 
 "~/.local/bin/strata" = { source = "bin/strata", mode = "symlink" }
 "~/.config/strata/settings.toml" = { source = "config/strata/settings.toml", mode = "symlink" }
-"~/.local/bin/omarchy-cmd-missing" = { source = "script/omarchy-cmd-missing", mode = "symlink" }
-"~/.local/bin/omarchy-cmd-present" = { source = "script/omarchy-cmd-present", mode = "symlink" }
-"~/.local/bin/omarchy-hook" = { source = "script/omarchy-hook", mode = "symlink" }
-"~/.local/bin/omarchy-restart-btop" = { source = "script/omarchy-restart-btop", mode = "symlink" }
-"~/.local/bin/omarchy-restart-hyprctl" = { source = "script/omarchy-restart-hyprctl", mode = "symlink" }
-"~/.local/bin/omarchy-restart-hypridle" = { source = "script/omarchy-restart-hypridle", mode = "symlink" }
-"~/.local/bin/omarchy-restart-mako" = { source = "script/omarchy-restart-mako", mode = "symlink" }
-"~/.local/bin/omarchy-restart-tmux" = { source = "script/omarchy-restart-tmux", mode = "symlink" }
-"~/.local/bin/omarchy-theme-bg-next" = { source = "script/omarchy-theme-bg-next", mode = "symlink" }
-"~/.local/bin/omarchy-theme-bg-set" = { source = "script/omarchy-theme-bg-set", mode = "symlink" }
-"~/.local/bin/omarchy-theme-colors-from-alacritty" = { source = "script/omarchy-theme-colors-from-alacritty", mode = "symlink" }
-"~/.local/bin/omarchy-theme-color" = { source = "script/omarchy-theme-color", mode = "symlink" }
-"~/.local/bin/omarchy-theme-current" = { source = "script/omarchy-theme-current", mode = "symlink" }
-"~/.local/bin/omarchy-theme-install" = { source = "script/omarchy-theme-install", mode = "symlink" }
-"~/.local/bin/omarchy-theme-list" = { source = "script/omarchy-theme-list", mode = "symlink" }
-"~/.local/bin/omarchy-theme-refresh" = { source = "script/omarchy-theme-refresh", mode = "symlink" }
-"~/.local/bin/omarchy-theme-remove" = { source = "script/omarchy-theme-remove", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set" = { source = "script/omarchy-theme-set", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set-browser" = { source = "script/omarchy-theme-set-browser", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set-foot" = { source = "script/omarchy-theme-set-foot", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set-gnome" = { source = "script/omarchy-theme-set-gnome", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set-keyboard" = { source = "script/omarchy-theme-set-keyboard", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set-keyboard-asus-rog" = { source = "script/omarchy-theme-set-keyboard-asus-rog", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set-keyboard-f16" = { source = "script/omarchy-theme-set-keyboard-f16", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set-obsidian" = { source = "script/omarchy-theme-set-obsidian", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set-templates" = { source = "script/omarchy-theme-set-templates", mode = "symlink" }
-"~/.local/bin/omarchy-theme-set-vscode" = { source = "script/omarchy-theme-set-vscode", mode = "symlink" }
-"~/.local/bin/omarchy-theme-update" = { source = "script/omarchy-theme-update", mode = "symlink" }
 
 [bootstrap.user]
 login_shell = "/usr/bin/fish"
@@ -145,19 +118,6 @@ login_shell = "/usr/bin/fish"
 "pacman:harper" = "latest"
 "pacman:tree-sitter-cli" = "latest"
 
-[tasks.setup_theme]
-run = [
-  'mkdir -p ~/.config/strata/themes && ln -snf ~/.local/state/omarchy/current/theme/strata.toml ~/.config/strata/themes/omarchy.toml',
-  'mkdir -p ~/.config/btop/themes && ln -snf ~/.local/state/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme',
-  'mkdir -p ~/.config/ghostty && ln -snf ~/.local/state/omarchy/current/theme/ghostty.conf ~/.config/ghostty/theme',
-  'mkdir -p ~/.config/hypr && ln -snf ~/.local/state/omarchy/current/theme/hyprland.lua ~/.config/hypr/theme.lua',
-  'mkdir -p ~/.config/nvim/plugin && ln -snf ~/.local/state/omarchy/current/theme/neovim-vimpack.lua ~/.config/nvim/plugin/theme.lua',
-  'mkdir -p ~/.config/mako && ln -snf ~/.local/state/omarchy/current/theme/mako.ini ~/.config/mako/config',
-  'mkdir -p ~/.config/rofi && ln -snf ~/.local/state/omarchy/current/theme/rofi.rasi ~/.config/rofi/theme.rasi',
-  'mkdir -p ~/.config/rio/themes && ln -snf ~/.local/state/omarchy/current/theme/rio.toml ~/.config/rio/themes/omarchy.toml',
-  'mkdir -p ~/.config/tmux && ln -snf ~/.local/state/omarchy/current/theme/tmux ~/.config/tmux/theme',
-]
-
 [tasks.shells]
 description = "Script to setup some cli environment"
 run = [
@@ -167,9 +127,6 @@ run = [
   'fc-cache',
 ]
 
-[bootstrap.hooks.pre-packages]
-run = "test -d ~/.local/state/omarchy/current/theme || rsync -av config/omarchy/default/ ~/.local/state/omarchy/current/theme/ --mkpath"
-
 [tasks.desktop]
 description = "setup gui"
 run = [
@@ -188,15 +145,6 @@ run = [
   'xdg-settings set default-url-scheme-handler obsidian obsidian.desktop',
 ]
 
-[tasks.theme]
-description = 'configure theme'
-run = [
-  'gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"',
-  'gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"',
-  'gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"',
-  'omarchy-theme-set "tokyo-night"',
-]
-
 [tasks.webapps]
 description = 'create all web application'
 run = [
@@ -218,4 +166,4 @@ run = [
 ]
 
 [tasks.bootstrap]
-depends = ['shells', 'desktop', 'theme', 'webapps']
+depends = ['shells', 'desktop', 'webapps']

omarchy-themes/mise.toml

@@ -0,0 +1,63 @@
+[vars]
+THEMES_STATE_DIR = ".local/state/omarchy/current/theme"
+OMARCHY_PATH = "{{config_root}}"
+
+[dotfiles]
+"~/.config/environment.d/omarchy.conf" = { source = "templates/environment-omarchy.tmpl", mode = "template", template = "tera" }
+"~/.local/bin/omarchy-cmd-missing" = { source = "script/omarchy-cmd-missing", mode = "symlink" }
+"~/.local/bin/omarchy-cmd-present" = { source = "script/omarchy-cmd-present", mode = "symlink" }
+"~/.local/bin/omarchy-hook" = { source = "script/omarchy-hook", mode = "symlink" }
+"~/.local/bin/omarchy-restart-btop" = { source = "script/omarchy-restart-btop", mode = "symlink" }
+"~/.local/bin/omarchy-restart-hyprctl" = { source = "script/omarchy-restart-hyprctl", mode = "symlink" }
+"~/.local/bin/omarchy-restart-hypridle" = { source = "script/omarchy-restart-hypridle", mode = "symlink" }
+"~/.local/bin/omarchy-restart-mako" = { source = "script/omarchy-restart-mako", mode = "symlink" }
+"~/.local/bin/omarchy-restart-tmux" = { source = "script/omarchy-restart-tmux", mode = "symlink" }
+"~/.local/bin/omarchy-theme-bg-next" = { source = "script/omarchy-theme-bg-next", mode = "symlink" }
+"~/.local/bin/omarchy-theme-bg-set" = { source = "script/omarchy-theme-bg-set", mode = "symlink" }
+"~/.local/bin/omarchy-theme-colors-from-alacritty" = { source = "script/omarchy-theme-colors-from-alacritty", mode = "symlink" }
+"~/.local/bin/omarchy-theme-color" = { source = "script/omarchy-theme-color", mode = "symlink" }
+"~/.local/bin/omarchy-theme-current" = { source = "script/omarchy-theme-current", mode = "symlink" }
+"~/.local/bin/omarchy-theme-install" = { source = "script/omarchy-theme-install", mode = "symlink" }
+"~/.local/bin/omarchy-theme-list" = { source = "script/omarchy-theme-list", mode = "symlink" }
+"~/.local/bin/omarchy-theme-refresh" = { source = "script/omarchy-theme-refresh", mode = "symlink" }
+"~/.local/bin/omarchy-theme-remove" = { source = "script/omarchy-theme-remove", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set" = { source = "script/omarchy-theme-set", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set-browser" = { source = "script/omarchy-theme-set-browser", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set-foot" = { source = "script/omarchy-theme-set-foot", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set-gnome" = { source = "script/omarchy-theme-set-gnome", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set-keyboard" = { source = "script/omarchy-theme-set-keyboard", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set-keyboard-asus-rog" = { source = "script/omarchy-theme-set-keyboard-asus-rog", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set-keyboard-f16" = { source = "script/omarchy-theme-set-keyboard-f16", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set-obsidian" = { source = "script/omarchy-theme-set-obsidian", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set-templates" = { source = "script/omarchy-theme-set-templates", mode = "symlink" }
+"~/.local/bin/omarchy-theme-set-vscode" = { source = "script/omarchy-theme-set-vscode", mode = "symlink" }
+"~/.local/bin/omarchy-theme-update" = { source = "script/omarchy-theme-update", mode = "symlink" }
+"~/.local/share/themes/available" = { source = "themes", mode = "symlink" }
+
+[tasks.setup_theme]
+run = [
+  'mkdir -p ~/.config/strata/themes && ln -snf ~/.local/state/omarchy/current/theme/strata.toml ~/.config/strata/themes/omarchy.toml',
+  'mkdir -p ~/.config/btop/themes && ln -snf ~/.local/state/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme',
+  'mkdir -p ~/.config/ghostty && ln -snf ~/.local/state/omarchy/current/theme/ghostty.conf ~/.config/ghostty/theme',
+  'mkdir -p ~/.config/hypr && ln -snf ~/.local/state/omarchy/current/theme/hyprland.lua ~/.config/hypr/theme.lua',
+  'mkdir -p ~/.config/nvim/plugin && ln -snf ~/.local/state/omarchy/current/theme/neovim-vimpack.lua ~/.config/nvim/plugin/theme.lua',
+  'mkdir -p ~/.config/mako && ln -snf ~/.local/state/omarchy/current/theme/mako.ini ~/.config/mako/config',
+  'mkdir -p ~/.config/rofi && ln -snf ~/.local/state/omarchy/current/theme/rofi.rasi ~/.config/rofi/theme.rasi',
+  'mkdir -p ~/.config/rio/themes && ln -snf ~/.local/state/omarchy/current/theme/rio.toml ~/.config/rio/themes/omarchy.toml',
+  'mkdir -p ~/.config/tmux && ln -snf ~/.local/state/omarchy/current/theme/tmux ~/.config/tmux/theme',
+]
+
+[bootstrap.hooks.pre-packages]
+run = "test -d ~/.local/state/omarchy/current/theme || rsync -av config/omarchy/default/ ~/.local/state/omarchy/current/theme/ --mkpath"
+
+[tasks.theme]
+description = 'configure theme'
+run = [
+  'gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"',
+  'gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"',
+  'gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"',
+  'omarchy-theme-set "tokyo-night"',
+]
+
+[tasks.bootstrap]
+depends = ["theme"]

omarchy-themes/script/omarchy-theme-list

@@ -5,7 +5,7 @@
 
 {
   find ~/.config/omarchy/themes/ -mindepth 1 -maxdepth 1 \( -type d -o -type l \) -printf '%f\n'
-  find "${DOTFILES_DIR}/themes/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n'
+  find "${OMARCHY_PATH}/themes/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n'
 } | sort -u | while read -r name; do
   echo "$name" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
 done

omarchy-themes/script/omarchy-theme-set

@@ -12,7 +12,7 @@ fi
 CURRENT_THEME_PATH="$HOME/.local/state/omarchy/current/theme"
 NEXT_THEME_PATH="$HOME/.local/state/omarchy/current/next-theme"
 USER_THEMES_PATH="$HOME/.config/omarchy/themes"
-OMARCHY_THEMES_PATH="${DOTFILES_DIR}/themes"
+OMARCHY_THEMES_PATH="${OMARCHY_PATH}/themes"
 
 THEME_NAME=$(echo "$1" | sed -E 's/<[^>]+>//g' | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
 

omarchy-themes/script/omarchy-theme-set-templates

@@ -3,7 +3,7 @@
 # omarchy:summary=Generate themed config files from Omarchy templates
 # omarchy:hidden=true
 
-TEMPLATES_DIR="$DOTFILES_DIR/default/themed"
+TEMPLATES_DIR="$OMARCHY_PATH/default/themed"
 USER_TEMPLATES_DIR="$HOME/.config/omarchy/themed"
 NEXT_THEME_DIR="$HOME/.local/state/omarchy/current/next-theme"
 COLORS_FILE="$NEXT_THEME_DIR/colors.toml"

omarchy-themes/templates/environment-omarchy.tmpl

@@ -0,0 +1,3 @@
+
+THEMES_STATE_DIR = "{{ vars.THEMES_STATE_DIR }}"
+OMARCHY_PATH = "{{ vars.OMARCHY_PATH }}"