Update logo svg

Fix step total in install.sh subtexts

bin/omarchy-cmd-screenrecord

@@ -2,7 +2,13 @@
 
 # Set recorder based on GPU
 
-OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-$HOME/Videos}"
+[[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
+OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"
+
+if [[ ! -d "$OUTPUT_DIR" ]]; then
+  notify-send "Screen recording directory does not exist: $OUTPUT_DIR" -u critical -t 3000
+  exit 1
+fi
 
 screenrecording() {
   filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
@@ -19,7 +25,7 @@ screenrecording() {
 if pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null; then
   pkill -x wl-screenrec
   pkill -x wf-recorder
-  notify-send "Screen recording saved to ~/Videos" -t 2000
+  notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
 elif [[ "$1" == "output" ]]; then
   screenrecording
 else

bin/omarchy-cmd-screenshot

@@ -1,8 +1,14 @@
 #!/bin/bash
 
-OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-$HOME/Pictures}"
+[[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
+OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"
 
-hyprshot -m ${1:-region} --raw |
+if [[ ! -d "$OUTPUT_DIR" ]]; then
+  notify-send "Screenshot directory does not exist: $OUTPUT_DIR" -u critical -t 3000
+  exit 1
+fi
+
+pkill slurp || hyprshot -m ${1:-region} --raw |
   satty --filename - \
     --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
     --early-exit \

bin/omarchy-cmd-tzupdate

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo tzupdate
+new_timezone=$(timedatectl show -p Timezone --value)
+notify-send "Timezone has been set to $new_timezone"

boot.sh

@@ -1,5 +1,18 @@
 #!/bin/bash
 
+ansi_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
+███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
+███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
+███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
+ ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
+                                          ███    ███                                    '
+
+clear
+echo -e "\n$ansi_art\n"
+
 sudo pacman -Sy --noconfirm --needed git
 
 echo -e "\nCloning Omarchy..."

config/waybar/config.jsonc

@@ -50,7 +50,8 @@
   "clock": {
     "format": "{:%A %H:%M}",
     "format-alt": "{:%d %B W%V %Y}",
-    "tooltip": false
+    "tooltip": false,
+    "on-click-right": "omarchy-cmd-tzupdate"
   },
   "network": {
     "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],

default/bash/init

@@ -7,8 +7,8 @@ if command -v zoxide &> /dev/null; then
 fi
 
 if command -v fzf &> /dev/null; then
-  if [[ -f /usr/share/bash-completion/completions/fzf ]]; then
+  if [[ -f /usr/share/fzf/completion.bash ]]; then
-    source /usr/share/bash-completion/completions/fzf
+    source /usr/share/fzf/completion.bash
   fi
   if [[ -f /usr/share/fzf/key-bindings.bash ]]; then
     source /usr/share/fzf/key-bindings.bash

install.sh

@@ -3,6 +3,8 @@
 # Exit immediately if a command exits with a non-zero status
 set -e
 
+OMARCHY_INSTALL=~/.local/share/omarchy/install
+
 # Give people a chance to retry running the installation
 catch_errors() {
   echo -e "\n\e[31mOmarchy installation failed!\e[0m"
@@ -12,16 +14,70 @@ catch_errors() {
 
 trap catch_errors ERR
 
-# Install everything
+show_logo() {
-for f in ~/.local/share/omarchy/install/*.sh; do
+  clear
-  echo -e "\nRunning installer: $f"
+  tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
-  source "$f"
+  echo
-done
+}
 
-# Ensure locate is up to date now that everything has been installed
+show_subtext() {
+  echo "$1" | tte --frame-rate ${3:-640} ${2:-wipe}
+  echo
+}
+
+# Install prerequisites
+source $OMARCHY_INSTALL/preflight/aur.sh
+source $OMARCHY_INSTALL/preflight/presentation.sh
+
+# Configuration
+show_logo beams 240
+show_subtext "Let's install Omarchy! [1/5]"
+source $OMARCHY_INSTALL/config/identification.sh
+source $OMARCHY_INSTALL/config/config.sh
+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/login.sh
+source $OMARCHY_INSTALL/config/plymouth.sh
+source $OMARCHY_INSTALL/config/nvidia.sh
+
+# Development
+show_logo decrypt 920
+show_subtext "Installing terminal tools [2/5]"
+source $OMARCHY_INSTALL/development/terminal.sh
+source $OMARCHY_INSTALL/development/development.sh
+source $OMARCHY_INSTALL/development/nvim.sh
+source $OMARCHY_INSTALL/development/ruby.sh
+source $OMARCHY_INSTALL/development/docker.sh
+source $OMARCHY_INSTALL/development/firewall.sh
+
+# Desktop
+show_logo slice 60
+show_subtext "Installing desktop tools [3/5]"
+source $OMARCHY_INSTALL/desktop/desktop.sh
+source $OMARCHY_INSTALL/desktop/hyprlandia.sh
+source $OMARCHY_INSTALL/desktop/theme.sh
+source $OMARCHY_INSTALL/desktop/bluetooth.sh
+source $OMARCHY_INSTALL/desktop/asdcontrol.sh
+source $OMARCHY_INSTALL/desktop/fonts.sh
+source $OMARCHY_INSTALL/desktop/printer.sh
+
+# Apps
+show_logo expand
+show_subtext "Installing default applications [4/5]"
+source $OMARCHY_INSTALL/apps/webapps.sh
+source $OMARCHY_INSTALL/apps/xtras.sh
+source $OMARCHY_INSTALL/apps/mimetypes.sh
+
+# Updates
+show_logo highlight
+show_subtext "Updating system packages [5/5]"
 sudo updatedb
-
-# Update all built-in packages
 sudo pacman -Syu --noconfirm
 
-gum confirm "Reboot to apply all settings?" && reboot
+# Reboot
+show_logo laseretch 920
+show_subtext "You're done! So we'll be rebooting now..."
+sleep 2
+reboot

install/1-aur.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# Only add Chaotic-AUR if the architecture is x86_64 so ARM users can build the packages
-if [[ "$(uname -m)" == "x86_64" ]]; then
-  # Import Chaotic-AUR key
-  sudo pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
-  sudo pacman-key --lsign-key 3056513887B78AEB
-
-  # Install Chaotic-AUR keyring and mirrorlist
-  sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
-  sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
-
-  # Add Chaotic-AUR repo to pacman config
-  echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
-
-  # Refresh pacman package databases
-  sudo pacman -Sy
-
-  # Install yay
-  sudo pacman -S --needed --noconfirm yay
-else
-  sudo pacman -S --needed --noconfirm base-devel
-
-  if ! command -v yay &>/dev/null; then
-    cd /tmp
-    git clone https://aur.archlinux.org/yay-bin.git
-    cd yay-bin
-    makepkg -si --noconfirm
-    cd -
-    rm -rf yay-bin
-    cd ~
-  fi
-
-fi
-
-# Add fun and color to the pacman installer
-sudo sed -i '/^\[options\]/a Color\nILoveCandy' /etc/pacman.conf

install/2-presentation.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Need gum to query for input
-yay -S --noconfirm --needed gum python-terminaltexteffects
-
-show_logo() {
-  clear
-  tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
-  echo -e ""
-}
-
-show_subtext() {
-  echo "$1" | tte --frame-rate ${3:-640} ${2:-wipe}
-  echo -e ""
-}

install/config/identification.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-show_logo beams 240
-show_subtext "Let's install Omarchy!"
-
 export OMARCHY_USER_NAME=$(gum input --placeholder "Enter full name" --prompt "Name> ")
 export OMARCHY_USER_EMAIL=$(gum input --placeholder "Enter email address" --prompt "Email> ")

install/config/login.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
 yay -S --noconfirm --needed uwsm
 
 # Compile the seamless login helper -- needed to prevent seeing terminal between loader and desktop

install/config/nvidia.sh

@@ -12,6 +12,9 @@
 
 # --- GPU Detection ---
 if [ -n "$(lspci | grep -i 'nvidia')" ]; then
+  show_logo
+  show_subtext "Install NVIDIA drivers..."
+
   # --- Driver Selection ---
   # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
   if echo "$(lspci | grep -i 'nvidia')" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then

install/config/timezones.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [[ ! -f /etc/sudoers.d/omarchy-tzupdate ]]; 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
+EOF
+  sudo chmod 0440 /etc/sudoers.d/omarchy-tzupdate
+fi

install/desktop/theme.sh

@@ -1,16 +1,21 @@
 #!/bin/bash
 
 # Use dark mode for QT apps too (like kdenlive)
-sudo pacman -S --noconfirm kvantum-qt5
+if ! yay -Q kvantum-qt5 &>/dev/null; then
+  yay -S --noconfirm kvantum-qt5
+fi
 
 # Prefer dark mode everything
-sudo pacman -S --noconfirm gnome-themes-extra # Adds Adwaita-dark theme
+if ! yay -Q gnome-themes-extra &>/dev/null; then
+  yay -S --noconfirm gnome-themes-extra # Adds Adwaita-dark theme
+fi
+
 gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
 
 # Setup theme links
 mkdir -p ~/.config/omarchy/themes
-for f in ~/.local/share/omarchy/themes/*; do ln -s "$f" ~/.config/omarchy/themes/; done
+for f in ~/.local/share/omarchy/themes/*; do ln -nfs "$f" ~/.config/omarchy/themes/; done
 
 # Set initial theme
 mkdir -p ~/.config/omarchy/current

install/development/terminal.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-show_logo
-show_subtext "Let's install basic terminal tools..."
-
 yay -S --noconfirm --needed \
   wget curl unzip inetutils impala \
   fd eza fzf ripgrep zoxide bat jq \

install/preflight/aur.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+chaotic_ok=0
+
+# Only add Chaotic-AUR if the architecture is x86_64 so ARM users can build the packages
+if [[ "$(uname -m)" == "x86_64" ]]; then
+  # Try installing Chaotic-AUR keyring and mirrorlist
+  if sudo pacman-key --recv-key 3056513887B78AEB &&
+    sudo pacman-key --lsign-key 3056513887B78AEB &&
+    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' &&
+    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'; then
+
+    # Add Chaotic-AUR repo to pacman config
+    echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
+
+    # 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
+fi
+
+if [[ $chaotic_ok -eq 1 ]]; then
+  sudo pacman -S --needed --noconfirm yay
+else
+  # Manually install yay from AUR if not already available
+  if ! command -v yay &>/dev/null; then
+    # Install build tools
+    sudo pacman -S --needed --noconfirm base-devel
+    cd /tmp
+    git clone https://aur.archlinux.org/yay-bin.git
+    cd yay-bin
+    makepkg -si --noconfirm
+    cd -
+    rm -rf yay-bin
+    cd ~
+  fi
+fi
+
+# Add fun and color to the pacman installer
+sudo sed -i '/^\[options\]/a Color\nILoveCandy' /etc/pacman.conf

install/preflight/presentation.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+yay -S --noconfirm --needed gum python-terminaltexteffects

logo.txt

@@ -1,9 +1,10 @@
- ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+                 ▄▄▄
-███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
+ ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄
-███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
-███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
-███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
-███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
- ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
+███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
-                                          ███    ███                                    
+███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
+███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
+███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
+███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
+ ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀
+                                       ███   █▀

migrations/1753352057.sh

@@ -1,17 +1,20 @@
 echo "Add Chaotic-AUR to get compiled binaries"
 
 if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.conf; then
-  # Import Chaotic-AUR key
+  # Try installing Chaotic-AUR keyring and mirrorlist
-  sudo pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+  if sudo pacman-key --recv-key 3056513887B78AEB &&
-  sudo pacman-key --lsign-key 3056513887B78AEB
+    sudo pacman-key --lsign-key 3056513887B78AEB &&
-
+    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' &&
-  # Install Chaotic-AUR keyring and mirrorlist
+    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'; then
-  sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst'
-  sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
 
     # Add Chaotic-AUR repo to pacman config
     echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
 
     # 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
 fi

migrations/1753495989.sh

@@ -0,0 +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
+  bash ~/.local/share/omarchy/install/config/timezones.sh
+  omarchy-refresh-waybar
+fi

omarchy.svg

@@ -0,0 +1 @@
+<svg fill="none" height="285" viewBox="0 0 1215 285" width="1215" xmlns="http://www.w3.org/2000/svg"><g fill="#000"><path clip-rule="evenodd" d="m720 120h-15v15h-14.998v14.999l-60.002.001v15.002l90-.002v.002h.002l-.002 89.998h-15v15h-13v15h-17v-89.998h-45v90l-45-.002v-89.998h-14.998v-30h14.998v-15.002h-14.998v-30.001h14.998v-75h15v-14.997h15v-15.002h105.002zm-90-.001h45v-74.997h-45z" fill-rule="evenodd"/><path clip-rule="evenodd" d="m105 30.002h15v14.997h15v180.001h-15v15h-15v15.002h-75v-15.002h-15v-15h-15v-180.001h15v-14.997h15v-15.002h75zm-60 194.998h45v-179.998h-45z" fill-rule="evenodd"/><path d="m300 15h60v15h15v14.999h15v180.001h-15v15h-15v15h-15l-.004-209.998h-44.994v-.002h-.002v210.002h-45v-210h-44.998v179.997h-.002v30.003h-15v-15.002h-15v-15h-14.998v-180.001h14.998v-14.999h15v-15h60v-15h45z"/><path clip-rule="evenodd" d="m555 225h-15v15h-15v15h-15v-105.001l-44.998.001v105.002h-45.002v-105.002h-15v-30.001h15v-75h15.002v-14.997h15v-15.002h105zm-89.998-105.001h44.998v-74.997h-44.998z" fill-rule="evenodd"/><path d="m885 75h-15v15h-15v15h-15v-59.998h-45v179.998h45v-59.998h15v14.997h15v15.001h15v30h-15v15h-15v15.002l-105-.002v-210.001h14.998v-14.997h15.002v-15.002h105z"/><path d="m960 119.999h45v-104.999h15v15h15v14.999h15v75.001h15v15h-15v90h-15v15h-15v15h-15v-105h-45v105.002l-45-.002v-105h-30v-15h15v-15.001h15v-75h15v-14.997h15v-15.002h15z"/><path d="m1125 119.999h45v-104.999h15v15h15v15h15v180h-15v15h-15v15.002l-75-.002v-15h-15v-15h-15v-45.001h15v-14.997-.002h30v60h45v-75h-90v-105.001h15v-14.997h15v-15.002h15z"/></g></svg>