Merge branch 'dev'

Omarchy v1.6.2

bin/omarchy-cmd-screensaver

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-trap "exit" SIGINT
-
-while true; do
-  effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
-  tte -i ~/.local/share/omarchy/logo.txt \
-    --frame-rate 240 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c \
-    "$effect"
-done

bin/omarchy-launch-screensaver

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-pkill -f "alacritty --class Screensaver" ||
-  alacritty --class Screensaver --title Screensaver -o 'colors.primary.background="#000000"' \
-    -e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver

boot.sh

@@ -1,15 +1,14 @@
 #!/bin/bash
 
-ansi_art='                 ▄▄▄                                                   
- ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
+ansi_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
+███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
+███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
+███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
 ███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
-███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
-███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
-███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
- ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀ 
-                                       ███   █▀                                  '
+ ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
+                                          ███    ███                                    '
 
 clear
 echo -e "\n$ansi_art\n"

config/hypr/monitors.conf

@@ -1,20 +1,17 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
-# List current monitors and resolutions possible: hyprctl monitors
-# Format: monitor = [port], resolution, position, scale
-# You must relaunch Hyprland after changing any envs (use Super+Esc, then Relaunch)
 
-# Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K.
+# Change to 1 if on a 1x display (then change last "auto" to 1 in monitor=)
+# Change to something like 1.75 for fractional scaling (can work well with 1.66667 monitor scaling)
+# Note: You must relaunch Hyprland after changing any env like this (use Super+Esc, then Relaunch)
 env = GDK_SCALE,2
+
+# Use single default monitor (see all monitors with: hyprctl monitors)
+# Format: monitor = [port], resolution, position, scale
 monitor=,preferred,auto,auto
 
-# Good compromise for 27" or 32" 4K monitors (but fractional!)
-# env = GDK_SCALE,1.75
+# Exmaple for fractional scaling that works well with GDK_SCALE,1.75
 # monitor=,preferred,auto,1.666667
 
-# Straight 1x setup for low-resolution displays like 1080p or 1440p
-# env = GDK_SCALE,1
-# monitor=,preferred,auto,1
-
 # Example for Framework 13 w/ 6K XDR Apple display
-# monitor = DP-5, 6016x3384@60, auto, 2
-# monitor = eDP-1, 2880x1920@120, auto, 2
+# monitor = DP-5, 6016x3384@60.00, auto, 2
+# monitor = eDP-1, 2880x1920@120.00, auto, 2

default/bashrc

@@ -1,14 +0,0 @@
-# All the default Omarchy aliases and functions
-# (don't mess with these directly, just overwrite them here!)
-source ~/.local/share/omarchy/default/bash/rc
-
-# Add your own exports, aliases, and functions here.
-#
-# Make an alias for invoking commands you use constantly
-# alias p='python'
-#
-# Use VSCode instead of neovim as your default editor
-# export EDITOR="code"
-#
-# Set a custom prompt with the directory revealed (alternatively use https://starship.rs)
-# PS1="\W \[\e]0;\w\a\]$PS1"

default/hypr/bindings/utilities.conf

@@ -32,8 +32,5 @@ bind = CTRL, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot outp
 bind = ALT, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenrecord
 bind = CTRL ALT, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenrecord output
 
-# Screensaver
-bind = SUPER ALT, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-launch-screensaver
-
 # Color picker
 bind = SUPER, PRINT, exec, hyprpicker -a

default/hypr/windows.conf

@@ -5,11 +5,10 @@ windowrule = suppressevent maximize, class:.*
 windowrule = tile, class:^(Chromium)$
 
 # Float and center settings and previews
-windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
-windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
+windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
 windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty)$
-windowrule = size 590 400, class:Omarchy
-windowrule = size 700 470 class:About
+windowrule = size 645 450, class:Omarchy
+windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
 
 # Float and center file pickers
 windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
@@ -20,9 +19,6 @@ windowrule = float, class:steam
 windowrule = center, class:steam
 windowrule = fullscreen, class:^(com.libretro.RetroArch)$
 
-# Fullscreen screensaver
-windowrule = fullscreen, class:Screensaver
-
 # Just dash of opacity
 windowrule = opacity 0.97 0.9, class:.*
 windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$

install/config/config.sh

@@ -4,7 +4,7 @@
 cp -R ~/.local/share/omarchy/config/* ~/.config/
 
 # Use default bashrc from Omarchy
-cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
+echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc
 
 # Ensure application directory exists for update-desktop-database
 mkdir -p ~/.local/share/applications