Merge pull request #195 from basecamp/dev

Omarchy v1.4.1

bin/omarchy-refresh-waybar

@@ -6,6 +6,5 @@ if gum confirm "Refresh Waybar config? This will replace your current settings w
   cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
 
   # Restart waybar
-  pkill waybar
+  pkill -SIGUSR2 waybar
-  setsid waybar >/dev/null 2>&1 &
 fi

bin/omarchy-theme-bg-next

@@ -5,7 +5,7 @@
 BACKGROUNDS_DIR="$HOME/.config/omarchy/current/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
+BACKGROUNDS=($(find "$BACKGROUNDS_DIR" -type f | sort))
 TOTAL=${#BACKGROUNDS[@]}
 
 # Get current background from symlink
@@ -13,7 +13,7 @@ if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
   CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
 else
   # Default to first background if no symlink exists
-  CURRENT_BACKGROUND="${BACKGROUNDS[0]}"
+  CURRENT_BACKGROUND=${BACKGROUNDS[0]}
 fi
 
 # Find current background index
@@ -27,7 +27,7 @@ done
 
 # Get next background (wrap around)
 NEXT_INDEX=$(((INDEX + 1) % TOTAL))
-NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
+NEW_BACKGROUND=${BACKGROUNDS[$NEXT_INDEX]}
 
 # Set new background symlink
 ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"

bin/omarchy-theme-set

@@ -29,8 +29,7 @@ ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 touch "$HOME/.config/alacritty/alacritty.toml"
 
 # Restart components to apply new theme
-pkill waybar
+pkill -SIGUSR2 waybar
-setsid waybar >/dev/null 2>&1 &
 makoctl reload
 hyprctl reload
 

bin/omarchy-toggle-idle

@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-if pgrep -x hypridle >/dev/null; then
+if pgrep -x hypridle > /dev/null; then
   pkill -x hypridle
   notify-send "Stop locking computer when idle"
 else
-  setsid hypridle &>/dev/null &
+  setsid hypridle &> /dev/null &
   notify-send "Now locking computer when idle"
 fi

config/hypr/hyprland.conf

@@ -19,20 +19,20 @@ source = ~/.local/share/omarchy/default/hypr/windows.conf
 source = ~/.config/omarchy/current/theme/hyprland.conf
 
 # Application bindings
-$terminal = uwsm app -- alacritty
+$terminal = alacritty
-$browser = uwsm app -- chromium --new-window --ozone-platform=wayland
+$browser = chromium --new-window --ozone-platform=wayland
 $webapp = $browser --app
 
 bind = SUPER, return, exec, $terminal
-bind = SUPER, F, exec, uwsm app -- nautilus --new-window
+bind = SUPER, F, exec, nautilus --new-window
 bind = SUPER, B, exec, $browser
-bind = SUPER, M, exec, uwsm app -- spotify
+bind = SUPER, M, exec, spotify
 bind = SUPER, N, exec, $terminal -e nvim
 bind = SUPER, T, exec, $terminal -e btop
 bind = SUPER, D, exec, $terminal -e lazydocker
-bind = SUPER, G, exec, uwsm app -- signal-desktop
+bind = SUPER, G, exec, signal-desktop
-bind = SUPER, O, exec, uwsm app -- obsidian -disable-gpu
+bind = SUPER, O, exec, obsidian -disable-gpu
-bind = SUPER, slash, exec, uwsm app -- 1password
+bind = SUPER, slash, exec, 1password
 
 bind = SUPER, A, exec, $webapp="https://chatgpt.com"
 bind = SUPER SHIFT, A, exec, $webapp="https://grok.com"

default/bash/aliases

@@ -15,7 +15,7 @@ zd() {
   fi
 }
 open() {
-  xdg-open "$@" >/dev/null 2>&1 &
+  xdg-open "$@" >/dev/null 2>&1
 }
 
 # Directories

default/hypr/autostart.conf

@@ -1,7 +1,4 @@
-exec-once = uwsm app -- hypridle
+exec-once = hypridle & mako & waybar & fcitx5
-exec-once = uwsm app -- mako
+exec-once = swaybg -i ~/.config/omarchy/current/background -m fill
-exec-once = uwsm app -- waybar
-exec-once = uwsm app -- fcitx5
-exec-once = uwsm app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'

default/hypr/bindings/utilities.conf

@@ -1,6 +1,5 @@
 # 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-show-keybindings
 
 # Aesthetics

default/hypr/windows.conf

@@ -22,7 +22,7 @@ windowrule = fullscreen, class:^(com.libretro.RetroArch)$
 windowrule = opacity 0.97 0.9, class:.*
 windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
 windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
-windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
+windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv)$
 windowrule = opacity 1 1, class:^(com.libretro.RetroArch|steam)$
 
 # Fix some dragging issues with XWayland

install/1-yay.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 sudo pacman -S --needed --noconfirm base-devel
 
 if ! command -v yay &>/dev/null; then

install/2-identification.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Need gum to query for input
 yay -S --noconfirm --needed gum
 

install/3-terminal.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 yay -S --noconfirm --needed \
   wget curl unzip inetutils impala \
   fd eza fzf ripgrep zoxide bat \

install/4-config.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Copy over Omarchy configs
 cp -R ~/.local/share/omarchy/config/* ~/.config/
 

install/asdcontrol.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Install asdcontrol for controlling brightness on Apple Displays
 if [ -z "$OMARCHY_BARE" ] && ! command -v asdcontrol &>/dev/null; then
   git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol

install/backgrounds.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 BACKGROUNDS_DIR=~/.config/omarchy/backgrounds/
 
 download_background_image() {

install/bluetooth.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Install bluetooth controls
 yay -S --noconfirm --needed blueberry
 

install/desktop.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 yay -S --noconfirm --needed \
   brightnessctl playerctl pamixer pavucontrol wireplumber \
   fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \

install/development.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 yay -S --noconfirm --needed \
   cargo clang llvm mise \
   imagemagick \

install/docker.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 yay -S --noconfirm --needed docker docker-compose
 
 # Limit log size to avoid running out of disk

install/firewall.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-if ! command -v ufw &>/dev/null; then
-  yay -Sy --noconfirm --needed ufw ufw-docker
-
-  # Allow nothing in, everything out
-  sudo ufw default deny incoming
-  sudo ufw default allow outgoing
-
-  # Allow ports for LocalSend
-  sudo ufw allow 53317/udp
-  sudo ufw allow 53317/tcp
-
-  # Allow SSH in
-  sudo ufw allow 22/tcp
-
-  # Allow Docker containers to use DNS on host
-  sudo ufw allow in on docker0 to any port 53
-
-  # Turn on the firewall
-  sudo ufw enable
-
-  # Turn on Docker protections
-  sudo ufw-docker install
-  sudo ufw reload
-fi

install/fix-fkeys.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 if [[ ! -f /etc/modprobe.d/hid_apple.conf ]]; then
   echo "options hid_apple fnmode=2" | sudo tee /etc/modprobe.d/hid_apple.conf
 

install/fonts.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 if [ -z "$OMARCHY_BARE" ]; then
   yay -Sy --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
 else

install/hyprlandia.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 yay -S --noconfirm --needed \
   hyprland hyprshot hyprpicker hyprlock hypridle polkit-gnome hyprland-qtutils \
   wofi waybar mako swaybg \

install/login.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 # Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
 yay -S --noconfirm --needed uwsm
 

install/mimetypes.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 update-desktop-database ~/.local/share/applications
 
 # Open all images with imv

install/network.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Install iwd explicitly if it wasn't included in archinstall
 # This can happen if archinstall used ethernet
 if ! command -v iwd &>/dev/null; then

install/nvidia.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # ==============================================================================
 # Hyprland NVIDIA Setup Script for Arch Linux
 # ==============================================================================

install/nvim.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 if ! command -v nvim &>/dev/null; then
   yay -S --noconfirm --needed nvim luarocks tree-sitter-cli
 

install/plymouth.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if ! command -v plymouth &>/dev/null; then
   yay -S --noconfirm --needed plymouth

install/power.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Setting the performance profile can make a big difference. By default, most systems seem to start in balanced mode,
 # even if they're not running off a battery. So let's make sure that's changed to performance.
 yay -S --noconfirm power-profiles-daemon

install/printer.sh

@@ -1,4 +1,2 @@
-#!/bin/bash
-
 sudo pacman -S --noconfirm cups cups-pdf cups-filters system-config-printer
 sudo systemctl enable --now cups.service

install/ruby.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Install Ruby using gcc-14 for compatibility
 yay -S --noconfirm --needed gcc14
 mise settings set ruby.ruby_build_opts "CC=gcc-14 CXX=g++-14"

install/theme.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Use dark mode for QT apps too (like kdenlive)
 sudo pacman -S --noconfirm kvantum-qt5
 

install/webapps.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 if [ -z "$OMARCHY_BARE" ]; then
   source ~/.local/share/omarchy/default/bash/functions
   web2app "HEY" https://app.hey.com https://www.hey.com/assets/images/general/hey.png

install/xtras.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 if [ -z "$OMARCHY_BARE" ]; then
   yay -S --noconfirm --needed \
     gnome-calculator gnome-keyring signal-desktop \

migrations/1751225707.sh

@@ -1,4 +1,3 @@
 echo "Fixing persistent workspaces in waybar config"
 sed -i 's/"persistent_workspaces":/"persistent-workspaces":/' ~/.config/waybar/config
-pkill waybar
+pkill -SIGUSR2 waybar
-setsid waybar >/dev/null 2>&1 &

migrations/1752709610.sh

@@ -1,2 +0,0 @@
-echo "Enable ufw firewall"
-source ~/.local/share/omarchy/install/firewall.sh