Merge pull request #209 from basecamp/dev

Omarchy v1.5.0

applications/blueberry.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Bluetooth
-Comment=Configure Bluetooth settings
-Icon=bluetooth
-Exec=env GTK_THEME=Adwaita-dark blueberry
-Terminal=false
-Type=Application
-Categories=GTK;GNOME;Settings;HardwareSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
-StartupNotify=true
-NotShowIn=GNOME;KDE;Unity;

applications/org.pulseaudio.pavucontrol.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Volume Control
-Comment=Adjust the volume level
-Exec=env GTK_THEME=Adwaita-dark pavucontrol
-Icon=multimedia-volume-control
-StartupNotify=true
-Type=Application
-Categories=AudioVideo;Audio;Mixer;GTK;Settings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
-Keywords=pavucontrol;PulseAudio;Microphone;Volume;Fade;Balance;Headset;Speakers;Headphones;Audio;Mixer;Output;Input;Devices;Playback;Recording;System Sounds;Sound Card;Settings;Preferences;

bin/omarchy

@@ -62,8 +62,9 @@ update_menu() {
 
 theme_menu() {
   show_ascii_art
-  local menu=("Install" "Remove" "Back")
+  local menu=("Pick" "Install" "Remove" "Back")
   local commands=(
+    "omarchy-theme-menu"
     "install_theme_prompt"
     "remove_theme_prompt"
     "main_menu"
@@ -104,9 +105,12 @@ remove_theme_prompt() {
 
 setup_menu() {
   show_ascii_art
-  local menu=("Fingerprint sensor" "Back")
+  local menu=("Add fingerprint sensor" "Remove fingerprint sensor" "Add Fido2 device" "Remove Fido2 device" "Back")
   local commands=(
-    "omarchy-fingerprint-setup"
+    "omarchy-setup-fingerprint"
+    "omarchy-setup-fingerprint --remove"
+    "omarchy-setup-fido2"
+    "omarchy-setup-fido2 --remove"
     "main_menu"
   )
   local choice

bin/omarchy-dev-config-link

@@ -4,5 +4,5 @@
 ln -nsf ~/.local/share/omarchy/config/hypr/hyprland.conf ~/.config/hypr/
 ln -nsf ~/.local/share/omarchy/config/hypr/hypridle.conf ~/.config/hypr/
 ln -nsf ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/
-ln -nsf ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/
+ln -nsf ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/
 ln -nsf ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/

bin/omarchy-fingerprint-setup

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-yay -S --noconfirm --needed fprintd usbutils
-
-if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix'; then
-  echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
-else
-  # Add fingerprint authentication as an option for sudo
-  if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
-    sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
-  fi
-
-  # Add fingerprint authentication as an option for hyprpolkitagent
-  if [ ! -f /etc/pam.d/polkit-1 ] || ! grep -q pam_fprintd.so /etc/pam.d/polkit-1; then
-    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
-auth      required pam_unix.so
-auth      optional pam_fprintd.so
-
-account   required pam_unix.so
-password  required pam_unix.so
-session   required pam_unix.so
-EOF
-  fi
-
-  # Enroll the first finger
-  echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
-  sudo fprintd-enroll $USER
-
-  echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
-
-  if fprintd-verify; then
-    echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
-  else
-    echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-  fi
-fi

bin/omarchy-refresh-waybar

@@ -2,7 +2,7 @@
 
 if gum confirm "Refresh Waybar config? This will replace your current settings with Omarchy defaults."; then
   # Overwrite local waybar settings with the latest in Omarchy
-  cp -f ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/ 2>/dev/null
+  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
 
   # Restart waybar

bin/omarchy-setup-fido2

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+if [[ "--remove" == "$1" ]]; then
+  yay -Rns --noconfirm libfido2 pam-u2f
+  sudo rm -rf /etc/fido2
+  sudo sed -i '\|^auth[[:space:]]\+sufficient[[:space:]]\+pam_u2f\.so[[:space:]]\+cue[[:space:]]\+authfile=/etc/fido2/fido2$|d' /etc/pam.d/sudo
+  echo -e "\e[32m\nYou've successfully removed the fido2 device setup.\e[0m"
+else
+  yay -S --noconfirm --needed libfido2 pam-u2f
+
+  tokens=$(fido2-token -L)
+
+  if [ -z "$tokens" ]; then
+    echo -e "\e[31m\nNo fido2 device detected. Plug it in, you may have to unlock it as well\e[0m"
+  else
+    # Create the pamu2fcfg file
+    if [ ! -f /etc/fido2/fido2 ]; then
+      sudo mkdir -p /etc/fido2
+      echo -e "\e[32m\nLet's setup your device by confirming on the device now.\e[0m"
+      pamu2fcfg >/tmp/fido2 # This needs to run as the user
+      sudo mv /tmp/fido2 /etc/fido2/fido2
+    fi
+
+    # Add fido2 auth as an option for sudo
+    if ! grep -q pam_u2f.so /etc/pam.d/sudo; then
+      sudo sed -i '1i auth    sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/sudo
+    fi
+
+    if ! sudo echo -e "\e[32m\nPerfect! Now you can use your fido2 device for sudo.\e[0m"; then
+      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+    fi
+  fi
+fi

bin/omarchy-setup-fingerprint

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+if [[ "--remove" == "$1" ]]; then
+  yay -Rns --noconfirm fprintd
+  sudo rm -rf /etc/pam.d/polkit-1
+  sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/sudo
+  echo -e "\e[32mYou've successfully removed the fingerprint setup.\e[0m"
+else
+  yay -S --noconfirm --needed fprintd usbutils
+
+  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix'; then
+    echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
+  else
+    # Add fingerprint authentication as an option for sudo
+    if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
+      sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
+    fi
+
+    # Add fingerprint authentication as an option for hyprpolkitagent
+    if [ ! -f /etc/pam.d/polkit-1 ] || ! grep -q pam_fprintd.so /etc/pam.d/polkit-1; then
+      sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
+auth      required pam_unix.so
+auth      optional pam_fprintd.so
+
+account   required pam_unix.so
+password  required pam_unix.so
+session   required pam_unix.so
+EOF
+    fi
+
+    # Enroll the first finger
+    echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
+    sudo fprintd-enroll $USER
+
+    echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
+
+    if fprintd-verify; then
+      echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
+    else
+      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+    fi
+  fi
+fi

bin/omarchy-theme-bg-next

@@ -8,30 +8,41 @@ CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
 TOTAL=${#BACKGROUNDS[@]}
 
-# Get current background from symlink
+if [[ $TOTAL -eq 0 ]]; then
-if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
+  notify-send "No background was found for theme" -t 2000
-  CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
+  pkill -x swaybg
+  setsid swaybg --color '#000000' >/dev/null 2>&2 &
 else
-  # Default to first background if no symlink exists
+  # Get current background from symlink
-  CURRENT_BACKGROUND="${BACKGROUNDS[0]}"
+  if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
-fi
+    CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
-
+  else
-# Find current background index
+    # Default to first background if no symlink exists
-INDEX=0
+    CURRENT_BACKGROUND=""
-for i in "${!BACKGROUNDS[@]}"; do
-  if [[ "${BACKGROUNDS[$i]}" == "$CURRENT_BACKGROUND" ]]; then
-    INDEX=$i
-    break
   fi
-done
 
-# Get next background (wrap around)
+  # Find current background index
-NEXT_INDEX=$(((INDEX + 1) % TOTAL))
+  INDEX=-1
-NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
+  for i in "${!BACKGROUNDS[@]}"; do
+    if [[ "${BACKGROUNDS[$i]}" == "$CURRENT_BACKGROUND" ]]; then
+      INDEX=$i
+      break
+    fi
+  done
 
-# Set new background symlink
+  # Get next background (wrap around)
-ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
+  if [[ $INDEX -eq -1 ]]; then
+    # Use the first background when no match was found
+    NEW_BACKGROUND="${BACKGROUNDS[0]}"
+  else
+    NEXT_INDEX=$(((INDEX + 1) % TOTAL))
+    NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
+  fi
 
-# Relaunch swaybg
+  # Set new background symlink
-pkill -x swaybg
+  ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
-setsid swaybg -i "$NEW_BACKGROUND" -m fill >/dev/null 2>&2 &
+
+  # Relaunch swaybg
+  pkill -x swaybg
+  setsid swaybg -i "$NEW_BACKGROUND" -m fill >/dev/null 2>&2 &
+fi

bin/omarchy-theme-menu

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

bin/omarchy-theme-next

@@ -30,5 +30,5 @@ NEXT_INDEX=$(((INDEX + 1) % TOTAL))
 NEW_THEME=${THEMES[$NEXT_INDEX]}
 NEW_THEME_NAME=$(basename "$NEW_THEME")
 
-omarchy-theme-set $NEW_THEME_NAME
+"$HOME/.local/share/omarchy/bin/omarchy-theme-set" $NEW_THEME_NAME
 notify-send "Theme changed to $NEW_THEME_NAME" -t 2000

bin/omarchy-theme-set

@@ -13,7 +13,12 @@ CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
 
 THEME_NAME="$1"
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
-BACKGROUND_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME"
+
+if [[ -d "$HOME/.config/omarchy/themes/$THEME_NAME/backgrounds" ]]; then
+  BACKGROUND_PATH="$HOME/.config/omarchy/themes/$THEME_NAME/backgrounds"
+else
+  BACKGROUND_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME"
+fi
 
 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
@@ -25,9 +30,21 @@ fi
 ln -nsf "$BACKGROUND_PATH" "$HOME/.config/omarchy/current/backgrounds"
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
+# Change gnome modes
+if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
+else
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+fi
+
 # Trigger alacritty config reload
 touch "$HOME/.config/alacritty/alacritty.toml"
 
+# Trigger btop config reload
+pkill -SIGUSR2 btop
+
 # Restart components to apply new theme
 pkill waybar
 setsid waybar >/dev/null 2>&1 &
@@ -35,9 +52,4 @@ makoctl reload
 hyprctl reload
 
 # Set new background
-first_bg=$(find "$HOME/.config/omarchy/current/backgrounds/" -type f | head -n 1)
+"$HOME/.local/share/omarchy/bin/omarchy-theme-bg-next"
-if [[ -n "$first_bg" ]]; then
-  ln -nsf "$first_bg" "$HOME/.config/omarchy/current/background"
-  pkill -x swaybg
-  setsid swaybg -i "$HOME/.config/omarchy/current/background" -m fill >/dev/null &
-fi

bin/omarchy-update

@@ -10,8 +10,10 @@ else
   last_updated_at=$(git log -1 --format=%cd --date=unix)
 fi
 
-# Get the latest
+# Get the latest while trying to preserve any modifications
+git stash
 git pull
+git stash pop
 
 # Run any pending migrations
 for file in migrations/*.sh; do
@@ -27,5 +29,5 @@ done
 # Back to where we came from
 cd - >/dev/null
 
-echo -e "\e[32m\nUpdating system packages\e[0m"
+echo -e ""
-yay -Syu --noconfirm
+gum confirm "Update system packages too?" && yay -Syu --noconfirm

config/waybar/config.jsonc

@@ -92,11 +92,11 @@
     "format-disabled": "󰂲",
     "format-connected": "",
     "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "GTK_THEME=Adwaita-dark blueberry"
+    "on-click": "blueberry"
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
+    "on-click": "pavucontrol",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,

default/hypr/bindings/utilities.conf

@@ -1,7 +1,6 @@
 # Launching
 bind = SUPER, space, exec, pkill wofi || wofi --show drun -O alphabetical
-# bind = SUPER, space, exec, pkill wofi || uwsm app -- "$(wofi --show drun -O alphabetical --define=drun-print_desktop_file=true | sed -E "s/(\.desktop) /\1:/")"
+bind = SUPER, K, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-menu-keybindings
-bind = SUPER, K, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-show-keybindings
 
 # Aesthetics
 bind = SUPER SHIFT, SPACE, exec, pkill -SIGUSR1 waybar
@@ -14,7 +13,7 @@ bind = SUPER SHIFT, comma, exec, makoctl dismiss --all
 bind = SUPER CTRL, comma, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"
 
 # Power menu controls lock, suspend, relaunch, restart, shutdown
-bind = SUPER, ESCAPE, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-power-menu
+bind = SUPER, ESCAPE, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-menu-power
 
 # Toggle idling
 bind = SUPER CTRL, I, exec, ~/.local/share/omarchy/bin/omarchy-toggle-idle

install/backgrounds.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-BACKGROUNDS_DIR=~/.config/omarchy/backgrounds/
-
-download_background_image() {
-  local url="$1"
-  local path="$2"
-  gum spin --title "Downloading $url as $path..." -- curl -sL -o "$BACKGROUNDS_DIR/$path" "$url"
-}
-
-for t in ~/.local/share/omarchy/themes/*; do source "$t/backgrounds.sh"; done

install/docker.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-yay -S --noconfirm --needed docker docker-compose
+yay -S --noconfirm --needed docker docker-compose docker-buildx
 
 # Limit log size to avoid running out of disk
 sudo mkdir -p /etc/docker

install/network.sh

@@ -2,7 +2,7 @@
 
 # Install iwd explicitly if it wasn't included in archinstall
 # This can happen if archinstall used ethernet
-if ! command -v iwd &>/dev/null; then
+if ! command -v iwctl &>/dev/null; then
   yay -S --noconfirm --needed iwd
   sudo systemctl enable --now iwd.service
 fi

install/theme.sh

@@ -15,13 +15,13 @@ for f in ~/.local/share/omarchy/themes/*; do ln -s "$f" ~/.config/omarchy/themes
 # Set initial theme
 mkdir -p ~/.config/omarchy/current
 ln -snf ~/.config/omarchy/themes/tokyo-night ~/.config/omarchy/current/theme
-source ~/.local/share/omarchy/themes/tokyo-night/backgrounds.sh
+ln -snf ~/.config/omarchy/current/theme/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg ~/.config/omarchy/current/background
-ln -snf ~/.config/omarchy/backgrounds/tokyo-night ~/.config/omarchy/current/backgrounds
-ln -snf ~/.config/omarchy/current/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg ~/.config/omarchy/current/background
 
 # Set specific app links for current theme
 ln -snf ~/.config/omarchy/current/theme/neovim.lua ~/.config/nvim/lua/plugins/theme.lua
+
 mkdir -p ~/.config/btop/themes
 ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme
+
 mkdir -p ~/.config/mako
 ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config

install/xtras.sh

@@ -4,7 +4,10 @@ if [ -z "$OMARCHY_BARE" ]; then
   yay -S --noconfirm --needed \
     gnome-calculator gnome-keyring signal-desktop \
     obsidian-bin libreoffice obs-studio kdenlive \
-    pinta xournalpp localsend-bin
+    xournalpp localsend-bin
+
+  yay -S --noconfirm --needed pinta ||
+    echo -e "\e[31mFailed to install Pinta. Continuing without!\e[0m"
 
   yay -S --noconfirm --needed typora ||
     echo -e "\e[31mFailed to install Typora. Continuing without!\e[0m"

migrations/1752678932.sh

@@ -0,0 +1,2 @@
+echo "Install missing docker-buildx package for out-of-the-box Kamal compatibility"
+yay -S --noconfirm --needed docker-buildx

migrations/1752725616.sh

@@ -0,0 +1,15 @@
+echo "Make light themes possible"
+if [[ -f ~/.local/share/applications/blueberry.desktop ]]; then
+  rm -f ~/.local/share/applications/blueberry.desktop
+  rm -f ~/.local/share/applications/org.pulseaudio.pavucontrol.desktop
+  update-desktop-database ~/.local/share/applications/
+
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+
+  omarchy-refresh-waybar
+fi
+
+if [[ ! -L "~/.config/omarchy/themes/rose-pine" ]]; then
+  ln -snf ~/.local/share/omarchy/themes/rose-pine ~/.config/omarchy/themes/
+fi

migrations/1752793122.sh

@@ -0,0 +1,4 @@
+echo "Rename waybar config file for syntax highlighting"
+if [[ -f ~/.config/waybar/config ]]; then
+  mv ~/.config/waybar/config ~/.config/waybar/config.jsonc
+fi

themes/catppuccin/backgrounds.sh

@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/catppuccin"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/catppuccin/background.png" "catppuccin/1-catppuccin.png"

themes/everforest/backgrounds.sh

@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/everforest"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/everforest/background.jpg" "everforest/1-everforest.jpg"

themes/gruvbox/backgrounds.sh

@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/gruvbox"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/gruvbox/background.jpg" "gruvbox/1-grubox.jpg"

themes/kanagawa/backgrounds.sh

@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/kanagawa"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/kanagawa/background.jpg" "kanagawa/1-kanagawa.jpg"

themes/matte-black/backgrounds.sh

@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/matte-black"
-download_background_image "https://raw.githubusercontent.com/tahayvr/omarchy-matte-black/refs/heads/main/images/1-matte-black.jpg" "matte-black/1-matte-black.jpg"

themes/nord/backgrounds.sh

@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/nord"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/nord/background.png" "nord/1-nord.png"

themes/rose-pine/alacritty.toml

@@ -0,0 +1,72 @@
+[colors.primary]
+foreground = "#575279"
+background = "#faf4ed"
+dim_foreground = "#797593"
+bright_foreground = "#575279"
+
+[colors.cursor]
+text = "#575279"
+cursor = "#cecacd"
+
+[colors.vi_mode_cursor]
+text = "#575279"
+cursor = "#cecacd"
+
+[colors.search.matches]
+foreground = "#797593"
+background = "#f2e9e1"
+
+[colors.search.focused_match]
+foreground = "#faf4ed"
+background = "#d7827e"
+
+[colors.hints.start]
+foreground = "#797593"
+background = "#fffaf3"
+
+[colors.hints.end]
+foreground = "#9893a5"
+background = "#fffaf3"
+
+[colors.line_indicator]
+foreground = "None"
+background = "None"
+
+[colors.footer_bar]
+foreground = "#575279"
+background = "#fffaf3"
+
+[colors.selection]
+text = "#575279"
+background = "#dfdad9"
+
+[colors.normal]
+black = "#f2e9e1"
+red = "#b4637a"
+green = "#286983"
+yellow = "#ea9d34"
+blue = "#56949f"
+magenta = "#907aa9"
+cyan = "#d7827e"
+white = "#575279"
+
+[colors.bright]
+black = "#9893a5"
+red = "#b4637a"
+green = "#286983"
+yellow = "#ea9d34"
+blue = "#56949f"
+magenta = "#907aa9"
+cyan = "#d7827e"
+white = "#575279"
+
+[colors.dim]
+black = "#9893a5"
+red = "#b4637a"
+green = "#286983"
+yellow = "#ea9d34"
+blue = "#56949f"
+magenta = "#907aa9"
+cyan = "#d7827e"
+white = "#575279"
+

themes/rose-pine/btop.theme

@@ -0,0 +1,119 @@
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#faf4ed"
+# Base
+
+# Main text color
+theme[main_fg]="#575279"
+# Text
+
+# Title color for boxes
+theme[title]="#908caa"
+# Subtle
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#e0def4"
+# Text
+
+# Background color of selected item in processes box
+theme[selected_bg]="#524f67"
+# HL High
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#f6c177"
+# Gold
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#403d52"
+# HL Med
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="#9ccfd8"
+# Foam
+
+# Background color of the percentage meters
+theme[meter_bg]="#9ccfd8"
+# Foam
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#c4a7e7"
+# Iris
+
+# Cpu box outline color
+theme[cpu_box]="#ebbcba"
+# Rose
+
+# Memory/disks box outline color
+theme[mem_box]="#31748f"
+# Pine
+
+# Net up/down box outline color
+theme[net_box]="#c4a7e7"
+# Iris
+
+# Processes box outline color
+theme[proc_box]="#eb6f92"
+# Love
+
+# Box divider line and small boxes line color
+theme[div_line]="#6e6a86"
+# Muted
+
+# Temperature graph colors
+theme[temp_start]="#ebbcba"
+# Rose
+theme[temp_mid]="#f6c177"
+# Gold
+theme[temp_end]="#eb6f92"
+# Love
+
+# CPU graph colors
+theme[cpu_start]="#f6c177"
+# Gold
+theme[cpu_mid]="#ebbcba"
+# Rose
+theme[cpu_end]="#eb6f92"
+# Love
+
+# Mem/Disk free meter
+# all love
+theme[free_start]="#eb6f92"
+theme[free_mid]="#eb6f92"
+theme[free_end]="#eb6f92"
+
+# Mem/Disk cached meter
+# all iris
+theme[cached_start]="#c4a7e7"
+theme[cached_mid]="#c4a7e7"
+theme[cached_end]="#c4a7e7"
+
+# Mem/Disk available meter
+# all pine
+theme[available_start]="#31748f"
+theme[available_mid]="#31748f"
+theme[available_end]="#31748f"
+
+# Mem/Disk used meter
+# all rose
+theme[used_start]="#ebbcba"
+theme[used_mid]="#ebbcba"
+theme[used_end]="#ebbcba"
+
+# Download graph colors
+# Pine for start, foam for the rest
+theme[download_start]="#31748f"
+theme[download_mid]="#9ccfd8"
+theme[download_end]="#9ccfd8"
+
+# Upload graph colors
+theme[upload_start]="#ebbcba"
+# Rose for start
+theme[upload_mid]="#eb6f92"
+# Love for mid and end
+theme[upload_end]="#eb6f92"
+
+# Process box color gradient for threads, mem and cpu usage
+theme[process_start]="#31748f"
+# Pine
+theme[process_mid]="#9ccfd8"
+# Foam for mid and end
+theme[process_end]="#9ccfd8"

themes/rose-pine/hyprland.conf

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

themes/rose-pine/hyprlock.conf

@@ -0,0 +1,9 @@
+$color = rgba(250, 244, 237,1.0)
+
+$inner_color = rgba(250, 244, 237,0.8)
+$outer_color = rgba(57,52,79,1.0)
+
+$font_color = rgba(57,52,79,1.0)
+
+$placeholder_color = rgba(216,222,233,0.6)
+$check_color = rgba(136, 192, 208, 1.0)

themes/rose-pine/light.mode

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

themes/rose-pine/mako.ini

@@ -0,0 +1,21 @@
+text-color=#575279
+border-color=#575279
+background-color=#faf4ed
+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/rose-pine/neovim.lua

@@ -0,0 +1,9 @@
+return {
+	{ "rose-pine/neovim", name = "rose-pine" },
+	{
+		"LazyVim/LazyVim",
+		opts = {
+			colorscheme = "rose-pine-dawn",
+		},
+	},
+}

themes/rose-pine/waybar.css

@@ -0,0 +1,2 @@
+@define-color foreground #575279;
+@define-color background #faf4ed;

themes/rose-pine/wofi.css

@@ -0,0 +1,4 @@
+@define-color	selected-text  #88C0D0;
+@define-color	text  #575279;
+@define-color	base  #faf4ed;
+@define-color	border  #575279;

themes/tokyo-night/backgrounds.sh

@@ -1,3 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/tokyo-night"
-download_background_image "https://images.unsplash.com/photo-1651870364199-fc5f9f46ac85" "tokyo-night/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg"
-download_background_image "https://images.unsplash.com/photo-1620207418302-439b387441b0" "tokyo-night/2-Milad-Fakurian-Abstract-Purple-Blue.jpg"