DRY

Co-authored-by: Bhavesh Sooka <bhavesh@synthesis.co.za>

bin/omarchy-branch-set

@@ -3,14 +3,15 @@
 # Set the branch for Omarchy's git repository.
 
 if (($# == 0)); then
-  echo "Usage: omarchy-branch-set [master|dev]"
+  echo "Usage: omarchy-branch-set [master|rc|dev]"
   exit 1
 else
   branch="$1"
 fi
 
-case "$branch" in
-  "master") git -C $OMARCHY_PATH switch master ;;
-  "dev") git -C $OMARCHY_PATH switch dev ;;
-  *) echo "Unknown branch: $branch"; exit 1; ;;
-esac
+if [[ "$branch" != "master" && "$branch" != "rc" && "$branch" != "edge" ]]; then
+  echo "Error: Invalid branch '$branch'. Must be one of: master, rc, edge"
+  exit 1
+fi
+
+git -C $OMARCHY_PATH switch $branch

bin/omarchy-channel-set

@@ -14,7 +14,7 @@
 # and people with a lot of experience managing Linux systems.
 
 if (($# == 0)); then
-  echo "Usage: omarchy-channel-set [stable|edge|dev]"
+  echo "Usage: omarchy-channel-set [stable|rc|edge|dev]"
   exit 1
 else
   channel="$1"
@@ -22,6 +22,7 @@ fi
 
 case "$channel" in
 "stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" && sudo pacman -Suu --noconfirm ;;
+"rc") omarchy-branch-set "rc" && omarchy-refresh-pacman "rc" && sudo pacman -Suu --noconfirm ;;
 "edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
 "dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
 *) echo "Unknown channel: $channel"; exit 1; ;;

bin/omarchy-install-geforce-now

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Install and launch Geforce Now.
+
+set -e
+
+omarchy-pkg-add flatpak
+cd /tmp
+
+# Download and run GeForce NOW
+curl -LO https://international.download.nvidia.com/GFNLinux/GeForceNOWSetup.bin
+chmod +x GeForceNOWSetup.bin
+./GeForceNOWSetup.bin
+
+# Ensure a separate browser process not started by GFN is available.
+# If not, it seems like GFN has a tendency to hang on login.
+setsid omarchy-launch-browser

bin/omarchy-menu

@@ -355,8 +355,9 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
+  case $(menu "Install" "  Steam\n󰢹  NVIDIA GeForce NOW\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
   *Steam*) present_terminal omarchy-install-steam ;;
+  *GeForce*) present_terminal omarchy-install-geforce-now ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
   *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
@@ -505,8 +506,9 @@ show_update_menu() {
 }
 
 show_update_channel_menu() {
-  case $(menu "Update channel" "🟢 Stable\n🟡 Edge\n🔴 Dev") in
+  case $(menu "Update channel" "🟢 Stable\n🟡 Release Candidate\n🟠 Edge\n🔴 Dev") in
   *Stable*) present_terminal "omarchy-channel-set stable" ;;
+  *Candidate*) present_terminal "omarchy-channel-set rc" ;;
   *Edge*) present_terminal "omarchy-channel-set edge" ;;
   *Dev*) present_terminal "omarchy-channel-set dev" ;;
   *) show_update_menu ;;
@@ -554,6 +556,10 @@ show_update_password_menu() {
   esac
 }
 
+show_about() {
+  omarchy-launch-about
+}
+
 show_system_menu() {
   local options="  Lock\n󱄄  Screensaver"
   [ -f ~/.local/state/omarchy/toggles/suspend-on ] && options="$options\n󰒲  Suspend"
@@ -591,7 +597,7 @@ go_to_menu() {
   *install*) show_install_menu ;;
   *remove*) show_remove_menu ;;
   *update*) show_update_menu ;;
-  *about*) omarchy-launch-about ;;
+  *about*) show_about ;;
   *system*) show_system_menu ;;
   esac
 }

bin/omarchy-refresh-pacman

@@ -7,17 +7,18 @@
 sudo cp -f /etc/pacman.conf /etc/pacman.conf.bak
 sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak
 
-if [[ $1 == "edge" ]]; then
-  sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-edge.conf /etc/pacman.conf
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
-  echo "Setting channel to edge"
-else
-  sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-stable.conf /etc/pacman.conf
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
-  echo "Setting channel to stable"
+channel="${1:-stable}"
+
+if [[ "$channel" != "stable" && "$channel" != "rc" && "$channel" != "edge" ]]; then
+  echo "Error: Invalid channel '$channel'. Must be one of: stable, rc, edge"
+  exit 1
 fi
 
+echo "Setting channel to $channel"
 echo
 
+sudo cp -f "$OMARCHY_PATH/default/pacman/pacman-$channel.conf" /etc/pacman.conf
+sudo cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-$channel" /etc/pacman.d/mirrorlist
+
 # Reset all package DBs and then update
 sudo pacman -Syyu --noconfirm

bin/omarchy-show-done

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 echo
-gum spin --spinner "globe" --title "Done! Press any key to close..." -- bash -c 'read -n 1 -s'
+gum spin --spinner "globe" --title "Done! Press any key to close..." -- bash -c 'read -t 7 -n 1 -s'

bin/omarchy-version-channel

@@ -2,6 +2,8 @@
 
 if grep -q "https://stable-mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
   mirror="stable"
+elif grep -q "https://rc-mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
+  mirror="rc"
 elif grep -q "https://mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
   mirror="edge"
 else
@@ -12,6 +14,8 @@ if grep -q "https://pkgs.omarchy.org/stable/" /etc/pacman.conf; then
   pkgs="stable"
 elif grep -q "https://pkgs.omarchy.org/edge/" /etc/pacman.conf; then
   pkgs="edge"
+elif grep -q "https://pkgs.omarchy.org/rc/" /etc/pacman.conf; then
+  pkgs="rc"
 else
   pkgs="unknown"
 fi

config/hypr/bindings.conf

@@ -1,6 +1,7 @@
 # Application bindings
 bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)"
 bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
+bindd = SUPER ALT SHIFT, F, File manager (cwd), exec, uwsm-app -- nautilus --new-window "$(omarchy-cmd-terminal-cwd)"
 bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
 bindd = SUPER SHIFT ALT, B, Browser (private), exec, omarchy-launch-browser --private
 bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify

config/omarchy/extensions/menu.sh

@@ -12,3 +12,9 @@
 #   *) back_to show_main_menu ;;
 #   esac
 # }
+# 
+# Example of overriding just the about menu action: (Using zsh instead of bash (default))
+# 
+# show_about() {
+#   exec omarchy-launch-or-focus-tui "zsh -c 'fastfetch; read -k 1'"
+# }

default/hypr/apps.conf

@@ -9,6 +9,7 @@ source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
 source = ~/.local/share/omarchy/default/hypr/apps/qemu.conf
 source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf
 source = ~/.local/share/omarchy/default/hypr/apps/steam.conf
+source = ~/.local/share/omarchy/default/hypr/apps/geforce.conf
 source = ~/.local/share/omarchy/default/hypr/apps/system.conf
 source = ~/.local/share/omarchy/default/hypr/apps/telegram.conf
 source = ~/.local/share/omarchy/default/hypr/apps/terminals.conf

default/hypr/apps/bitwarden.conf

@@ -1,2 +1,6 @@
 windowrule = no_screen_share on, match:class ^(Bitwarden)$
 windowrule = tag +floating-window, match:class ^(Bitwarden)$
+
+# Bitwarden Chrome Extension
+windowrule = no_screen_share on, match:class chrome-nngceckbapebfimnlniiiahkandclblb-Default
+windowrule = tag +floating-window, match:class chrome-nngceckbapebfimnlniiiahkandclblb-Default

default/hypr/apps/geforce.conf

@@ -0,0 +1,5 @@
+windowrule {
+  name = geforce
+  match:class = GeForceNOW
+  idle_inhibit = fullscreen
+}

default/hypr/apps/jetbrains.conf

@@ -1,22 +1,41 @@
 # Fix splash screen showing in weird places and prevent annoying focus takeovers
-windowrule = tag +jetbrains-splash, match:class ^(jetbrains-.*)$, match:title ^(splash)$, match:float 1
-windowrule = center on, match:tag jetbrains-splash
-windowrule = no_focus on, match:tag jetbrains-splash
-windowrule = border_size 0, match:tag jetbrains-splash
+windowrule {
+    name = jetbrains-splash
+    match:class = ^(jetbrains-.*)$
+    match:title = ^(splash)$
+    match:float = 1
+    tag = +jetbrains-splash
+    center = on
+    no_focus = on
+    border_size = 0
+}
 
 # Center popups/find windows
-windowrule = tag +jetbrains, match:class ^(jetbrains-.*), match:title ^()$, match:float 1
-windowrule = center on, match:tag jetbrains
-
-# Enabling this makes it possible to provide input in popup dialogs (search window, new file, etc.)
-windowrule = stay_focused on, match:tag jetbrains
-windowrule = border_size 0, match:tag jetbrains
-
-# For some reason tag:jetbrains does not work for size rule
-windowrule = min_size (monitor_w*0.5) (monitor_h*0.5), match:class ^(jetbrains-.*), match:title ^()$, match:float 1
+windowrule {
+    name = jetbrains-popup
+    match:class = ^(jetbrains-.*)
+    match:title = ^()$
+    match:float = 1
+    tag = +jetbrains
+    center = on
+    # Enabling this makes it possible to provide input in popup dialogs (search window, new file, etc.)
+    stay_focused = on
+    border_size = 0
+    min_size = (monitor_w*0.5) (monitor_h*0.5)
+  }
 
 # Disable window flicker when autocomplete or tooltips appear
-windowrule = no_initial_focus on, match:class ^(jetbrains-.*)$, match:title ^(win.*)$, match:float 1
+windowrule {
+    name = jetbrains-tooltip
+    match:class = ^(jetbrains-.*)$
+    match:title = ^(win.*)$
+    match:float = 1
+    no_initial_focus = on
+}
 
 # Disable mouse focus
-windowrule = no_follow_mouse on, match:class ^(jetbrains-.*)$
+windowrule {
+    name = jetbrains-focus
+    no_follow_mouse = on
+    match:class = ^(jetbrains-.*)$
+}

default/hypr/apps/steam.conf

@@ -1,7 +1,7 @@
 # Float Steam
 windowrule = float on, match:class steam
 windowrule = center on, match:class steam, match:title Steam
-windowrule = opacity 1 1, match:class steam
+windowrule = opacity 1 1, match:class steam.*
 windowrule = size 1100 700, match:class steam, match:title Steam
 windowrule = size 460 800, match:class steam, match:title Friends List
 windowrule = idle_inhibit fullscreen, match:class steam

default/hypr/envs.conf

@@ -6,7 +6,7 @@ env = HYPRCURSOR_SIZE,24
 env = GDK_BACKEND,wayland,x11,*
 env = QT_QPA_PLATFORM,wayland;xcb
 env = QT_STYLE_OVERRIDE,kvantum
-env = SDL_VIDEODRIVER,wayland
+env = SDL_VIDEODRIVER,wayland,x11
 env = MOZ_ENABLE_WAYLAND,1
 env = ELECTRON_OZONE_PLATFORM_HINT,wayland
 env = OZONE_PLATFORM,wayland

default/pacman/mirrorlist-rc

@@ -0,0 +1 @@
+Server = https://rc-mirror.omarchy.org/$repo/os/$arch

default/pacman/pacman-rc.conf

@@ -0,0 +1,30 @@
+# See the pacman.conf(5) manpage for option and repository directives
+
+[options]
+Color
+ILoveCandy
+VerbosePkgLists
+HoldPkg = pacman glibc
+Architecture = auto
+CheckSpace
+ParallelDownloads = 5
+DownloadUser = alpm
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel = Required DatabaseOptional
+LocalFileSigLevel = Optional
+
+# pacman searches repositories in the order defined here
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+[omarchy]
+SigLevel = Optional TrustAll
+Server = https://pkgs.omarchy.org/edge/$arch

install/config/hardware/fix-asus-rog-audio-mixer.sh

@@ -6,4 +6,10 @@ if [[ "$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)" == "ASUSTeK COMPUTER INC
   mkdir -p ~/.config/wireplumber/wireplumber.conf.d/
   cp $OMARCHY_PATH/default/wireplumber/wireplumber.conf.d/alsa-soft-mixer.conf ~/.config/wireplumber/wireplumber.conf.d/
   rm -rf ~/.local/state/wireplumber/default-routes
+
+  # Unmute the Master control on the ALC285 card (often muted by default)
+  card=$(aplay -l 2>/dev/null | grep -i "ALC285" | head -1 | sed 's/card \([0-9]*\).*/\1/')
+  if [[ -n "$card" ]]; then
+    amixer -c "$card" set Master 80% unmute 2>/dev/null
+  fi
 fi

install/omarchy-base.packages

@@ -5,6 +5,7 @@
 1password-cli
 aether
 alacritty
+alsa-utils
 asdcontrol
 avahi
 bash-completion
@@ -79,6 +80,7 @@ mariadb-libs
 mise
 mpv
 nautilus
+nautilus-python
 gnome-disk-utility
 noto-fonts
 noto-fonts-cjk

migrations/1769183359.sh

@@ -0,0 +1,3 @@
+echo "Add nautilus-python package for 'Open in Ghostty' shortcut in Nautilus"
+
+omarchy-pkg-add nautilus-python

migrations/1769543550.sh

@@ -0,0 +1,6 @@
+echo "Add SUPER+ALT+SHIFT+F shortcut to open nautilus in cwd"
+
+# Add the new CWD binding if it doesn't exist
+if ! grep -q "SUPER ALT SHIFT, F" ~/.config/hypr/bindings.conf; then
+  sed -i '/bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window/a bindd = SUPER ALT SHIFT, F, File manager (cwd), exec, uwsm-app -- nautilus --new-window "$(omarchy-cmd-terminal-cwd)"' ~/.config/hypr/bindings.conf
+fi

migrations/1769566732.sh

@@ -1,3 +1,3 @@
-echo "Set Power Profiles Rules when plugged in (balanced) and unplugged (power-saver)"
+echo "Set power profile based on source switching (AC or Battery)"
 
 source $OMARCHY_PATH/install/config/powerprofilesctl-rules.sh