Merge pull request #434 from basecamp/dev

Omarchy v1.9.0

bin/omarchy

@@ -5,17 +5,22 @@ PATH="$PATH:$HOME/.local/share/omarchy/bin"
 
 show_ascii_art() {
   clear
-  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 640 expand
-  echo "                                                                                 $OMARCHY_VERSION"
+  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 640 --no-color expand
+  echo "                                                                          $OMARCHY_VERSION"
 }
 
 main_menu() {
   show_ascii_art
 
-  local options=("Theme" "Setup" "Update" "Manual" "Exit")
+  local options=("Theme" "Font" "Setup" "Update" "Manual" "Exit")
   choice=$(printf "%s\n" "${options[@]}" | gum choose --header "") || exit 0
   case "$choice" in
   Theme) theme_menu ;;
+  Font)
+    omarchy-font-menu
+    ack_command
+    main_menu
+    ;;
   Update) update_menu ;;
   Setup) setup_menu ;;
   Manual) open_manual ;;
@@ -53,10 +58,11 @@ update_menu() {
 
 theme_menu() {
   show_ascii_art
-  local menu=("Pick" "Install" "Remove" "Back")
+  local menu=("Pick" "Install" "Update" "Remove" "Back")
   local commands=(
     "omarchy-theme-menu"
     "install_theme_prompt"
+    "omarchy-theme-update"
     "remove_theme_prompt"
     "main_menu"
   )

bin/omarchy-cmd-screensaver

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+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 ~/.local/share/omarchy/logo.txt \
+      --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
+      "$effect" &
+
+    while pgrep tte >/dev/null; do
+      if read -n 1 -t 0.01; then
+        pkill tte 2>/dev/null
+        exit 0
+      fi
+    done
+  done
+else
+  gum spin --title "Can't find tte. Try: pip install terminaltexteffects" -- sleep 2
+fi
+

bin/omarchy-font-menu

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+font=$(
+  fc-list :spacing=100 -f "%{family[0]}\n" |
+    grep -v -i -E 'emoji|signwriting' |
+    sort -u |
+    gum choose --header "Choose terminal font"
+)
+
+if [[ -n "$font" ]]; then
+  sed -i "s/family = \".*\"/family = \"$font\"/g" ~/.config/alacritty/alacritty.toml
+fi

bin/omarchy-launch-screensaver

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+pgrep -f "alacritty --class Screensaver" ||
+  alacritty --class Screensaver --title Screensaver -o 'colors.primary.background="#000000"' \
+    -o 'colors.cursor.cursor="#000000"' -e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver

bin/omarchy-menu-power

@@ -2,15 +2,17 @@
 
 show_power_menu() {
   # The first characters are invisible sort keys.
-  local menu_options="\u200B Lock
-\u200C󰤄 Suspend
-\u200D Relaunch
-\u2060󰜉 Restart
-\u2063󰐥 Shutdown"
+  local menu_options=" Lock
+󱄄 Save
+󰤄 Suspend
+ Relaunch
+󰜉 Restart
+󰐥 Shutdown"
   local selection=$(echo -e "$menu_options" | walker --dmenu --theme dmenu_150)
 
   case "$selection" in
   *Lock*) hyprlock ;;
+  *Save*) ~/.local/share/omarchy/bin/omarchy-launch-screensaver ;;
   *Suspend*) systemctl suspend ;;
   *Relaunch*) uwsm stop ;;
   *Restart*) systemctl reboot ;;

bin/omarchy-migrate

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Exit immediately if a command exits with a non-zero status
+set -e
+
+# Create the migrations state directory, we will store an empty file for each migration that has already been performed.
+STATE_DIR="$HOME/.local/state/omarchy/migrations"
+mkdir -p "$STATE_DIR"
+
+# Run any pending migrations
+cd ~/.local/share/omarchy
+
+for file in migrations/*.sh; do
+  filename=$(basename "$file")
+  migrate_at="${filename%.sh}"
+
+  # Migration already applied, to re-run it simply delete the state file and try again
+  [ -e "${STATE_DIR}/$filename" ] && continue
+
+  echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
+  source $file
+  touch "${STATE_DIR}/$filename"
+done
+
+# Back to where we came from
+cd - >/dev/null

bin/omarchy-refresh-config

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# This script deploys ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z
+config_file=$1
+
+if [[ -z "$config_file" ]]; then
+  cat <<USAGE
+  Usage: $0 [config_file]
+
+  Must provide a file path from the .config directory to be refreshed.
+  To copy ~/.local/share/omarchy/config/hypr/hyprlock.conf to ~/.config/hypr/hyprlock.conf
+    
+    $0 hypr/hyprlock.conf     
+USAGE
+  exit 1
+fi
+
+# Backup the destination file (with timestamp) to avoid clobbering (Ex: hyprlock.conf.bak.1753817951)
+user_config_file="${HOME}/.config/$config_file"
+default_config_file="${HOME}/.local/share/omarchy/config/$config_file"
+backup_config_file="$user_config_file.bak.$(date +%s)"
+
+# Create preliminary backup
+cp -f "$user_config_file" "$backup_config_file" 2>/dev/null
+
+# Replace config with new default
+cp -f "$default_config_file" "$user_config_file" 2>/dev/null
+
+# Compare and delete/inform accordingly
+if cmp -s "$user_config_file" "$backup_config_file"; then
+  rm "$backup_config_file"
+else
+  echo -e "\e[31mReplaced $user_config_file with new Omarchy default.\nSaved backup as ${backup_config_file}.\n\n\e[32mChanges:\e[0m"
+  diff "$user_config_file" "$backup_config_file"
+fi

bin/omarchy-refresh-hypridle

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+omarchy-refresh-config hypr/hypridle.conf
+pkill -x hypridle
+uwsm app -- hypridle >/dev/null 2>&1 &
+

bin/omarchy-refresh-hyprlock

@@ -1,11 +1,4 @@
 #!/bin/bash
 
-# Overwrite local Hyprlock settings with the latest in Omarchy, but create a backup if it differs
-cp -f ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak 2>/dev/null
-cp -f ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/ 2>/dev/null
-
-if cmp -s ~/.config/hypr/hyprlock.conf.bak ~/.config/hypr/hyprlock.conf; then
-  rm ~/.config/hypr/hyprlock.conf.bak
-else
-  echo -e "\e[31mExisting .config/hypr/hyprlock.conf replaced with new Omarchy default, but a .bak file was made.\e[0m"
-fi
+# Overwrite local Hyprlock settings with the latest in Omarchy
+omarchy-refresh-config hypr/hyprlock.conf

bin/omarchy-refresh-swayosd

@@ -1,13 +1,7 @@
 #!/bin/bash
 
-cp -f ~/.config/swayosd/config.toml ~/.config/swayosd/config.toml.bak 2>/dev/null
-cp -f ~/.local/share/omarchy/config/swayosd/config.toml ~/.config/swayosd/ 3>/dev/null
-
-if cmp -s ~/.config/swayosd/config.toml.bak ~/.config/swayosd/config.toml; then
-  rm ~/.config/swayosd//config.toml.bak
-else
-  echo -e "\e[31mExisting .config/swayosd/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m"
-fi
+omarchy-refresh-config swayosd/config.toml
+omarchy-refresh-config swayosd/style.css
 
 pkill swayosd-server
 setsid uwsm app -- swayosd-server &>/dev/null &

bin/omarchy-refresh-walker

@@ -1,13 +1,6 @@
 #!/bin/bash
 
-cp -f ~/.config/walker/config.toml ~/.config/walker/config.toml.bak 2>/dev/null
-cp -f ~/.local/share/omarchy/config/walker/config.toml ~/.config/walker/ 2>/dev/null
-
-if cmp -s ~/.config/walker/config.toml.bak ~/.config/walker/config.toml; then
-  rm ~/.config/walker/config.toml.bak
-else
-  echo -e "\e[31mExisting .config/walker/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m"
-fi
+omarchy-refresh-config walker/config.toml
 
 pkill walker
-uwsm app -- walker --gapplication-service &
+setsid uwsm app -- walker --gapplication-service &

bin/omarchy-refresh-waybar

@@ -1,25 +1,7 @@
 #!/bin/bash
 
-# Backup existing settings
-cp -f ~/.config/waybar/config.jsonc ~/.config/waybar/config.jsonc.bak 2>/dev/null
-cp -f ~/.config/waybar/style.css ~/.config/waybar/style.css.bak 2>/dev/null
-
-# Overwrite local waybar settings with the latest in Omarchy
-cp -f ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/ 2>/dev/null
-cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
-
-# Remove identical backup files
-if cmp -s ~/.config/waybar/config.jsonc.bak ~/.config/waybar/config.jsonc; then
-  rm ~/.config/waybar/config.jsonc.bak
-else
-  echo -e "\e[31mExisting .config/waybar/config.jsonc replaced with new Omarchy default, but a .bak file was made.\e[0m"
-fi
-
-if cmp -s ~/.config/waybar/style.css.bak ~/.config/waybar/style.css; then
-  rm ~/.config/waybar/style.css.bak
-else
-  echo -e "\e[31mExisting .config/waybar/style.css replaced with new Omarchy default, but a .bak file was made.\e[0m"
-fi
+omarchy-refresh-config waybar/config.jsonc
+omarchy-refresh-config waybar/style.css
 
 # Restart waybar
-pkill -SIGUSR2 waybar
+omarchy-restart-waybar

bin/omarchy-restart-waybar

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+killall waybar || true
+setsid uwsm app -- waybar &>/dev/null &

bin/omarchy-theme-menu

@@ -6,7 +6,7 @@ CURRENT_THEME_NAME=$(basename "$(realpath "$CURRENT_THEME_DIR")")
 
 # Build themes list with pretty display names
 mapfile -t themes < <(
-  find "$THEMES_DIR" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | while read -r path; do
+  find "$THEMES_DIR" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | sort | while read -r path; do
     filename=$(basename "$path")
     display_name=$(echo "$filename" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g')
 
@@ -15,7 +15,7 @@ mapfile -t themes < <(
     else
       echo "$display_name"
     fi
-  done | sort
+  done
 )
 
 # Show Walker menu

bin/omarchy-theme-set

@@ -32,12 +32,19 @@ else
   gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 fi
 
+# Change gnome icon theme color
+if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then
+  gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)"
+else
+  gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
+fi
+
 # Trigger alacritty config reload
 touch "$HOME/.config/alacritty/alacritty.toml"
 
 # Restart components to apply new theme
 pkill -SIGUSR2 btop
-pkill -SIGUSR2 waybar
+"$HOME/.local/share/omarchy/bin/omarchy-restart-waybar"
 pkill swayosd-server
 setsid uwsm app -- swayosd-server &>/dev/null &
 makoctl reload

bin/omarchy-theme-update

@@ -0,0 +1,4 @@
+#!/bin/bash
+for dir in ~/.config/omarchy/themes/*/; do
+    [ -d "$dir" ] && [ ! -L "${dir%/}" ] && echo "Updating: $(basename "$dir")" && git -C "$dir" pull
+done

bin/omarchy-update

@@ -1,31 +1,25 @@
 #!/bin/bash
 
-cd ~/.local/share/omarchy
+# Exit immediately if a command exits with a non-zero status
+set -e
 
-if [[ $1 == "all" ]]; then
-  # Run all migrations since the root commit
-  migration_starting_point=$(git log --max-parents=0 --first-parent --format="%H")
-else
-  # Remember the commit we're at before upgrading in order to only run new migrations
-  migration_starting_point=$(git log -1 --format=%H)
-fi
+# Show logo
+clear
+cat <~/.local/share/omarchy/logo.txt
 
 # Get the latest while trying to preserve any modifications
-git pull --autostash
-git diff --check || git reset --merge
+omarchy_path=~/.local/share/omarchy
+git -C $omarchy_path pull --autostash
+git -C $omarchy_path diff --check || git -C $omarchy_path reset --merge
 
-# Run any pending migrations
-for file in $(git diff --name-only --diff-filter=A $migration_starting_point.. migrations/*.sh); do
-  filename=$(basename "$file")
-  migrate_at="${filename%.sh}"
-
-  echo -e "\e[32m\nRunning migration ($migrate_at)\e[0m"
-  source $file
-done
+# Run migrations
+"$HOME/.local/share/omarchy/bin/omarchy-migrate"
 
 # Update system packages
 echo -e "\e[32m\nUpdate system packages\e[0m"
 yay -Syu --noconfirm
 
-# Back to where we came from
-cd - >/dev/null
+# Offer to reboot if the kernel has been changed
+if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
+  gum confirm "Linux kernel has been updated. Reboot?" && sudo reboot now
+fi

bin/omarchy-update-available

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+omarchy_path="$HOME/.local/share/omarchy"
+latest_tag=$(git -C $omarchy_path ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
+current_tag=$(git -C $omarchy_path describe --tags $(git -C $omarchy_path rev-list --tags --max-count=1))
+
+if [[ "$current_tag" != "$latest_tag" ]]; then
+  echo "Omarchy update available ($latest_tag)"
+  exit 0
+else
+  echo "Omarchy is up to date ($current_tag)"
+  exit 1
+fi

boot.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
-ansi_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
-███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
-███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
-███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
-███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
-███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
-███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
- ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
-                                          ███    ███                                    '
+ansi_art='                 ▄▄▄                                                   
+ ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
+███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
+███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
+███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
+███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
+███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
+███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
+ ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀ 
+                                       ███   █▀                                  '
 
 clear
 echo -e "\n$ansi_art\n"

config/fastfetch/config.jsonc

@@ -1,144 +1,149 @@
 {
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": {
-        "padding": {
-            "top": 5,
-            "right": 6
-        }
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "logo": {
+    "padding": {
+      "top": 5,
+      "right": 6
+    }
+  },
+  "modules": [
+    "break",
+    {
+      "type": "custom",
+      "format": "\u001b[90m┌──────────────────────Hardware──────────────────────┐"
     },
-    "modules": [
-        "break",
-        {
-            "type": "custom",
-            "format": "\u001b[90m┌──────────────────────Hardware──────────────────────┐"
-        },
-        {
-            "type": "host",
-            "key": " PC",
-            "keyColor": "green"
-        },
-        {
-            "type": "cpu",
-            "key": "│ ├",
-            "showPeCoreCount": true,
-            "keyColor": "green"
-        },
-        {
-            "type": "gpu",
-            "key": "│ ├",
-            "detectionMethod": "pci",
-            "keyColor": "green"
-        },
-        {
-            "type": "display",
-            "key": "│ ├󱄄",
-            "keyColor": "green"
-        },
-        {
-            "type": "disk",
-            "key": "│ ├󰋊",
-            "keyColor": "green"
-        },
-        {
-            "type": "memory",
-            "key": "│ ├",
-            "keyColor": "green"
-        },
-        {
-            "type": "swap",
-            "key": "└ └󰓡 ",
-            "keyColor": "green",
-        },
-        {
-            "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-        },
-        "break",
-        {
-            "type": "custom",
-            "format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
-        },
-        {
-            "type": "os",
-            "key": " OS",
-            "keyColor": "yellow"
-        },
-        {
-            "type": "kernel",
-            "key": "│ ├",
-            "keyColor": "yellow"
-        },
-        {
-            "type": "packages",
-            "key": "│ ├󰏖",
-            "keyColor": "yellow"
-        },
-        {
-            "type": "shell",
-            "key": "└ └",
-            "keyColor": "yellow"
-        },
-        "break",
-        {
-            "type": "de",
-            "key": " DE",
-            "keyColor": "blue"
-        },
-        {
-            "type": "wm",
-            "key": "│ ├",
-            "keyColor": "blue"
-        },
-        {
-            "type": "wmtheme",
-            "key": "│ ├󰉼",
-            "keyColor": "blue"
-        },
-        {
-            "type": "icons",
-            "key": "│ ├󰀻",
-            "keyColor": "blue",
-        },
-        {
-            "type": "cursor",
-            "key": "│ ├",
-            "keyColor": "blue",
-        },
-        {
-            "type": "terminalfont",
-            "key": "│ ├",
-            "keyColor": "blue",
-        },
-        {
-            "type": "terminal",
-            "key": "└ └",
-            "keyColor": "blue"
-        },
-        {
-            "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-        },
-        "break",
-        {
-            "type": "custom",
-            "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
-        },
-        {
-            "type": "command",
-            "key": "  OS Age ",
-            "keyColor": "magenta",
-            "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
-        },
-        {
-            "type": "uptime",
-            "key": "  Uptime ",
-            "keyColor": "magenta"
-        },
-        {
-            "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-        },
-        "break",
-    ]
+    {
+      "type": "host",
+      "key": " PC",
+      "keyColor": "green"
+    },
+    {
+      "type": "cpu",
+      "key": "│ ├",
+      "showPeCoreCount": true,
+      "keyColor": "green"
+    },
+    {
+      "type": "gpu",
+      "key": "│ ├",
+      "detectionMethod": "pci",
+      "keyColor": "green"
+    },
+    {
+      "type": "display",
+      "key": "│ ├󱄄",
+      "keyColor": "green"
+    },
+    {
+      "type": "disk",
+      "key": "│ ├󰋊",
+      "keyColor": "green"
+    },
+    {
+      "type": "memory",
+      "key": "│ ├",
+      "keyColor": "green"
+    },
+    {
+      "type": "swap",
+      "key": "└ └󰓡 ",
+      "keyColor": "green"
+    },
+    {
+      "type": "custom",
+      "format": "\u001b[90m└────────────────────────────────────────────────────┘"
+    },
+    "break",
+    {
+      "type": "custom",
+      "format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
+    },
+    {
+      "type": "os",
+      "key": " OS",
+      "keyColor": "yellow"
+    },
+    {
+      "type": "kernel",
+      "key": "│ ├",
+      "keyColor": "yellow"
+    },
+    {
+      "type": "packages",
+      "key": "│ ├󰏖",
+      "keyColor": "yellow"
+    },
+    {
+      "type": "shell",
+      "key": "└ └",
+      "keyColor": "yellow"
+    },
+    "break",
+    {
+      "type": "command",
+      "key": "│ ├Ø",
+      "keyColor": "blue",
+      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\""
+    },
+    {
+      "type": "de",
+      "key": " DE",
+      "keyColor": "blue"
+    },
+    {
+      "type": "wm",
+      "key": "│ ├",
+      "keyColor": "blue"
+    },
+    {
+      "type": "wmtheme",
+      "key": "│ ├󰉼",
+      "keyColor": "blue"
+    },
+    {
+      "type": "icons",
+      "key": "│ ├󰀻",
+      "keyColor": "blue"
+    },
+    {
+      "type": "cursor",
+      "key": "│ ├",
+      "keyColor": "blue"
+    },
+    {
+      "type": "terminalfont",
+      "key": "│ ├",
+      "keyColor": "blue"
+    },
+    {
+      "type": "terminal",
+      "key": "└ └",
+      "keyColor": "blue"
+    },
+    {
+      "type": "custom",
+      "format": "\u001b[90m└────────────────────────────────────────────────────┘"
+    },
+    "break",
+    {
+      "type": "custom",
+      "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
+    },
+    {
+      "type": "command",
+      "key": "  OS Age ",
+      "keyColor": "magenta",
+      "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
+    },
+    {
+      "type": "uptime",
+      "key": "  Uptime ",
+      "keyColor": "magenta"
+    },
+    {
+      "type": "custom",
+      "format": "\u001b[90m└────────────────────────────────────────────────────┘"
+    },
+    "break"
+  ]
 }
-

config/hypr/hypridle.conf

@@ -1,8 +1,14 @@
 general {
-    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
-    before_sleep_cmd = loginctl lock-session    # lock before suspend.
-    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
-    on_unlock_cmd = pkill -SIGUSR2 waybar       # prevent stacking of waybar when waking
+    lock_cmd = pidof hyprlock || hyprlock                  # avoid starting multiple hyprlock instances.
+    before_sleep_cmd = loginctl lock-session               # lock before suspend.
+    after_sleep_cmd = hyprctl dispatch dpms on             # to avoid having to press a key twice to turn on the display.
+    on_lock_cmd = pkill -f "alacritty --class Screensaver" # avoid running screensaver when locked
+    on_unlock_cmd = omarchy-restart-waybar                 # prevent stacking of waybar when waking
+}
+
+listener {
+    timeout = 60                            # 1min
+    on-timeout = omarchy-launch-screensaver # start screensaver
 }
 
 listener {

config/hypr/monitors.conf

@@ -1,17 +1,20 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
-
-# Change to 1 if on a 1x display (then change last "auto" to 1 in monitor=)
-# Change to something like 1.75 for fractional scaling (can work well with 1.66667 monitor scaling)
-# Note: You must relaunch Hyprland after changing any env like this (use Super+Esc, then Relaunch)
-env = GDK_SCALE,2
-
-# Use single default monitor (see all monitors with: hyprctl monitors)
+# List current monitors and resolutions possible: hyprctl monitors
 # Format: monitor = [port], resolution, position, scale
+# You must relaunch Hyprland after changing any envs (use Super+Esc, then Relaunch)
+
+# Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K.
+env = GDK_SCALE,2
 monitor=,preferred,auto,auto
 
-# Exmaple for fractional scaling that works well with GDK_SCALE,1.75
+# Good compromise for 27" or 32" 4K monitors (but fractional!)
+# env = GDK_SCALE,1.75
 # monitor=,preferred,auto,1.666667
 
+# Straight 1x setup for low-resolution displays like 1080p or 1440p
+# env = GDK_SCALE,1
+# monitor=,preferred,auto,1
+
 # Example for Framework 13 w/ 6K XDR Apple display
-# monitor = DP-5, 6016x3384@60.00, auto, 2
-# monitor = eDP-1, 2880x1920@120.00, auto, 2
+# monitor = DP-5, 6016x3384@60, auto, 2
+# monitor = eDP-1, 2880x1920@120, auto, 2

config/walker/config.toml

@@ -6,7 +6,7 @@ theme = "omarchy-default"
 theme_base = []
 theme_location = ["~/.local/share/omarchy/default/walker/themes/"]
 monitor = ""
-hotreload_theme = false
+hotreload_theme = true
 as_window = false
 timeout = 0
 disable_click_to_close = false
@@ -199,20 +199,21 @@ typeahead = true
 hidden = true
 
 [builtins.finder]
-use_fd = false
+use_fd = true
 fd_flags = "--ignore-vcs --type file --type directory"
 cmd_alt = "xdg-open $(dirname ~/%RESULT%)"
 weight = 5
 icon = "file"
-name = "finder"
+name = "Finder"
 placeholder = "Finder"
 switcher_only = true
 ignore_gitignore = true
 refresh = true
 concurrency = 8
 show_icon_when_single = true
-preview_images = false
-hidden = true
+preview_images = true
+hidden = false
+prefix = "."
 
 [builtins.runner]
 eager_loading = true

config/waybar/config.jsonc

@@ -8,7 +8,8 @@
     "hyprland/workspaces"
   ],
   "modules-center": [
-    "clock"
+    "clock",
+    "custom/update"
   ],
   "modules-right": [
     "group/tray-expander",
@@ -42,6 +43,12 @@
       "5": []
     }
   },
+  "custom/update": {
+    "format": "",
+    "exec": "~/.local/share/omarchy/bin/omarchy-update-available",
+    "on-click": "alacritty --class Omarchy --title Omarchy -e omarchy-update",
+    "interval": 3600
+  },
   "cpu": {
     "interval": 5,
     "format": "󰍛",

config/waybar/style.css

@@ -26,6 +26,10 @@
   min-width: 9px;
 }
 
+#workspaces button.empty {
+  opacity: 0.5;
+}
+
 #tray,
 #cpu,
 #battery,

default/bash/envs

@@ -1,3 +1,4 @@
 # Editor used by CLI
 export EDITOR="nvim"
 export SUDO_EDITOR="$EDITOR"
+export BAT_THEME=ansi

default/bash/shell

@@ -12,3 +12,6 @@ fi
 # Set complete path
 export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/omarchy/bin:$PATH"
 set +h
+
+# Omarchy path
+export OMARCHY_PATH="/home/$USER/.local/share/omarchy"

default/bashrc

@@ -0,0 +1,14 @@
+# All the default Omarchy aliases and functions
+# (don't mess with these directly, just overwrite them here!)
+source ~/.local/share/omarchy/default/bash/rc
+
+# Add your own exports, aliases, and functions here.
+#
+# Make an alias for invoking commands you use constantly
+# alias p='python'
+#
+# Use VSCode instead of neovim as your default editor
+# export EDITOR="code"
+#
+# Set a custom prompt with the directory revealed (alternatively use https://starship.rs)
+# PS1="\W \[\e]0;\w\a\]$PS1"

default/hypr/bindings/tiling.conf

@@ -43,6 +43,10 @@ bind = SUPER SHIFT, right, swapwindow, r
 bind = SUPER SHIFT, up, swapwindow, u
 bind = SUPER SHIFT, down, swapwindow, d
 
+# Cycle through applications on active workspace
+bind = ALT, Tab, cyclenext
+bind = ALT, Tab, bringactivetotop
+
 # Resize active window
 bind = SUPER, minus, resizeactive, -100 0
 bind = SUPER, equal, resizeactive, 100 0

default/hypr/bindings/utilities.conf

@@ -32,5 +32,8 @@ bind = CTRL, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot outp
 bind = ALT, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenrecord
 bind = CTRL ALT, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenrecord output
 
+# Screensaver
+bind = SUPER ALT, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-launch-screensaver
+
 # Color picker
 bind = SUPER, PRINT, exec, hyprpicker -a

default/hypr/looknfeel.conf

@@ -70,7 +70,7 @@ animations {
 }
 
 # Application-sepcific animation
-layerrule=noanim,walker
+layerrule = noanim,walker
 
 # Remove 1px border around hyprshot screenshots
 layerrule = noanim, selection

default/hypr/windows.conf

@@ -5,10 +5,11 @@ windowrule = suppressevent maximize, class:.*
 windowrule = tile, class:^(Chromium)$
 
 # Float and center settings and previews
-windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
+windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
+windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
 windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty)$
-windowrule = size 645 450, class:Omarchy
-windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
+windowrule = size 600 470, class:Omarchy
+windowrule = size 700 470 class:About
 
 # Float and center file pickers
 windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
@@ -16,9 +17,12 @@ windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Fi
 
 # Float Steam, fullscreen RetroArch
 windowrule = float, class:steam
-windowrule = center, class:steam
+windowrule = center, class:steam, title:Steam
 windowrule = fullscreen, class:^(com.libretro.RetroArch)$
 
+# Fullscreen screensaver
+windowrule = fullscreen, class:Screensaver
+
 # Just dash of opacity
 windowrule = opacity 0.97 0.9, class:.*
 windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$

default/plymouth/omarchy.script

@@ -5,8 +5,8 @@ Window.SetBackgroundBottomColor(0.101, 0.105,  0.149);
 
 logo.image = Image("logo.png");
 logo.sprite = Sprite(logo.image);
-logo.sprite.SetX (Window.GetX() + Window.GetWidth()  / 2 - logo.image.GetWidth()  / 2);
-logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2);
+logo.sprite.SetX (Window.GetWidth()  / 2 - logo.image.GetWidth()  / 2);
+logo.sprite.SetY (Window.GetHeight() / 2 - logo.image.GetHeight() / 2);
 logo.sprite.SetOpacity (1);
 
 # Use these to adjust the progress bar timing
@@ -119,7 +119,7 @@ entry.image = Image("entry.png");
 bullet.image = Image("bullet.png");
 
 entry.sprite = Sprite(entry.image);
-entry.x = Window.GetX() + Window.GetWidth()/2 - entry.image.GetWidth() / 2;
+entry.x = Window.GetWidth()/2 - entry.image.GetWidth() / 2;
 entry.y = logo.sprite.GetY() + logo.image.GetHeight() + 40;
 entry.sprite.SetPosition(entry.x, entry.y, 10001);
 entry.sprite.SetOpacity(0);
@@ -171,8 +171,13 @@ fun display_password_callback (prompt, bullets)
     for (index = 0; bullet.sprites[index]; index++)
       bullet.sprites[index].SetOpacity(0);
     
-    # Create and show bullets for current password
-    for (index = 0; index < bullets; index++)
+    # Create and show bullets for current password (max 21)
+    max_bullets = 21;
+    bullets_to_show = bullets;
+    if (bullets_to_show > max_bullets)
+      bullets_to_show = max_bullets;
+    
+    for (index = 0; index < bullets_to_show; index++)
       {
         if (!bullet.sprites[index])
           {
@@ -195,7 +200,7 @@ Plymouth.SetDisplayPasswordFunction(display_password_callback);
 progress_box.image = Image("progress_box.png");
 progress_box.sprite = Sprite(progress_box.image);
 
-progress_box.x = Window.GetX() + Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2;
+progress_box.x = Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2;
 progress_box.y = entry.y + entry.image.GetHeight() / 2 - progress_box.image.GetHeight() / 2;
 progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0);
 progress_box.sprite.SetOpacity(0);
@@ -204,7 +209,7 @@ progress_bar.original_image = Image("progress_bar.png");
 progress_bar.sprite = Sprite();
 progress_bar.image = progress_bar.original_image.Scale(1, progress_bar.original_image.GetHeight());
 
-progress_bar.x = Window.GetX() + Window.GetWidth() / 2 - progress_bar.original_image.GetWidth() / 2;
+progress_bar.x = Window.GetWidth() / 2 - progress_bar.original_image.GetWidth() / 2;
 progress_bar.y = progress_box.y + (progress_box.image.GetHeight() - progress_bar.original_image.GetHeight()) / 2;
 progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 1);
 progress_bar.sprite.SetOpacity(0);

install.sh

@@ -38,6 +38,7 @@ source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
 source $OMARCHY_INSTALL/config/fix-fkeys.sh
 source $OMARCHY_INSTALL/config/network.sh
 source $OMARCHY_INSTALL/config/power.sh
+source $OMARCHY_INSTALL/config/timezones.sh
 source $OMARCHY_INSTALL/config/login.sh
 source $OMARCHY_INSTALL/config/nvidia.sh
 

install/config/config.sh

@@ -4,7 +4,7 @@
 cp -R ~/.local/share/omarchy/config/* ~/.config/
 
 # Use default bashrc from Omarchy
-echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc
+cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
 
 # Ensure application directory exists for update-desktop-database
 mkdir -p ~/.local/share/applications

install/config/timezones.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [[ ! -f /etc/sudoers.d/omarchy-tzupdate ]]; then
+if ! command -v tzupdate &>/dev/null; then
   yay -S --noconfirm --needed tzupdate
   sudo tee /etc/sudoers.d/omarchy-tzupdate >/dev/null <<EOF
 %wheel ALL=(root) NOPASSWD: /usr/bin/tzupdate, /usr/bin/timedatectl

install/desktop/fonts.sh

@@ -1,36 +1,7 @@
 #!/bin/bash
 
+yay -S --noconfirm --needed ttf-font-awesome ttf-cascadia-mono-nerd ttf-ia-writer noto-fonts noto-fonts-emoji
+
 if [ -z "$OMARCHY_BARE" ]; then
-  yay -S --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
-else
-  yay -S --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji
-fi
-
-mkdir -p ~/.local/share/fonts
-
-if ! fc-list | grep -qi "CaskaydiaMono Nerd Font"; then
-  cd /tmp
-  wget https://github.com/ryanoasis/nerd-fonts/releases/latest/download/CascadiaMono.zip
-  unzip CascadiaMono.zip -d CascadiaFont
-  cp CascadiaFont/CaskaydiaMonoNerdFont-Regular.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFont-Bold.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFont-Italic.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFont-BoldItalic.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-Regular.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-Bold.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-Italic.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-BoldItalic.ttf ~/.local/share/fonts
-  rm -rf CascadiaMono.zip CascadiaFont
-  fc-cache
-  cd -
-fi
-
-if ! fc-list | grep -qi "iA Writer Mono S"; then
-  cd /tmp
-  wget -O iafonts.zip https://github.com/iaolo/iA-Fonts/archive/refs/heads/master.zip
-  unzip iafonts.zip -d iaFonts
-  cp iaFonts/iA-Fonts-master/iA\ Writer\ Mono/Static/iAWriterMonoS-*.ttf ~/.local/share/fonts
-  rm -rf iafonts.zip iaFonts
-  fc-cache
-  cd -
+  yay -S --noconfirm --needed ttf-jetbrains-mono noto-fonts-cjk noto-fonts-extra
 fi

install/desktop/theme.sh

@@ -10,8 +10,14 @@ if ! yay -Q gnome-themes-extra &>/dev/null; then
   yay -S --noconfirm gnome-themes-extra # Adds Adwaita-dark theme
 fi
 
+# Allow icons to match the theme
+if ! yay -! yaru-icon-theme &>/dev/null; then
+  yay -S --noconfirm yaru-icon-theme
+fi
+
 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"
 
 # Setup theme links
 mkdir -p ~/.config/omarchy/themes

migrations/1751225707.sh

@@ -2,5 +2,5 @@ echo "Fixing persistent workspaces in waybar config"
 
 if [[ -f ~/.config/waybar/config ]]; then
   sed -i 's/"persistent_workspaces":/"persistent-workspaces":/' ~/.config/waybar/config
-  pkill -SIGUSR2 waybar
+  omarchy-restart-waybar
 fi

migrations/1752091783.sh

@@ -1,2 +1,2 @@
 echo "Install Plymouth splash screen"
-source "$HOME/.local/share/omarchy/install/login.sh"
+source "$HOME/.local/share/omarchy/install/config/login.sh"

migrations/1752187060.sh

@@ -1,14 +0,0 @@
-echo "Add missing Propo version of Caskaydia Mono Nerd Font for Waybar use"
-
-if ! fc-list | grep -qi "CaskaydiaMono Nerd Font Propo"; then
-  cd /tmp
-  wget https://github.com/ryanoasis/nerd-fonts/releases/latest/download/CascadiaMono.zip
-  unzip CascadiaMono.zip -d CascadiaFont
-  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-Regular.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-Bold.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-Italic.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-BoldItalic.ttf ~/.local/share/fonts
-  rm -rf CascadiaMono.zip CascadiaFont
-  fc-cache
-  cd -
-fi

migrations/1752981882.sh

@@ -1,5 +0,0 @@
-echo "Add missing libappindicator-gtk3 for Dropbox icon tray to work right"
-
-if ! pacman -Q libappindicator-gtk3 &>/dev/null; then
-  yay -S --noconfirm --needed libappindicator-gtk3
-fi

migrations/1753064164.sh

@@ -1,6 +0,0 @@
-echo "Add missing Dropbox dependencies"
-
-# Dropbox is still there, but the dependencies aren't yet
-if command -v dropbox-cli &>/dev/null && ! pacman -Q libappindicator-gtk3 &>/dev/null; then
-  yay -S --noconfirm --needed dropbox libappindicator-gtk3 python-gpgme nautilus-dropbox
-fi

migrations/1753352057.sh

@@ -12,8 +12,6 @@ if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.c
 
     # Refresh pacman package databases
     sudo pacman -Sy
-
-    chaotic_ok=1
   else
     echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
   fi

migrations/1753495989.sh

@@ -1,5 +1,5 @@
 echo "Allow updating of timezone by right-clicking on the clock (or running omarchy-cmd-tzupdate)"
-if [[ ! -f /etc/sudoers.d/omarchy-tzupdate ]]; then
+if ! command -v tzupdate &>/dev/null; then
   bash ~/.local/share/omarchy/install/config/timezones.sh
   omarchy-refresh-waybar
 fi

migrations/1753683888.sh

@@ -0,0 +1,5 @@
+echo "Adding Omarchy version info to fastfetch"
+if ! grep -q "omarchy" ~/.config/fastfetch/config.jsonc; then
+  cp ~/.local/share/omarchy/config/fastfetch/config.jsonc ~/.config/fastfetch/
+fi
+

migrations/1753689791.sh

@@ -0,0 +1,5 @@
+echo "Add the new ristretto theme as an option"
+
+if [[ ! -L ~/.config/omarchy/themes/ristretto ]]; then
+  ln -nfs ~/.local/share/omarchy/themes/ristretto ~/.config/omarchy/themes/
+fi

migrations/1753908454.sh

@@ -0,0 +1,12 @@
+echo "Migrate from manually downloaded fonts to font packages"
+if ! yay -Q ttf-cascadia-mono-nerd &>/dev/null; then
+  yay -S --noconfirm ttf-cascadia-mono-nerd
+  rm -rf ~/.local/share/fonts/Caskaydia*
+  fc-cache
+fi
+
+if ! yay -Q ttf-ia-writer &>/dev/null; then
+  yay -S --noconfirm ttf-ia-writer
+  rm -rf ~/.local/share/fonts/iAWriterMonoS*
+  fc-cache
+fi

migrations/1753998861.sh

@@ -0,0 +1,4 @@
+echo "Update Walker config to include . as the leader key for the finder"
+if ! grep -q 'prefix = "\."' ~/.config/walker/config.toml; then
+  omarchy-refresh-walker
+fi

migrations/1754047941.sh

@@ -0,0 +1,9 @@
+echo "Add icon theme coloring"
+
+if ! yay -! yaru-icon-theme &>/dev/null; then
+  yay -S --noconfirm yaru-icon-theme
+
+  if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then
+    gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)"
+  fi
+fi

migrations/1754108993.sh

@@ -0,0 +1,2 @@
+echo "Fix Plymouth login positioning in multi-monitor setups + limit password from overflowing"
+omarchy-refresh-plymouth

migrations/1754113760.sh

@@ -0,0 +1,10 @@
+echo "Change reload Waybar on unlock command to prevent stacking"
+
+if ! grep -q 'on_unlock_cmd *= *omarchy-restart-waybar' ~/.config/hypr/hypridle.conf; then
+  sed -i \
+    '/^    on_unlock_cmd = pkill -SIGUSR2 waybar[[:space:]]*# prevent stacking of waybar when waking$/c\
+    on_unlock_cmd = omarchy-restart-waybar  # prevent stacking of waybar when waking' \
+    ~/.config/hypr/hypridle.conf
+
+  omarchy-restart-waybar
+fi

migrations/1754133148.sh

@@ -0,0 +1,6 @@
+echo "Update Waybar CSS to dim unused workspaces"
+
+if ! grep -q "#workspaces button\.empty" ~/.config/waybar/style.css; then
+  omarchy-refresh-config waybar/style.css
+  omarchy-restart-waybar
+fi

migrations/1754136581.sh

@@ -0,0 +1,6 @@
+echo "Start screensaver automatically after 1 minute and stop before locking"
+
+if ! grep -q "omarchy-launch-screensaver" ~/.config/hypr/hypridle.conf; then
+  omarchy-refresh-hypridle
+  omarchy-refresh-hyprlock
+fi

themes/catppuccin-latte/icons.theme

@@ -0,0 +1 @@
+Yaru-blue

themes/catppuccin/icons.theme

@@ -0,0 +1 @@
+Yaru-purple

themes/everforest/icons.theme

@@ -0,0 +1 @@
+Yaru-sage

themes/gruvbox/icons.theme

@@ -0,0 +1 @@
+Yaru-olive

themes/kanagawa/icons.theme

@@ -0,0 +1 @@
+Yaru-blue

themes/matte-black/icons.theme

@@ -0,0 +1 @@
+Yaru-red

themes/nord/icons.theme

@@ -0,0 +1 @@
+Yaru-blue

themes/ristretto/alacritty.toml

@@ -0,0 +1,33 @@
+[colors]
+
+[colors.normal]
+black = "#2c2525"
+red = "#fd6883"
+green = "#adda78"
+yellow = "#f9cc6c"
+blue = "#f38d70"
+magenta = "#a8a9eb"
+cyan = "#85dacc"
+white = "#e6d9db"
+
+[colors.bright]
+black   = "#463a3a"
+red     = "#ff8297"
+green   = "#c8e292"
+yellow  = "#fcd675"
+blue    = "#f8a788"
+magenta = "#bebffd"
+cyan    = "#9bf1e1"
+white   = "#f1e5e7"
+
+[colors.cursor]
+cursor = '#c3b7b8'
+text = '#c3b7b8'
+
+[colors.primary]
+background = '#2c2525'
+foreground = '#e6d9db'
+
+[colors.selection]
+background = '#403e41'
+text = '#e6d9db'

themes/ristretto/btop.theme

@@ -0,0 +1,82 @@
+#Btop monokai pro ristretto theme
+#Reconfigured from monokai theme
+
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#2c2421"
+
+# Main text color
+theme[main_fg]="#e6d9db"
+
+# Title color for boxes
+theme[title]="#e6d9db"
+
+# Higlight color for keyboard shortcuts
+theme[hi_fg]="#fd6883"
+
+# Background color of selected item in processes box
+theme[selected_bg]="#3d2f2a"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#e6d9db"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#72696a"
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#adda78"
+
+# Cpu box outline color
+theme[cpu_box]="#5b4a45"
+
+# Memory/disks box outline color
+theme[mem_box]="#5b4a45"
+
+# Net up/down box outline color
+theme[net_box]="#5b4a45"
+
+# Processes box outline color
+theme[proc_box]="#5b4a45"
+
+# Box divider line and small boxes line color
+theme[div_line]="#72696a"
+
+# Temperature graph colors
+theme[temp_start]="#a8a9eb"
+theme[temp_mid]="#f38d70"
+theme[temp_end]="#fd6a85"
+
+# CPU graph colors
+theme[cpu_start]="#adda78"
+theme[cpu_mid]="#f9cc6c"
+theme[cpu_end]="#fd6883"
+
+# Mem/Disk free meter
+theme[free_start]="#5b4a45"
+theme[free_mid]="#adda78"
+theme[free_end]="#c5e2a3"
+
+# Mem/Disk cached meter
+theme[cached_start]="#5b4a45"
+theme[cached_mid]="#85dacc"
+theme[cached_end]="#b3e8dd"
+
+# Mem/Disk available meter
+theme[available_start]="#5b4a45"
+theme[available_mid]="#f9cc6c"
+theme[available_end]="#fce2a3"
+
+# Mem/Disk used meter
+theme[used_start]="#5b4a45"
+theme[used_mid]="#fd6a85"
+theme[used_end]="#feb5c7"
+
+# Download graph colors
+theme[download_start]="#3d2f2a"
+theme[download_mid]="#a8a9eb"
+theme[download_end]="#c5c6f0"
+
+# Upload graph colors
+theme[upload_start]="#3d2f2a"
+theme[upload_mid]="#fd6a85"
+theme[upload_end]="#feb5c7"
+

themes/ristretto/hyprland.conf

@@ -0,0 +1,4 @@
+general {
+    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
+    col.active_border = rgb(e6d9db)
+}

themes/ristretto/hyprlock.conf

@@ -0,0 +1,5 @@
+$color = rgba(44,37,37,1.0)
+$inner_color = rgba(44,37,37,0.8)
+$outer_color = rgba(230,217,219,1.0)
+$font_color = rgba(230,217,219,1.0)
+$check_color = rgba(253,104,131,1.0)

themes/ristretto/icons.theme

@@ -0,0 +1 @@
+Yaru-yellow

themes/ristretto/mako.ini

@@ -0,0 +1,21 @@
+text-color=#e6d9db
+border-color=#e6d9db
+background-color=#2c2525
+width=420
+height=110
+padding=10
+border-size=2
+font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
+max-icon-size=32
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false

themes/ristretto/neovim.lua

@@ -0,0 +1,31 @@
+return {
+  {
+    "gthelding/monokai-pro.nvim",
+    config = function()
+      require("monokai-pro").setup({
+        filter = "ristretto",
+        override = function()
+          return {
+            NonText = { fg = "#948a8b" },
+            MiniIconsGrey = { fg = "#948a8b" },
+	    MiniIconsRed = { fg = "#fd6883" },
+	    MiniIconsBlue = { fg = "#85dacc" },
+	    MiniIconsGreen = { fg = "#adda78" },
+	    MiniIconsYellow = { fg = "#f9cc6c" },
+	    MiniIconsOrange = { fg = "#f38d70" },
+	    MiniIconsPurple = { fg = "#a8a9eb" },
+	    MiniIconsAzure = { fg = "#a8a9eb" },
+	    MiniIconsCyan = { fg = "#85dacc" }, -- same value as MiniIconsBlue for consistency
+          }
+        end,
+      })
+      vim.cmd([[colorscheme monokai-pro]])
+    end,
+  },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "monokai-pro",
+    },
+  },
+}

themes/ristretto/swayosd.css

@@ -0,0 +1,5 @@
+@define-color background-color #2c2525;
+@define-color border-color #c3b7b8;
+@define-color label #c3b7b8;
+@define-color image #c3b7b8;
+@define-color progress #c3b7b8;

themes/ristretto/walker.css

@@ -0,0 +1,6 @@
+@define-color selected-text #fabd2f;
+@define-color text #e6d9db;
+@define-color base #2c2525;
+@define-color border #e6d9db;
+@define-color foreground #e6d9db;
+@define-color background #2c2525;

themes/ristretto/waybar.css

@@ -0,0 +1,2 @@
+@define-color foreground #e6d9db;
+@define-color background #2c2525;

themes/rose-pine/icons.theme

@@ -0,0 +1 @@
+Yaru-blue

themes/tokyo-night/icons.theme

@@ -0,0 +1 @@
+Yaru-magenta