Extra CR

Reset any stash changes before proceeding if there were conflicts

bin/omarchy-theme-menu

@@ -22,7 +22,7 @@ mapfile -t themes < <(
 selection=$(printf '%s\n' "${themes[@]}" | wofi \
   --show dmenu \
   --allow-markup \
-  --width 150 \
+  --width 200 \
   --height 400 \
   -O alphabetical \
   --style ~/.config/wofi/select.css 2>/dev/null)

bin/omarchy-update

@@ -11,9 +11,8 @@ else
 fi
 
 # Get the latest while trying to preserve any modifications
-git stash
-git pull
-git stash pop
+git pull --autostash
+git diff --check || git reset --merge
 
 # Run any pending migrations
 for file in migrations/*.sh; do

boot.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 ascii_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
 ███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
 ███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███

install.sh

@@ -1,8 +1,16 @@
+#!/bin/bash
+
 # Exit immediately if a command exits with a non-zero status
 set -e
 
 # Give people a chance to retry running the installation
-trap 'echo "Omarchy installation failed! You can retry by running: source ~/.local/share/omarchy/install.sh"' ERR
+catch_errors() {
+  echo -e "\n\e[31mOmarchy installation failed!\e[0m"
+  echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
+  echo "Get help from the community: https://discord.gg/tXFUdasqhY"
+}
+
+trap catch_errors ERR
 
 # Install everything
 for f in ~/.local/share/omarchy/install/*.sh; do

migrations/1752874371.sh

@@ -0,0 +1,4 @@
+echo "Add Catppuccin Latte light theme"
+if [[ ! -L "~/.config/omarchy/themes/catppuccin-latte" ]]; then
+  ln -snf ~/.local/share/omarchy/themes/catppuccin-latte ~/.config/omarchy/themes/
+fi

themes/catppuccin-latte/alacritty.toml

@@ -0,0 +1,67 @@
+# https://raw.githubusercontent.com/catppuccin/alacritty/main/catppuccin-latte.toml
+
+[colors.primary]
+background = "#eff1f5"
+foreground = "#4c4f69"
+dim_foreground = "#8c8fa1"
+bright_foreground = "#4c4f69"
+
+[colors.cursor]
+text = "#eff1f5"
+cursor = "#dc8a78"
+
+[colors.vi_mode_cursor]
+text = "#eff1f5"
+cursor = "#7287fd"
+
+[colors.search.matches]
+foreground = "#eff1f5"
+background = "#6c6f85"
+
+[colors.search.focused_match]
+foreground = "#eff1f5"
+background = "#40a02b"
+
+[colors.footer_bar]
+foreground = "#eff1f5"
+background = "#6c6f85"
+
+[colors.hints.start]
+foreground = "#eff1f5"
+background = "#df8e1d"
+
+[colors.hints.end]
+foreground = "#eff1f5"
+background = "#6c6f85"
+
+[colors.selection]
+text = "#eff1f5"
+background = "#dc8a78"
+
+[colors.normal]
+black = "#bcc0cc"
+red = "#d20f39"
+green = "#40a02b"
+yellow = "#df8e1d"
+blue = "#1e66f5"
+magenta = "#ea76cb"
+cyan = "#179299"
+white = "#5c5f77"
+
+[colors.bright]
+black = "#acb0be"
+red = "#d20f39"
+green = "#40a02b"
+yellow = "#df8e1d"
+blue = "#1e66f5"
+magenta = "#ea76cb"
+cyan = "#179299"
+white = "#6c6f85"
+
+[[colors.indexed_colors]]
+index = 16
+color = "#fe640b"
+
+[[colors.indexed_colors]]
+index = 17
+color = "#dc8a78"

themes/catppuccin-latte/btop.theme

@@ -0,0 +1,84 @@
+# https://github.com/catppuccin/btop/blob/main/themes/catppuccin_latte.theme
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#eff1f5"
+
+# Main text color
+theme[main_fg]="#4c4f69"
+
+# Title color for boxes
+theme[title]="#4c4f69"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#1e66f5"
+
+# Background color of selected item in processes box
+theme[selected_bg]="#bcc0cc"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#1e66f5"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#8c8fa1"
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="#dc8a78"
+
+# Background color of the percentage meters
+theme[meter_bg]="#bcc0cc"
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#dc8a78"
+
+# CPU, Memory, Network, Proc box outline colors
+theme[cpu_box]="#8839ef" #Mauve
+theme[mem_box]="#40a02b" #Green
+theme[net_box]="#e64553" #Maroon
+theme[proc_box]="#1e66f5" #Blue
+
+# Box divider line and small boxes line color
+theme[div_line]="#9ca0b0"
+
+# Temperature graph color (Green -> Yellow -> Red)
+theme[temp_start]="#40a02b"
+theme[temp_mid]="#df8e1d"
+theme[temp_end]="#d20f39"
+
+# CPU graph colors (Teal -> Lavender)
+theme[cpu_start]="#179299"
+theme[cpu_mid]="#209fb5"
+theme[cpu_end]="#7287fd"
+
+# Mem/Disk free meter (Mauve -> Lavender -> Blue)
+theme[free_start]="#8839ef"
+theme[free_mid]="#7287fd"
+theme[free_end]="#1e66f5"
+
+# Mem/Disk cached meter (Sapphire -> Lavender)
+theme[cached_start]="#209fb5"
+theme[cached_mid]="#1e66f5"
+theme[cached_end]="#7287fd"
+
+# Mem/Disk available meter (Peach -> Red)
+theme[available_start]="#fe640b"
+theme[available_mid]="#e64553"
+theme[available_end]="#d20f39"
+
+# Mem/Disk used meter (Green -> Sky)
+theme[used_start]="#40a02b"
+theme[used_mid]="#179299"
+theme[used_end]="#04a5e5"
+
+# Download graph colors (Peach -> Red)
+theme[download_start]="#fe640b"
+theme[download_mid]="#e64553"
+theme[download_end]="#d20f39"
+
+# Upload graph colors (Green -> Sky)
+theme[upload_start]="#40a02b"
+theme[upload_mid]="#179299"
+theme[upload_end]="#04a5e5"
+
+# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
+theme[process_start]="#209fb5"
+theme[process_mid]="#7287fd"
+theme[process_end]="#8839ef"

themes/catppuccin-latte/hyprland.conf

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

themes/catppuccin-latte/hyprlock.conf

@@ -0,0 +1,9 @@
+$color = rgba(239,241,245,1.0)            # base
+$inner_color = rgba(239,241,245,0.8)      # slightly transparent base
+$outer_color = rgba(30,102,245,1.0)       # blue
+
+$font_color = rgba(76,79,105,1.0)         # text
+
+$placeholder_color = rgba(204,208,218,0.6) # overlay0 (muted gray-blue)
+$check_color = rgba(4,165,229,1.0)        # cyan
+

themes/catppuccin-latte/light.mode

@@ -0,0 +1 @@
+# This will set "prefer-light" and use "Adwaita" as the theme

themes/catppuccin-latte/mako.ini

@@ -0,0 +1,24 @@
+# Catppuccin Latte – mako notification theme
+text-color=#4c4f69             # text
+border-color=#dce0e8           # crust
+background-color=#eff1f5       # base
+
+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/catppuccin-latte/neovim.lua

@@ -0,0 +1,19 @@
+return {
+	{
+		"catppuccin/nvim",
+		name = "catppuccin",
+		priority = 1000,
+		config = function()
+			require("catppuccin").setup({
+				flavour = "latte", -- other options: "mocha", "frappe", "macchiato"
+			})
+			vim.cmd.colorscheme("catppuccin-latte")
+		end,
+	},
+	{
+		"LazyVim/LazyVim",
+		opts = {
+			colorscheme = "catppuccin-latte",
+		},
+	},
+}

themes/catppuccin-latte/waybar.css

@@ -0,0 +1,4 @@
+@define-color foreground #4c4f69; /* text */
+@define-color background #eff1f5; /* base */
+@define-color border     #dce0e8; /* crust */
+@define-color accent     #1e66f5; /* blue */

themes/catppuccin-latte/wofi.css

@@ -0,0 +1,4 @@
+@define-color selected-text  #1e66f5; /* blue */
+@define-color text           #4c4f69; /* text */
+@define-color base           #eff1f5; /* base */
+@define-color border         #dce0e8; /* crust */