diff --git a/bin/omarchy-cmd-screensaver b/bin/omarchy-cmd-screensaver index bc86169c..9bf5ba37 100755 --- a/bin/omarchy-cmd-screensaver +++ b/bin/omarchy-cmd-screensaver @@ -3,7 +3,7 @@ if command -v tte &>/dev/null; then while true; do effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1) - tte -i ~/.config/omarchy/screensaver.txt \ + tte -i ~/.config/omarchy/branding/screensaver.txt \ --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \ "$effect" & diff --git a/bin/omarchy-menu b/bin/omarchy-menu index 5cfe3a0e..ca52b819 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -63,11 +63,12 @@ show_learn_menu() { } show_style_menu() { - case $(menu "Style" "󰸌 Theme\n Font\n Background\n󱄄 Screensaver") in + case $(menu "Style" "󰸌 Theme\n Font\n Background\n󱄄 Screensaver\n About") in *Theme*) show_theme_menu ;; *Font*) show_font_menu ;; *Background*) omarchy-theme-bg-next ;; - *Screensaver*) edit_in_nvim ~/.config/omarchy/screensaver.txt ;; + *Screensaver*) edit_in_nvim ~/.config/omarchy/branding/screensaver.txt ;; + *About*) edit_in_nvim ~/.config/omarchy/branding/about.txt ;; *) show_main_menu ;; esac } diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index cfb53298..cc841a50 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -1,9 +1,13 @@ { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "logo": { + "type": "file", + "source": "~/.config/omarchy/branding/about.txt", + "color": { "1": "green" }, "padding": { - "top": 5, - "right": 6 + "top": 2, + "right": 6, + "left": 2 } }, "modules": [ diff --git a/icon.txt b/icon.txt new file mode 100644 index 00000000..bf3ea8f4 --- /dev/null +++ b/icon.txt @@ -0,0 +1,26 @@ +██████████████████████████████████████████████████████ +██████████████████████████████████████████████████████ +████ ████ ████ +████ ████ ████ +████ █████████████████████ ████████ ████ +████ █████████████████████ ████████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████████████ ████ ████ +████████████ ████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████ ████ ████ ████ +████ ██████████████████████████████████████ ████ +████ ██████████████████████████████████████ ████ +████ ████ ████ +████ ████ ████ +█████████████████████████████ ████████████████████ +█████████████████████████████ ████████████████████ diff --git a/install.sh b/install.sh index 3d042a39..2bf5cfad 100755 --- a/install.sh +++ b/install.sh @@ -66,6 +66,7 @@ show_logo beams 240 show_subtext "Let's install Omarchy!" source $OMARCHY_INSTALL/config/identification.sh source $OMARCHY_INSTALL/config/config.sh +source $OMARCHY_INSTALL/config/branding.sh source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh source $OMARCHY_INSTALL/config/fix-fkeys.sh source $OMARCHY_INSTALL/config/network.sh diff --git a/install/config/branding.sh b/install/config/branding.sh new file mode 100644 index 00000000..091ceb74 --- /dev/null +++ b/install/config/branding.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +mkdir -p ~/.config/omarchy/branding +cp ~/.local/share/omarchy/icon.txt ~/.config/omarchy/branding/about.txt +cp ~/.local/share/omarchy/logo.txt ~/.config/omarchy/branding/screensaver.txt diff --git a/migrations/1755867743.sh b/migrations/1755867743.sh index 640d0139..62b0b416 100644 --- a/migrations/1755867743.sh +++ b/migrations/1755867743.sh @@ -1,3 +1,3 @@ -echo "Copy Omarchy logo to ~/.config/omarchy/screensaver.txt so screensaver can be personalized" +echo "Copy Omarchy logo to ~/.config/omarchy/branding/screensaver.txt so screensaver can be personalized" -cp $OMARCHY_PATH/logo.txt ~/.config/omarchy/screensaver.txt +cp $OMARCHY_PATH/logo.txt ~/.config/omarchy/branding/screensaver.txt diff --git a/migrations/1755904244.sh b/migrations/1755904244.sh new file mode 100644 index 00000000..4d935cf2 --- /dev/null +++ b/migrations/1755904244.sh @@ -0,0 +1,6 @@ +echo "Update fastfetch config with new Omarchy logo" + +omarchy-refresh-config fastfetch/config.jsonc + +mkdir -p ~/.config/omarchy/branding +cp $OMARCHY_PATH/icon.txt ~/.config/omarchy/branding/about.txt