Skip to content
Merged
Show file tree
Hide file tree
Changes from 74 commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
1388a25
Screensaver go fullscreen: --no-eol (tte 0.12.2/0.13.0) and --canvas-…
wolfgangw Oct 21, 2025
ba5343c
Bump version
ryanrhughes Nov 3, 2025
3065ca9
Fix --dir
ryanrhughes Nov 3, 2025
f955717
Merge pull request #2648 from wolfgangw/patch-1
ryanrhughes Nov 4, 2025
fc8e4c0
Make screensaver work with xdg-terminal-exec
ryanrhughes Nov 4, 2025
b1b6e5d
Update screensaver with 2x version
ryanrhughes Nov 4, 2025
33dde26
Kill the actual screensaver command
ryanrhughes Nov 4, 2025
2498216
Merge branch 'master' into dev
dhh Nov 4, 2025
4391df6
Fix declining an update
dhh Nov 4, 2025
bf26366
Setting PS1 is not necessary when we have starship
dhh Nov 5, 2025
8e21008
Fix class name for Microsoft Edge in browser.conf (#3145)
patroza Nov 5, 2025
a40ff46
(Hypr) Added 'stayfocused' window rule for DaVinci Resolve dialog win…
innerviewer Nov 5, 2025
904d253
Restart terminal (reload config) when changing font as well
dhh Nov 5, 2025
638e35f
Hyprland envs are superseeded by uwsm/env
dhh Nov 5, 2025
7a0bdaa
Scale with the right monitor (#3174)
y0no Nov 5, 2025
cb03d7d
Raise walker max_entries to 256
dhh Nov 5, 2025
870356e
Fix max_results to live under [providers]
dhh Nov 6, 2025
962aca3
Change order and let it live forever
dhh Nov 6, 2025
5fb29c1
Revert "Update screensaver with 2x version"
ryanrhughes Nov 6, 2025
8aa2d29
Revert "Make screensaver work with xdg-terminal-exec"
ryanrhughes Nov 6, 2025
c92a7ea
Revert "Kill the actual screensaver command"
ryanrhughes Nov 6, 2025
06fc4db
Merge branch 'master' into dev
dhh Nov 7, 2025
917279b
Merge branch 'master' into dev
dhh Nov 9, 2025
7a0fa07
Update icon URL placeholder to accept SVG format (#3253)
budnik Nov 9, 2025
c923629
Use xdg-terminal-exec in TUI installer for terminal compatibility (#3…
shelldandy Nov 9, 2025
26d37ca
Fix: hard-coded binding for changegroupactive (#3233)
adam-zluva Nov 9, 2025
49308eb
Update Helium browser in omarchy-launch-webapp (#3225)
MatyiFKBT Nov 9, 2025
694c83f
Add binding to invoke last mako notification (#3232)
czroth Nov 9, 2025
64e581e
Use AAC audio codec for screen recordings (#3220)
robzolkos Nov 9, 2025
e96bd08
Improve contrast on volume notification for Matte Black theme (#3212)
midnightslicer Nov 9, 2025
4d3c02c
Only restart if they are running
dhh Nov 9, 2025
79d48b4
Notify user that font changes require a Ghostty restart
dhh Nov 9, 2025
d33e947
We were already doing this!
dhh Nov 9, 2025
3d10b38
Ensure we can wake screen on both mouse and keyboard
dhh Nov 9, 2025
283a41c
Add Super + Alt + PageUp/Down for tiling groups to mimic browser
dhh Nov 9, 2025
70d1592
Add Super + Shift + Alt + Left/Right to move workspaces between monitors
dhh Nov 9, 2025
88b13e6
Launch or focus wifi settings
dhh Nov 10, 2025
3a744e0
Still need the setsid
dhh Nov 10, 2025
a304b32
Dynamically set hyprlock font and placeholder text (#3281)
mlombardi96 Nov 10, 2025
a9d6a77
Add `usage` to base packages (#3280)
tionichm Nov 10, 2025
7920716
Add migration
dhh Nov 10, 2025
6f33486
Fix match and make 1password float by default
dhh Nov 10, 2025
c6918e6
Make screensaver capable of running in any of the terminal options
dhh Nov 10, 2025
2425f4d
Default to the new stable mirror
dhh Nov 10, 2025
6167898
Use packages that exist
dhh Nov 10, 2025
d2aeb52
Prevent the conflict asking for rust v rustup
dhh Nov 10, 2025
fceb710
Package only exists on AUR
dhh Nov 10, 2025
a43d090
We've been using fresh
dhh Nov 10, 2025
9e1a704
Fix killing of screensaver running in any terminal
dhh Nov 10, 2025
bf3a5b0
Style
dhh Nov 10, 2025
b6ba588
Switch to Ghostty as the default terminal
dhh Nov 10, 2025
c981dda
Change default font to JetBrainsMono Nerd Font
dhh Nov 10, 2025
e354df3
Use a slower mouse scroll
dhh Nov 10, 2025
6e1f1ca
Slowdown the ghostty scrolling a tad
dhh Nov 10, 2025
f364ee1
Move everyone over to the stable mirror by default
dhh Nov 10, 2025
2290152
Fit height better for JetBrainsMono
dhh Nov 10, 2025
e97ae0d
Activate try when it is available
dhh Nov 10, 2025
d81f6de
Make Work/tries ready too
dhh Nov 10, 2025
2fcc4e9
More
dhh Nov 10, 2025
94f29f3
small fix in input.conf (#3298)
MislavPukljak Nov 10, 2025
3c19e4e
Add @tobi's try as a default install
dhh Nov 10, 2025
b7989ac
Ensure the system always has a base ruby even if one is not installed…
dhh Nov 10, 2025
a6d4919
Make sure the ruby is added separately from just try
dhh Nov 10, 2025
29aae9a
Tweak blur settings and apply it to walker
dhh Nov 10, 2025
89b1029
Can't use the blur on walker until we can run the whole thing as a si…
dhh Nov 11, 2025
42f4719
Match exact not partial window pattern
dhh Nov 11, 2025
a54ec3a
Exact matching is now part of omarchy-launch-or-focus
dhh Nov 11, 2025
8840af8
Don't waste time creating ri docs by default
dhh Nov 11, 2025
03cbbd2
improve: add image/video share and run share commands silently (#3330)
DankyoDev Nov 11, 2025
bea5791
Fix: Jetbrains popup dialog would not get focus automatically (#3326)
NicolasDorier Nov 11, 2025
9b849fc
feat: add custom imv keybindings for delete and rotate currently open…
ctarx Nov 11, 2025
279259d
Change format-disk to use exfat for better cross-platform compatibility
dhh Nov 16, 2025
4b2ff4f
Revert "improve: add image/video share and run share commands silentl…
dhh Nov 16, 2025
88684b6
Merge branch 'master' into dev
dhh Nov 16, 2025
e1745d7
Avoid invalid terminal working directory (#3428)
daviewales Nov 17, 2025
c17bd85
fix: start elephant as systemd service (#3405)
abenz1267 Nov 17, 2025
1ec9ccd
overload lateral window navigation for grouped windows (#3325)
chrislewis Nov 17, 2025
b2b65d5
Match Everforest Dark Hard from Ghostty
dhh Nov 17, 2025
83a8740
Match to Ghostty Mocha too
dhh Nov 17, 2025
72dc352
Add exfatprogs to base packages (#3448)
daviewales Nov 18, 2025
854b140
add back workspace 10 (#3447)
jelenv Nov 18, 2025
5ab2a69
Add migration to add the 10th workspace back to waybar config
dhh Nov 18, 2025
367eb5b
fix(walker): update for breaking changes in latest version
abenz1267 Nov 18, 2025
c1fca69
hypr: Adding xdph token default of true (#3404)
larrydewey Nov 18, 2025
42e1810
fix: disable mouse focus for JetBrains (#3336)
landsman Nov 19, 2025
438fa96
Add preview images to the themes menu (#3444)
tahayvr Nov 19, 2025
eec075b
improve: uniquely identify terminal apps for window rules and focus. …
patroza Nov 19, 2025
335845b
Add install options for xpadneo driver under gaming (#2009)
ericjim Nov 19, 2025
9af41af
Feature: Add bluetui integration and migration (#3207)
a-sologub Nov 19, 2025
e4a3d5e
Synchronize with new stable mirror
dhh Nov 19, 2025
c50003a
Make sure to stop and start in the new fashion
dhh Nov 19, 2025
2c1a761
Walker is not run as a systemd service
dhh Nov 19, 2025
489ddc7
Fix escaping
dhh Nov 19, 2025
13c3973
Spelling!
dhh Nov 19, 2025
f8dcc7e
Later migration does the refresh
dhh Nov 19, 2025
8174dc7
Let btop float by default to match all other system terminal windows
dhh Nov 19, 2025
6e83c4f
The restart is coming later when we switch to systemd
dhh Nov 19, 2025
1b7fca5
Simplify with a launch or focus variaty for tui
dhh Nov 19, 2025
8fe1d62
End good
dhh Nov 19, 2025
8f19806
Make existing alacritty installations compatible with X-TerminalArg
dhh Nov 19, 2025
da8c3d9
Add bash as well
dhh Nov 19, 2025
f77f107
Hide Bluetooth module in waybar if there's no BT controller
dhh Nov 19, 2025
3e4421a
Ensure we are using the new stable mirror before updating
dhh Nov 19, 2025
8c4bf65
Start using the stable pkg server by default
dhh Nov 19, 2025
20a3c46
Float imv by default
dhh Nov 20, 2025
44b37da
Allow optional arguments to img transcoding functions and prevent ove…
dhh Nov 20, 2025
261a7dc
Don't suggest invalid scale
dhh Nov 20, 2025
08143c5
No longer need these variables
dhh Nov 20, 2025
a1b1eb5
Add a new theme called Hackerman (#3317)
bjarneo Nov 20, 2025
c298823
This conflicts with Chromium when both are installed
dhh Nov 20, 2025
cd2a4e4
Add theme ethereal (#3464)
bjarneo Nov 20, 2025
fef7efc
Blue fits better imo
dhh Nov 20, 2025
0fc901d
Add 100-line split moves to Ghostty config
dhh Nov 20, 2025
4dbaf5e
Use connected bluetooth icon when appropriate
dhh Nov 20, 2025
5ea1ae2
Explain why -Sy is ok
dhh Nov 20, 2025
4c414f8
updated omarchy-hyprland-window-pop to have an optional parameters (#…
DarrenVictoriano Nov 20, 2025
b5002b1
Need to have fuzzy match to work with the web apps for matching
dhh Nov 20, 2025
ec59388
Make sure we just match exact
dhh Nov 20, 2025
37e5ed0
Restart waybar not walker
dhh Nov 20, 2025
4c8ee6c
There could have been another format-no-controller actually
dhh Nov 20, 2025
9626408
Remove the menus from the general provider so themes don't show up in…
dhh Nov 20, 2025
f6786e4
Update Waybar tray icon (#3479)
brink-lab Nov 20, 2025
661e4f5
Add migration
dhh Nov 20, 2025
9d89619
Fix the style update too
dhh Nov 20, 2025
a5ceb3f
We never ended up using this
dhh Nov 20, 2025
bdb9719
feat: don't screenshare notifications (#3482)
MangelMaxime Nov 20, 2025
cf6a847
Revert "feat: don't screenshare notifications (#3482)"
dhh Nov 20, 2025
7ebe9fd
Reapply "feat: don't screenshare notifications (#3482)"
dhh Nov 20, 2025
62665ab
Remove Aether nvim dependency (#3485)
bjarneo Nov 21, 2025
4efdcc6
Also default to float for video playback
dhh Nov 21, 2025
2c4a927
Revert "Reapply "feat: don't screenshare notifications (#3482)""
dhh Nov 21, 2025
328c26e
Stick to the lighter Everforest colors we have in Alacritty
dhh Nov 21, 2025
8b6fd9e
Update to match current colors
dhh Nov 21, 2025
50ec3ce
Merge pull request #3451 from abenz1267/walkerlayout
ryanrhughes Nov 21, 2025
385df32
Refresh Walker config to ensure compatibility with latest version
dhh Nov 21, 2025
db7070f
Ensure elephant is setup on first run
dhh Nov 21, 2025
597fcb8
Rely on a later restart of waybar
dhh Nov 21, 2025
292ac83
Remove this from the initial config too
dhh Nov 21, 2025
8007e38
Bump version for new release
dhh Nov 21, 2025
fc7feda
Link the visual menu config at install too
dhh Nov 21, 2025
3e91190
Make sure we use stable for this too
dhh Nov 21, 2025
d87f0aa
Improve the update for old installs
dhh Nov 21, 2025
2bdf3fd
Do all the upgrade work in that initial migration for old installations
dhh Nov 21, 2025
06de545
Update indexes
dhh Nov 21, 2025
70fa03d
We don't change the font config, but rely on general monospace
dhh Nov 21, 2025
6385b96
No longer using eza themeing
dhh Nov 21, 2025
63df15c
Stick to stable
dhh Nov 21, 2025
4fae366
Explain the migration
dhh Nov 21, 2025
033afbb
Remove other slow builders that will be dropped anyway
dhh Nov 21, 2025
f968f20
Just refresh the whole pacman config
dhh Nov 21, 2025
a606b53
Collapse the walker migrations to the one that does 2.0
dhh Nov 21, 2025
cb86945
Use the safe-if-not-there form
dhh Nov 21, 2025
128a612
Redesign screen capture option
dec05eba Nov 14, 2025
d725058
Make the screenrecord hotkey and menu stop recording if already recor…
dec05eba Nov 17, 2025
cb8d42b
Adjust screensaver for tte v13
ryanrhughes Nov 21, 2025
ba7ffc3
Ensure upgrades are sorted for later versions too
dhh Nov 21, 2025
934b22d
Do the full pacman reset and then update
dhh Nov 21, 2025
45e3272
No confirm
dhh Nov 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions applications/Alacritty.desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bin/omarchy-cmd-screenrecord
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ start_screenrecording() {
# Merge audio tracks into one - separate tracks only play one at a time in most players
[[ "$AUDIO" == "true" ]] && audio_args="-a default_output|default_input"

gpu-screen-recorder -w "$@" -f 60 -c mp4 -o "$filename" $audio_args &
gpu-screen-recorder -w "$@" -f 60 -c mp4 $audio_args -ac aac -o "$filename" &
toggle_screenrecording_indicator
}

Expand Down
6 changes: 3 additions & 3 deletions bin/omarchy-cmd-screensaver
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash

screensaver_in_focus() {
hyprctl activewindow -j | jq -e '.class == "Screensaver"' >/dev/null 2>&1
hyprctl activewindow -j | jq -e '.class == "com.omarchy.Screensaver"' >/dev/null 2>&1
}

exit_screensaver() {
hyprctl keyword cursor:invisible false
pkill -x tte 2>/dev/null
pkill -f "alacritty --class Screensaver" 2>/dev/null
pkill -f com.omarchy.Screensaver 2>/dev/null
exit 0
}

Expand All @@ -18,7 +18,7 @@ hyprctl keyword cursor:invisible true &>/dev/null
while true; do
effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
tte -i ~/.config/omarchy/branding/screensaver.txt \
--frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
--frame-rate 240 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c --no-eol \
"$effect" &

while pgrep -x tte >/dev/null; do
Expand Down
5 changes: 5 additions & 0 deletions bin/omarchy-font-set
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
pkill -SIGUSR2 ghostty
fi

sed -i "s/font_family = .*/font_family = $font_name/g" ~/.config/hypr/hyprlock.conf
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
xmlstarlet ed -L \
Expand All @@ -29,6 +30,10 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
omarchy-restart-swayosd
omarchy-restart-walker

if pgrep -x ghostty; then
notify-send " You must restart Ghostty to see font change"
fi

omarchy-hook font-set "$font_name"
else
echo "Font '$font_name' not found."
Expand Down
1 change: 1 addition & 0 deletions bin/omarchy-install-dev-env
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ ruby)
omarchy-pkg-add libyaml
mise use --global ruby@latest
mise settings add idiomatic_version_file_enable_tools ruby
echo "gem: --no-document" > ~/.gemrc
mise x ruby -- gem install rails --no-document
echo -e "\nYou can now run: rails new myproject"
;;
Expand Down
50 changes: 31 additions & 19 deletions bin/omarchy-install-terminal
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,43 @@ package="$1"

# Map package name to desktop entry ID
case "$package" in
alacritty)
desktop_id="Alacritty.desktop"
;;
ghostty)
desktop_id="com.mitchellh.ghostty.desktop"
;;
kitty)
desktop_id="kitty.desktop"
;;
*)
echo "Unknown terminal: $package"
exit 1
;;
alacritty) desktop_id="Alacritty.desktop" ;;
ghostty) desktop_id="com.mitchellh.ghostty.desktop" ;;
kitty) desktop_id="kitty.desktop" ;;
*)
echo "Unknown terminal: $package"
exit 1
;;
esac

# Install package
if omarchy-pkg-add $package; then
# Set as default terminal
echo "Setting $package as new default terminal..."
sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default

# Copy custom desktop entry for alacritty with X-TerminalArg* keys
if [ "$package" = "alacritty" ]; then
if [[ $package == "alacritty" ]]; then
mkdir -p ~/.local/share/applications
cp "$OMARCHY_PATH/applications/Alacritty.desktop" ~/.local/share/applications/
cat > ~/.local/share/applications/Alacritty.desktop << EOF
[Desktop Entry]
Type=Application
TryExec=alacritty
Exec=alacritty
Icon=Alacritty
Terminal=false
Categories=System;TerminalEmulator;
Name=Alacritty
GenericName=Terminal
Comment=A fast, cross-platform, OpenGL terminal emulator
StartupNotify=true
StartupWMClass=Alacritty
Actions=New;
X-TerminalArgExec=-e
X-TerminalArgAppId=--class=
X-TerminalArgTitle=--title=
X-TerminalArgDir=--working-directory=

[Desktop Action New]
Name=New Terminal
Exec=alacritty
EOF
fi

# Update xdg-terminals.list to prioritize the proper terminal
Expand Down
2 changes: 1 addition & 1 deletion bin/omarchy-launch-or-focus
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fi

WINDOW_PATTERN="$1"
LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "^$WINDOW_PATTERN$" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)

if [[ -n $WINDOW_ADDRESS ]]; then
hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
Expand Down
31 changes: 25 additions & 6 deletions bin/omarchy-launch-screensaver
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,42 @@ if ! command -v tte &>/dev/null; then
fi

# Exit early if screensave is already running
pgrep -f "alacritty --class Screensaver" && exit 0
pgrep -f com.omarchy.Screensaver && exit 0

# Allow screensaver to be turned off but also force started
if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
exit 1
fi

focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
terminal=$(xdg-terminal-exec --print-id)

for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
hyprctl dispatch focusmonitor $m

# FIXME: Find a way to make this generic where we it can work for kitty + ghostty
hyprctl dispatch exec -- \
alacritty --class Screensaver \
--config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
-e omarchy-cmd-screensaver
case $terminal in
*Alacritty*)
hyprctl dispatch exec -- \
alacritty --class=com.omarchy.Screensaver \
--config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
-e omarchy-cmd-screensaver
;;
*ghostty*)
hyprctl dispatch exec -- \
ghostty --class=com.omarchy.Screensaver \
--font-size=18 \
-e omarchy-cmd-screensaver
;;
*kitty*)
hyprctl dispatch exec -- \
kitty --class=com.omarchy.Screensaver \
--override font_size=18 \
-e omarchy-cmd-screensaver
;;
*)
notify-send "✋ Screensaver only runs in Alacritty, Ghostty, or Kitty"
;;
esac
done

hyprctl dispatch focusmonitor $focused
2 changes: 1 addition & 1 deletion bin/omarchy-launch-webapp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
browser=$(xdg-settings get default-web-browser)

case $browser in
google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-browser*) ;;
google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium*) ;;
*) browser="chromium.desktop" ;;
esac

Expand Down
2 changes: 1 addition & 1 deletion bin/omarchy-launch-wifi
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Impala -e impala "$@"
exec setsid omarchy-launch-or-focus com.omarchy.Impala "uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Impala -e impala"
2 changes: 1 addition & 1 deletion bin/omarchy-lock-screen
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ if pgrep -x "1password" >/dev/null; then
fi

# Avoid running screensaver when locked
pkill -f "alacritty --class Screensaver"
pkill -f com.omarchy.Screensaver
4 changes: 2 additions & 2 deletions bin/omarchy-menu
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ menu() {
fi
fi

echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 600 -p "$prompt…" "${args[@]}" 2>/dev/null
echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 630 -p "$prompt…" "${args[@]}" 2>/dev/null
}

terminal() {
Expand Down Expand Up @@ -124,7 +124,7 @@ show_screenrecord_menu() {

show_share_menu() {
case $(menu "Share" " Clipboard\n File \n Folder") in
*Clipboard*) terminal bash -c "omarchy-cmd-share clipboard" ;;
*Clipboard*) omarchy-cmd-share clipboard ;;
*File*) terminal bash -c "omarchy-cmd-share file" ;;
*Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
*) back_to show_trigger_menu ;;
Expand Down
2 changes: 1 addition & 1 deletion bin/omarchy-refresh-hyprland
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

omarchy-refresh-config hypr/autostart.conf
omarchy-refresh-config hypr/bindings.conf
omarchy-refresh-config hypr/envs.conf
omarchy-refresh-config hypr/input.conf
omarchy-refresh-config hypr/looknfeel.conf
omarchy-refresh-config hypr/hyprland.conf
6 changes: 5 additions & 1 deletion bin/omarchy-refresh-pacman-mirrorlist
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#!/bin/bash

sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
if [[ $1 == "edge" ]]; then
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
else
sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
fi
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,10 @@ if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
touch ~/.config/alacritty/alacritty.toml
fi

killall -SIGUSR1 kitty
killall -SIGUSR2 ghostty
if pgrep -x kitty; then
killall -SIGUSR1 kitty
fi

if pgrep -x ghostty; then
killall -SIGUSR2 ghostty
fi
16 changes: 16 additions & 0 deletions bin/omarchy-setup-fingerprint
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ EOF
fi
}

add_hyprlock_fingerprint_icon() {
print_info "Adding fingerprint icon to hyprlock placeholder text..."
sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password 󰈷 <\/span>/' ~/.config/hypr/hyprlock.conf
}

remove_hyprlock_fingerprint_icon() {
print_info "Removing fingerprint icon from hyprlock placeholder text..."
sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
}

remove_pam_config() {
# Remove from sudo
if grep -q pam_fprintd.so /etc/pam.d/sudo; then
Expand All @@ -71,6 +81,9 @@ if [[ "--remove" == "$1" ]]; then
# Remove PAM configuration
remove_pam_config

# Remove fingerprint icon from hyprlock placeholder text
remove_hyprlock_fingerprint_icon

# Uninstall packages
print_info "Removing fingerprint packages..."
sudo pacman -Rns --noconfirm fprintd
Expand All @@ -90,6 +103,9 @@ else
# Configure PAM
setup_pam_config

# Add fingerprint icon to hyprlock placeholder text
add_hyprlock_fingerprint_icon

# Enroll first fingerprint
print_success "\nLet's setup your right index finger as the first fingerprint."
print_info "Keep moving the finger around on sensor until the process completes.\n"
Expand Down
2 changes: 1 addition & 1 deletion bin/omarchy-theme-set
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ if pgrep -x waybar >/dev/null; then
omarchy-restart-waybar
fi
omarchy-restart-swayosd
omarchy-restart-terminal
hyprctl reload
pkill -SIGUSR2 btop
makoctl reload

# Change gnome, browser, vscode, cursor themes
omarchy-theme-set-terminal
omarchy-theme-set-gnome
omarchy-theme-set-browser
omarchy-theme-set-vscode
Expand Down
2 changes: 1 addition & 1 deletion bin/omarchy-theme-set-obsidian
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ extract_theme_data() {
readarray -t color_slots < <(fill_color_slots "${unique_colors[@]}" | tr ' ' '\n')

# Extract fonts
local monospace_font="CaskaydiaMono Nerd Font"
local monospace_font="JetBrainsMono Nerd Font"
local ui_font="Liberation Sans"

if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
Expand Down
4 changes: 2 additions & 2 deletions bin/omarchy-tui-install
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ "$#" -ne 4 ]; then
APP_NAME=$(gum input --prompt "Name> " --placeholder "My TUI")
APP_EXEC=$(gum input --prompt "Launch Command> " --placeholder "lazydocker or bash -c 'dust; read -n 1 -s'")
WINDOW_STYLE=$(gum choose --header "Window style" float tile)
ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG or SVG!)")
else
APP_NAME="$1"
APP_EXEC="$2"
Expand Down Expand Up @@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
Version=1.0
Name=$APP_NAME
Comment=$APP_NAME
Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
Exec=xdg-terminal-exec --app-id=$APP_CLASS -e $APP_EXEC
Terminal=false
Type=Application
Icon=$ICON_PATH
Expand Down
9 changes: 5 additions & 4 deletions bin/omarchy-update
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ set -e

trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR

omarchy-update-confirm
omarchy-snapshot create || [ $? -eq 127 ]
omarchy-update-git
omarchy-update-perform
if omarchy-update-confirm; then
omarchy-snapshot create || [ $? -eq 127 ]
omarchy-update-git
omarchy-update-perform
fi
4 changes: 1 addition & 3 deletions bin/omarchy-update-confirm
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash

set -e

gum style --border normal --border-foreground 6 --padding "1 2" \
"Ready to update Omarchy?" \
"" \
Expand All @@ -10,5 +8,5 @@ gum style --border normal --border-foreground 6 --padding "1 2" \

if ! gum confirm "Continue with update?"; then
echo "Update cancelled"
exit 0
exit 1
fi
2 changes: 1 addition & 1 deletion bin/omarchy-windows-vm
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ To stop: omarchy-windows-vm stop"
"$LIFECYCLE"

# Detect display scale from Hyprland
HYPR_SCALE=$(hyprctl monitors -j | jq -r '.[0].scale')
HYPR_SCALE=$(hyprctl monitors -j | jq -r '.[] | select (.focused == true) | .scale')
SCALE_PERCENT=$(echo "$HYPR_SCALE" | awk '{print int($1 * 100)}')

RDP_SCALE=""
Expand Down
6 changes: 3 additions & 3 deletions config/alacritty/alacritty.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ general.import = [ "~/.config/omarchy/current/theme/alacritty.toml" ]
TERM = "xterm-256color"

[font]
normal = { family = "CaskaydiaMono Nerd Font", style = "Regular" }
bold = { family = "CaskaydiaMono Nerd Font", style = "Bold" }
italic = { family = "CaskaydiaMono Nerd Font", style = "Italic" }
normal = { family = "JetBrainsMono Nerd Font", style = "Regular" }
bold = { family = "JetBrainsMono Nerd Font", style = "Bold" }
italic = { family = "JetBrainsMono Nerd Font", style = "Italic" }
size = 9

[window]
Expand Down
Loading
Loading