diff --git a/assets/branding/icon.txt b/assets/branding/icon.txt index 0bdd125..93fd686 100644 --- a/assets/branding/icon.txt +++ b/assets/branding/icon.txt @@ -1,34 +1,34 @@ - ,,, - ,, ,,,,,, - ,,,,,,,, ,,,,,,,,,, - ,,,,,,,,,,,,,, .,,,,,,,,,,,, - ,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,,,,,,,,. ,,,,,,,,,,,,,,,,,,, - .,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,, -, ,,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,, -,,, ,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,, -,,,,,, .,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,. ,,,,,,,,,,,,,,,,,,,,,,,,, ,,, .,,,,,,,,,,,, -,,,,,,,,,,,, .,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,. ,,,,,,,,,,,,, -,,,,,,,,,,,,, ,, ,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,, ,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,, ,,,,,,,,,,,,,,,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,,,,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,,,,,,,,,, ,,,,,,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,, ,,,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,, ,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,, -,,,,,,,,,,,,, ,,, ,,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,, -,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,, .,,,,, -,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,, ,,, -,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,, .,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,, ,,,,,,,,,,,,,, -,,,,,,,,,, ,,,,,,,,,. -,,,,,, ,, -,,,, + ${2},,, + ${1},, ${2},,,,,, + ${1},,,,,,,, ${2},,,,,,,,,, + ${1},,,,,,,,,,,,,, ${2}.,,,,,,,,,,,, + ${1},,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,,,,,, +${1},,,,,,,,,,,,,,,,,,,,,,,. ${2},,,,,,,,,,,,,,,,,,, + ${1}.,,,,,,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,,,,,,,,,,,,, +${1}, ${1},,,,,,,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,,,,,,,,,,,,,, +${1},,, ${1},,,,,,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,,,,,,,,,,,,,, +${1},,,,,, ${1}.,,,,,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,,,,,,,,,, +${1},,,,,,,,,. ${1},,,,,,,,,,,,,,,,,,,,,,,,, ${2},,, ${2}.,,,,,,,,,,,, +${1},,,,,,,,,,,, ${1}.,,,,,,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,,,,,,,. ${2},,,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},, ${1},,,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,, ${1},,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,, ${1},,,,,,,,,,,,,,,, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,,,, ${1},,,,,,,,,,,,, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,,,,,,,, ${1},,,,,,,,,, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,, ${1},,,,,,, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,, ${1},,,, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,,,,, ${1},, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,, ${1},,,,,,,,,,,,,,,,,,,,,,,,, ${2},,,,,,,,, +${1},,,,,,,,,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,,,,,,, ${2}.,,,,, +${1},,,,,,,,,,,,,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,,,,,,,, ${2},,, +${1},,,,,,,,,,,,,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,,,,,,,, +${1},,,,,,,,,,,,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,,,,,,,, +${1},,,,,,,,,,,,,,,,,,, ${1},,,,,,,,,,,,,,,,,,,,,,, +${1},,,,,,,,,,,,,,,, ${1}.,,,,,,,,,,,,,,,,,,, +${1},,,,,,,,,,,,, ${1},,,,,,,,,,,,,, +${1},,,,,,,,,, ${1},,,,,,,,,. +${1},,,,,, ${1},, +${1},,,, diff --git a/bin/appearance/nomarchy-show-logo b/bin/appearance/nomarchy-show-logo index 7c9d35a..c279063 100755 --- a/bin/appearance/nomarchy-show-logo +++ b/bin/appearance/nomarchy-show-logo @@ -1,10 +1,9 @@ #!/bin/bash -# Display the Nnomarchy logo in the terminal using green color. +# Display the Nomarchy logo in the terminal using green color. # Used by various presentation scripts to show branding. clear echo -e "\033[32m" -cat < ~/.config/nnomarchy/branding/logo.txt +cat < ~/.config/nomarchy/branding/logo.txt echo -e "\033[0m" -echo diff --git a/bin/apps/nomarchy-launch-floating-terminal-with-presentation b/bin/apps/nomarchy-launch-floating-terminal-with-presentation index 7b864d7..ef4acf6 100755 --- a/bin/apps/nomarchy-launch-floating-terminal-with-presentation +++ b/bin/apps/nomarchy-launch-floating-terminal-with-presentation @@ -1,7 +1,7 @@ #!/bin/bash -# Launch a floating terminal with the Nnomarchy logo presentation, then execute the command passed in, and finally end with the nnomarchy-show-done presentation. +# Launch a floating terminal with the Nomarchy logo presentation, then execute the command passed in, and finally end with the nomarchy-show-done presentation. # Used by actions such as Update System. cmd="$*" -exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.nnomarchy.terminal --title=Nnomarchy -e bash -c "nnomarchy-show-logo; $cmd; if (( \$? != 130 )); then nnomarchy-show-done; fi" +exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.nomarchy.terminal --title=Nomarchy -e bash -c "nomarchy-show-logo; $cmd; if (( \$? != 130 )); then nomarchy-show-done; fi" diff --git a/bin/utils/nomarchy-cmd-screensaver b/bin/utils/nomarchy-cmd-screensaver index 954e780..ab9d38b 100755 --- a/bin/utils/nomarchy-cmd-screensaver +++ b/bin/utils/nomarchy-cmd-screensaver @@ -1,15 +1,15 @@ #!/bin/bash -# Run the Nnomarchy screensaver using random effects from TTE. +# Run the Nomarchy screensaver using random effects from TTE. screensaver_in_focus() { - hyprctl activewindow -j | jq -e '.class == "org.nnomarchy.screensaver"' >/dev/null 2>&1 + hyprctl activewindow -j | jq -e '.class == "org.nomarchy.screensaver"' >/dev/null 2>&1 } exit_screensaver() { hyprctl keyword cursor:invisible false &>/dev/null || true pkill -x tte 2>/dev/null - pkill -f org.nnomarchy.screensaver 2>/dev/null + pkill -f org.nomarchy.screensaver 2>/dev/null exit 0 } @@ -23,7 +23,7 @@ hyprctl keyword cursor:invisible true &>/dev/null tty=$(tty 2>/dev/null) while true; do - tte -i ~/.config/nnomarchy/branding/screensaver.txt \ + tte -i ~/.config/nomarchy/branding/logo.txt \ --frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\ --random-effect --exclude-effects dev_worm \ --no-eol --no-restore-cursor & diff --git a/bin/utils/nomarchy-welcome b/bin/utils/nomarchy-welcome index f1e66d3..1b02a39 100755 --- a/bin/utils/nomarchy-welcome +++ b/bin/utils/nomarchy-welcome @@ -1,6 +1,6 @@ #!/usr/bin/env bash -FLAG_FILE="$HOME/.config/nnomarchy/.first-run-done" +FLAG_FILE="$HOME/.config/nomarchy/.first-run-done" if [ -f "$FLAG_FILE" ]; then exit 0 @@ -16,28 +16,28 @@ fi gum style \ --foreground 212 --border-foreground 212 --border double \ --align center --width 50 --margin "1 2" --padding "2 4" \ - "Nnomarchy" "The NixOS Distribution with Nomarchy Flavour" + "Nomarchy" "The NixOS Distribution with Nomarchy Flavour" echo "Welcome! Let's personalize your new system." echo "" # 1. Select initial theme echo "Step 1: Choose your starting theme" -nnomarchy-theme-selector +nomarchy-theme-set "$(nomarchy-theme-list | gum filter --placeholder 'Select a theme...')" # 2. Select initial font echo "Step 2: Choose your preferred font" -nnomarchy-font-selector +nomarchy-font-set "$(nomarchy-font-list | gum filter --placeholder 'Select a font...')" # 3. Setup Local Repo (Crucial for env-update to work) echo "" -echo "Nnomarchy relies on a local git repository for declarative updates." +echo "Nomarchy relies on a local git repository for declarative updates." if [ ! -d "/etc/nixos/.git" ]; then echo "Warning: /etc/nixos is not a git repository. Declarative updates might fail." if gum confirm "Would you like to initialize /etc/nixos as a git repo?"; then sudo git -C /etc/nixos init sudo git -C /etc/nixos add . - sudo git -C /etc/nixos commit -m "Initial Nnomarchy System Commit" + sudo git -C /etc/nixos commit -m "Initial Nomarchy System Commit" fi fi @@ -45,5 +45,5 @@ fi mkdir -p "$(dirname "$FLAG_FILE")" touch "$FLAG_FILE" -gum style --foreground 82 "Setup complete! Enjoy your Nnomarchy experience." +gum style --foreground 82 "Setup complete! Enjoy your Nomarchy experience." sleep 3 diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index ba701a3..67fe88b 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -2,8 +2,8 @@ "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "logo": { "type": "file", - "source": "~/.config/nomarchy/branding/logo.txt", - "color": { "1": "green" }, + "source": "~/.config/nomarchy/branding/icon.txt", + "color": { "1": "green", "2": "blue" }, "padding": { "top": 2, "right": 6, diff --git a/modules/home/theme-files.nix b/modules/home/theme-files.nix index b872f09..92b526e 100644 --- a/modules/home/theme-files.nix +++ b/modules/home/theme-files.nix @@ -11,6 +11,9 @@ # Expose branding assets xdg.configFile."nomarchy/branding/logo.png".source = ../../assets/branding/logo.png; xdg.configFile."nomarchy/branding/logo.txt".source = ../../assets/branding/logo.txt; + xdg.configFile."nomarchy/branding/logo.svg".source = ../../assets/branding/logo.svg; + xdg.configFile."nomarchy/branding/icon.png".source = ../../assets/branding/icon.png; + xdg.configFile."nomarchy/branding/icon.txt".source = ../../assets/branding/icon.txt; # Expose all themes to the system via local share for script accessibility xdg.dataFile."nomarchy/themes".source = ../../assets/themes;