From 1ebf88bac0ca5a379be7c496dc0f8572b7105b32 Mon Sep 17 00:00:00 2001 From: Alexandru Ifrim Date: Wed, 23 Jul 2025 01:38:05 +0300 Subject: [PATCH 01/12] full swayosd integration --- bin/omarchy | 3 ++- bin/omarchy-refresh-swayosd | 13 +++++++++++++ bin/omarchy-theme-set | 1 + config/swayosd/config.toml | 4 ++++ config/swayosd/style.css | 28 ++++++++++++++++++++++++++++ migrations/1753224615.sh | 6 ++++++ themes/catppuccin-latte/swayosd.css | 6 ++++++ themes/catppuccin/swayosd.css | 6 ++++++ themes/everforest/swayosd.css | 6 ++++++ themes/gruvbox/swayosd.css | 6 ++++++ themes/kanagawa/swayosd.css | 6 ++++++ themes/matte-black/swayosd.css | 6 ++++++ themes/nord/swayosd.css | 6 ++++++ themes/rose-pine/swayosd.css | 6 ++++++ themes/tokyo-night/swayosd.css | 6 ++++++ 15 files changed, 108 insertions(+), 1 deletion(-) create mode 100755 bin/omarchy-refresh-swayosd create mode 100644 config/swayosd/config.toml create mode 100644 config/swayosd/style.css create mode 100755 migrations/1753224615.sh create mode 100644 themes/catppuccin-latte/swayosd.css create mode 100644 themes/catppuccin/swayosd.css create mode 100644 themes/everforest/swayosd.css create mode 100644 themes/gruvbox/swayosd.css create mode 100644 themes/kanagawa/swayosd.css create mode 100644 themes/matte-black/swayosd.css create mode 100644 themes/nord/swayosd.css create mode 100644 themes/rose-pine/swayosd.css create mode 100644 themes/tokyo-night/swayosd.css diff --git a/bin/omarchy b/bin/omarchy index 1fc29ff..092a276 100755 --- a/bin/omarchy +++ b/bin/omarchy @@ -24,12 +24,13 @@ main_menu() { update_menu() { show_ascii_art - local menu=("Omarchy" "Waybar" "Walker" "Plymouth" "Desktop apps" "Back") + local menu=("Omarchy" "Waybar" "Walker" "Plymouth" "SwayOSD" "Desktop apps" "Back") local commands=( "omarchy-update" "omarchy-refresh-waybar" "omarchy-refresh-walker" "omarchy-refresh-plymouth" + "omarchy-refresh-swayosd" "omarchy-refresh-applications" "main_menu" ) diff --git a/bin/omarchy-refresh-swayosd b/bin/omarchy-refresh-swayosd new file mode 100755 index 0000000..c0ef9d6 --- /dev/null +++ b/bin/omarchy-refresh-swayosd @@ -0,0 +1,13 @@ +#!/bin/bash + +cp -f ~/.config/swayosd/config.toml ~/.config/swayosd/config.toml.back 2>/dev/null +cp -f ~/.local/share/omarchy/config/walker/config.toml ~/.config/swayosd 2>/dev/null + +if cmp -s ~/.config/swayosd/config.toml.bak ~/.config/swayosd/config.toml; then + rm ~/.config/swayosd//config.toml.bak +else + echo -e "\e[31mExisting .config/swayosd/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m" +fi + +pkill swayosd-server +uwsm app -- swayosd-server --gapplication-service & diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set index def6105..88ffd43 100755 --- a/bin/omarchy-theme-set +++ b/bin/omarchy-theme-set @@ -46,6 +46,7 @@ pkill -SIGUSR2 btop # Restart components to apply new theme pkill -SIGUSR2 waybar +pkill -SIGUSR2 swayosd-server makoctl reload hyprctl reload diff --git a/config/swayosd/config.toml b/config/swayosd/config.toml new file mode 100644 index 0000000..694ab07 --- /dev/null +++ b/config/swayosd/config.toml @@ -0,0 +1,4 @@ +[server] +show_percentage = true +max_volume = 150 +style = "./style.css" diff --git a/config/swayosd/style.css b/config/swayosd/style.css new file mode 100644 index 0000000..544b6cb --- /dev/null +++ b/config/swayosd/style.css @@ -0,0 +1,28 @@ +@import "../omarchy/current/theme/swayosd.css"; + +window { + border-radius: 0; + opacity: 0.97; + border: 2px solid @border-color; + + background-color: @background-color; +} + +label { + font-family: 'CaskaydiaMono Nerd Font', monospace; + font-size: 11pt; + + color: @label; +} + +image { + color: @image; +} + +progressbar { + border-radius: 0; +} + +progress { + background-color: @progress; +} diff --git a/migrations/1753224615.sh b/migrations/1753224615.sh new file mode 100755 index 0000000..dc1b0ec --- /dev/null +++ b/migrations/1753224615.sh @@ -0,0 +1,6 @@ +echo "Adding SwayOSD" + +if [[ ! -d ~/.config/swayosd ]]; then + mkdir -p ~/.config/swayosd + cp -r ~/.local/share/omarchy/config/swayosd/* ~/.config/swayosd/ +fi diff --git a/themes/catppuccin-latte/swayosd.css b/themes/catppuccin-latte/swayosd.css new file mode 100644 index 0000000..5b0eaea --- /dev/null +++ b/themes/catppuccin-latte/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #eff1f5; +@define-color border-color #4c4f69; +@define-color label #4c4f69; +@define-color image #4c4f69; +@define-color progress #4c4f69; + diff --git a/themes/catppuccin/swayosd.css b/themes/catppuccin/swayosd.css new file mode 100644 index 0000000..a25d38a --- /dev/null +++ b/themes/catppuccin/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #24273a; +@define-color border-color #c6d0f5; +@define-color label #c6d0f5; +@define-color image #c6d0f5; +@define-color progress #c6d0f5; + diff --git a/themes/everforest/swayosd.css b/themes/everforest/swayosd.css new file mode 100644 index 0000000..f0bff40 --- /dev/null +++ b/themes/everforest/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #2d353b; +@define-color border-color #d3c6aa; +@define-color label #d3c6aa; +@define-color image #d3c6aa; +@define-color progress #d3c6aa; + diff --git a/themes/gruvbox/swayosd.css b/themes/gruvbox/swayosd.css new file mode 100644 index 0000000..614748f --- /dev/null +++ b/themes/gruvbox/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #282828; +@define-color border-color #ebdbb2; +@define-color label #ebdbb2; +@define-color image #ebdbb2; +@define-color progress #ebdbb2; + diff --git a/themes/kanagawa/swayosd.css b/themes/kanagawa/swayosd.css new file mode 100644 index 0000000..1eb5c85 --- /dev/null +++ b/themes/kanagawa/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #1f1f28; +@define-color border-color #dcd7ba; +@define-color label #dcd7ba; +@define-color image #dcd7ba; +@define-color progress #dcd7ba; + diff --git a/themes/matte-black/swayosd.css b/themes/matte-black/swayosd.css new file mode 100644 index 0000000..08c28d7 --- /dev/null +++ b/themes/matte-black/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #121212; +@define-color border-color #EAEAEA; +@define-color label #EAEAEA; +@define-color image #EAEAEA; +@define-color progress #EAEAEA; + diff --git a/themes/nord/swayosd.css b/themes/nord/swayosd.css new file mode 100644 index 0000000..db1b40d --- /dev/null +++ b/themes/nord/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #2E3440; +@define-color border-color #D8DEE9; +@define-color label #D8DEE9; +@define-color image #D8DEE9; +@define-color progress #D8DEE9; + diff --git a/themes/rose-pine/swayosd.css b/themes/rose-pine/swayosd.css new file mode 100644 index 0000000..e58cc08 --- /dev/null +++ b/themes/rose-pine/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #faf4ed; +@define-color border-color #575279; +@define-color label #575279; +@define-color image #575279; +@define-color progress #575279; + diff --git a/themes/tokyo-night/swayosd.css b/themes/tokyo-night/swayosd.css new file mode 100644 index 0000000..14c0dcd --- /dev/null +++ b/themes/tokyo-night/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #1a1b26; +@define-color border-color #33ccff; +@define-color label #33ccff; +@define-color image #33ccff; +@define-color progress #33ccff; + From 2b2103fb667f68c42136297aa8bc6bc770ec1997 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 22 Jul 2025 22:19:29 -0400 Subject: [PATCH 02/12] Put Sunset Lake first for Tokyo Night --- install/theme.sh | 2 +- ...ake-landscape-scenic-panorama-7680x3215-144.png} | Bin ... => 2-Pawel-Czerwinski-Abstract-Purple-Blue.jpg} | Bin ...g => 3--Milad-Fakurian-Abstract-Purple-Blue.jpg} | Bin 4 files changed, 1 insertion(+), 1 deletion(-) rename themes/tokyo-night/backgrounds/{3-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png => 1-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png} (100%) rename themes/tokyo-night/backgrounds/{1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg => 2-Pawel-Czerwinski-Abstract-Purple-Blue.jpg} (100%) rename themes/tokyo-night/backgrounds/{2--Milad-Fakurian-Abstract-Purple-Blue.jpg => 3--Milad-Fakurian-Abstract-Purple-Blue.jpg} (100%) diff --git a/install/theme.sh b/install/theme.sh index b370751..12a29ae 100644 --- a/install/theme.sh +++ b/install/theme.sh @@ -15,7 +15,7 @@ for f in ~/.local/share/omarchy/themes/*; do ln -s "$f" ~/.config/omarchy/themes # Set initial theme mkdir -p ~/.config/omarchy/current ln -snf ~/.config/omarchy/themes/tokyo-night ~/.config/omarchy/current/theme -ln -snf ~/.config/omarchy/current/theme/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg ~/.config/omarchy/current/background +ln -snf ~/.config/omarchy/current/theme/backgrounds/1-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png ~/.config/omarchy/current/background # Set specific app links for current theme ln -snf ~/.config/omarchy/current/theme/neovim.lua ~/.config/nvim/lua/plugins/theme.lua diff --git a/themes/tokyo-night/backgrounds/3-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png b/themes/tokyo-night/backgrounds/1-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png similarity index 100% rename from themes/tokyo-night/backgrounds/3-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png rename to themes/tokyo-night/backgrounds/1-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png diff --git a/themes/tokyo-night/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg b/themes/tokyo-night/backgrounds/2-Pawel-Czerwinski-Abstract-Purple-Blue.jpg similarity index 100% rename from themes/tokyo-night/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg rename to themes/tokyo-night/backgrounds/2-Pawel-Czerwinski-Abstract-Purple-Blue.jpg diff --git a/themes/tokyo-night/backgrounds/2--Milad-Fakurian-Abstract-Purple-Blue.jpg b/themes/tokyo-night/backgrounds/3--Milad-Fakurian-Abstract-Purple-Blue.jpg similarity index 100% rename from themes/tokyo-night/backgrounds/2--Milad-Fakurian-Abstract-Purple-Blue.jpg rename to themes/tokyo-night/backgrounds/3--Milad-Fakurian-Abstract-Purple-Blue.jpg From d2763225c3a8664c7033bfc83ef0268a5c476a1d Mon Sep 17 00:00:00 2001 From: Uriah Welcome Date: Tue, 22 Jul 2025 23:24:09 -0400 Subject: [PATCH 03/12] Update the media bindings to only display on the currently focused monitor. sway-osd can also do playerctl --- default/hypr/bindings/media.conf | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/default/hypr/bindings/media.conf b/default/hypr/bindings/media.conf index 46430cb..eb86284 100644 --- a/default/hypr/bindings/media.conf +++ b/default/hypr/bindings/media.conf @@ -1,13 +1,16 @@ +# Only display the OSD on the currently focused monitor +$osdclient = swayosd-client --monitor "$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')" + # Laptop multimedia keys for volume and LCD brightness (with OSD) -bindel = ,XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise -bindel = ,XF86AudioLowerVolume, exec, swayosd-client --output-volume lower -bindel = ,XF86AudioMute, exec, swayosd-client --output-volume mute-toggle -bindel = ,XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle -bindel = ,XF86MonBrightnessUp, exec, swayosd-client --brightness raise -bindel = ,XF86MonBrightnessDown, exec, swayosd-client --brightness lower +bindel = ,XF86AudioRaiseVolume, exec, $osdclient --output-volume raise +bindel = ,XF86AudioLowerVolume, exec, $osdclient --output-volume lower +bindel = ,XF86AudioMute, exec, $osdclient --output-volume mute-toggle +bindel = ,XF86AudioMicMute, exec, $osdclient --input-volume mute-toggle +bindel = ,XF86MonBrightnessUp, exec, $osdclient --brightness raise +bindel = ,XF86MonBrightnessDown, exec, $osdclient --brightness lower # Requires playerctl -bindl = , XF86AudioNext, exec, playerctl next -bindl = , XF86AudioPause, exec, playerctl play-pause -bindl = , XF86AudioPlay, exec, playerctl play-pause -bindl = , XF86AudioPrev, exec, playerctl previous +bindl = , XF86AudioNext, exec, $osdclient --playerctl next +bindl = , XF86AudioPause, exec, $osdclient --playerctl play-pause +bindl = , XF86AudioPlay, exec, $osdclient --playerctl play-pause +bindl = , XF86AudioPrev, exec, $osdclient --playerctl previous From fd56404407645db72312173002e219d9a0b3e6f3 Mon Sep 17 00:00:00 2001 From: Andrej Benz Date: Wed, 23 Jul 2025 09:43:17 +0200 Subject: [PATCH 04/12] force package database refresh after adding multilib repo --- install/nvidia.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install/nvidia.sh b/install/nvidia.sh index 0f76f50..3385e04 100644 --- a/install/nvidia.sh +++ b/install/nvidia.sh @@ -35,6 +35,9 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then sudo sed -i '/^#\[multilib\]/,/^#Include/ s/^#//' /etc/pacman.conf fi + # force package database refresh + sudo pacman -Syy + # Install packages PACKAGES_TO_INSTALL=( "${KERNEL_HEADERS}" From ceb44d7aa1efa2f2df7db6d8a6aa03347207ac0a Mon Sep 17 00:00:00 2001 From: Simon Dawson Date: Wed, 23 Jul 2025 10:36:36 +0100 Subject: [PATCH 05/12] feat: Add MariaDB to Docker databases --- bin/omarchy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/omarchy b/bin/omarchy index adeb703..bea3a0c 100755 --- a/bin/omarchy +++ b/bin/omarchy @@ -119,12 +119,13 @@ setup_menu() { } setup_docker_dbs() { - options=("MySQL" "Redis" "PostgreSQL") + options=("MariaDB" "MySQL" "Redis" "PostgreSQL") choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu if [[ -n "$choices" ]]; then for db in $choices; do case $db in + MariaDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mariadb11 -e MARIADB_ROOT_PASSWORD= -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true mariadb:11.8 ;; MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;; Redis) sudo docker run -d --restart unless-stopped -p "127.0.0.1:6379:6379" --name=redis redis:7 ;; PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres16 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16 ;; From 08f187b4eaa09ceaf55a0d5dcc1f66f94eff0405 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 23 Jul 2025 11:39:38 -0400 Subject: [PATCH 06/12] Include satty in the list of windows that get a minimum size Fixes #299 Co-authored-by: @mtk3d --- default/hypr/windows.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default/hypr/windows.conf b/default/hypr/windows.conf index 7cbb244..bf9049d 100644 --- a/default/hypr/windows.conf +++ b/default/hypr/windows.conf @@ -6,7 +6,7 @@ windowrule = tile, class:^(Chromium)$ # Float and center settings and previews windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$ -windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer)$ +windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty)$ windowrule = size 645 450, class:Omarchy windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$ From 98f848d4a031fb5ff84dec0130259785ee917f2d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 23 Jul 2025 11:53:04 -0400 Subject: [PATCH 07/12] Fix the vibe coding hallucinations from swayosd theming --- bin/omarchy-refresh-swayosd | 6 +++--- bin/omarchy-theme-set | 7 +++---- migrations/1753224615.sh | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bin/omarchy-refresh-swayosd b/bin/omarchy-refresh-swayosd index c0ef9d6..04e2e26 100755 --- a/bin/omarchy-refresh-swayosd +++ b/bin/omarchy-refresh-swayosd @@ -1,7 +1,7 @@ #!/bin/bash -cp -f ~/.config/swayosd/config.toml ~/.config/swayosd/config.toml.back 2>/dev/null -cp -f ~/.local/share/omarchy/config/walker/config.toml ~/.config/swayosd 2>/dev/null +cp -f ~/.config/swayosd/config.toml ~/.config/swayosd/config.toml.bak 2>/dev/null +cp -f ~/.local/share/omarchy/config/swayosd/config.toml ~/.config/swayosd 3>/dev/null if cmp -s ~/.config/swayosd/config.toml.bak ~/.config/swayosd/config.toml; then rm ~/.config/swayosd//config.toml.bak @@ -10,4 +10,4 @@ else fi pkill swayosd-server -uwsm app -- swayosd-server --gapplication-service & +setsid uwsm app -- swayosd-server &>/dev/null & diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set index 3c6b4ed..3766c20 100755 --- a/bin/omarchy-theme-set +++ b/bin/omarchy-theme-set @@ -35,12 +35,11 @@ fi # Trigger alacritty config reload touch "$HOME/.config/alacritty/alacritty.toml" -# Trigger btop config reload -pkill -SIGUSR2 btop - # Restart components to apply new theme +pkill -SIGUSR2 btop pkill -SIGUSR2 waybar -pkill -SIGUSR2 swayosd-server +pkill swayosd-server +setsid uwsm app -- swayosd-server &>/dev/null & makoctl reload hyprctl reload diff --git a/migrations/1753224615.sh b/migrations/1753224615.sh index dc1b0ec..97dbb87 100755 --- a/migrations/1753224615.sh +++ b/migrations/1753224615.sh @@ -1,4 +1,4 @@ -echo "Adding SwayOSD" +echo "Adding SwayOSD theming" if [[ ! -d ~/.config/swayosd ]]; then mkdir -p ~/.config/swayosd From c4c9cdc0f6ad50598ed61748e48ef8e23a2741b8 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 23 Jul 2025 12:03:53 -0400 Subject: [PATCH 08/12] Only load inputrc for interactive terminals Fixes claude-code warnings and is more proper anyway. Closes #282 --- default/bash/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default/bash/rc b/default/bash/rc index e8ba051..b0b572c 100644 --- a/default/bash/rc +++ b/default/bash/rc @@ -4,4 +4,4 @@ source ~/.local/share/omarchy/default/bash/functions source ~/.local/share/omarchy/default/bash/prompt source ~/.local/share/omarchy/default/bash/init source ~/.local/share/omarchy/default/bash/envs -bind -f ~/.local/share/omarchy/default/bash/inputrc +[[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc From 9231148cd76f7a1071ba0418c52b1f934120534e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 23 Jul 2025 12:36:57 -0400 Subject: [PATCH 09/12] Increase pamlimit lockout --- install/4-config.sh | 8 ++++++-- migrations/1753286633.sh | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 migrations/1753286633.sh diff --git a/install/4-config.sh b/install/4-config.sh index 385f333..91157f6 100644 --- a/install/4-config.sh +++ b/install/4-config.sh @@ -3,6 +3,9 @@ # Copy over Omarchy configs cp -R ~/.local/share/omarchy/config/* ~/.config/ +# Use default bashrc from Omarchy +echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc + # Ensure application directory exists for update-desktop-database mkdir -p ~/.local/share/applications @@ -13,8 +16,9 @@ sudo chmod 644 /etc/gnupg/dirmngr.conf sudo gpgconf --kill dirmngr || true sudo gpgconf --launch dirmngr || true -# Use default bashrc from Omarchy -echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc +# Increase lockout limit to 10 and decrease timeout to 2 minutes +sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth" +sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth" # Set common git aliases git config --global alias.co checkout diff --git a/migrations/1753286633.sh b/migrations/1753286633.sh new file mode 100644 index 0000000..5c7f2cf --- /dev/null +++ b/migrations/1753286633.sh @@ -0,0 +1,6 @@ +echo "Increase lockout limit to 10, decrease timeout to 2 minutes" + +if ! grep -q 'deny=10' /etc/pam.d/system-auth; then + sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth" + sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth" +fi From a12cd979224190d62f7eb0e7ec4829093a3f41e2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 23 Jul 2025 12:36:57 -0400 Subject: [PATCH 10/12] Increase pamlimit lockout --- install/4-config.sh | 8 ++++++-- migrations/1753286633.sh | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 migrations/1753286633.sh diff --git a/install/4-config.sh b/install/4-config.sh index 385f333..91157f6 100644 --- a/install/4-config.sh +++ b/install/4-config.sh @@ -3,6 +3,9 @@ # Copy over Omarchy configs cp -R ~/.local/share/omarchy/config/* ~/.config/ +# Use default bashrc from Omarchy +echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc + # Ensure application directory exists for update-desktop-database mkdir -p ~/.local/share/applications @@ -13,8 +16,9 @@ sudo chmod 644 /etc/gnupg/dirmngr.conf sudo gpgconf --kill dirmngr || true sudo gpgconf --launch dirmngr || true -# Use default bashrc from Omarchy -echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc +# Increase lockout limit to 10 and decrease timeout to 2 minutes +sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth" +sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth" # Set common git aliases git config --global alias.co checkout diff --git a/migrations/1753286633.sh b/migrations/1753286633.sh new file mode 100644 index 0000000..5c7f2cf --- /dev/null +++ b/migrations/1753286633.sh @@ -0,0 +1,6 @@ +echo "Increase lockout limit to 10, decrease timeout to 2 minutes" + +if ! grep -q 'deny=10' /etc/pam.d/system-auth; then + sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth" + sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth" +fi From 9b7908d17b65f500002f3dda761b8eaede687349 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 23 Jul 2025 13:03:47 -0400 Subject: [PATCH 11/12] Ensure we restart swayosd after setting up theming --- migrations/1753224615.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/migrations/1753224615.sh b/migrations/1753224615.sh index 97dbb87..cd6c797 100755 --- a/migrations/1753224615.sh +++ b/migrations/1753224615.sh @@ -3,4 +3,7 @@ echo "Adding SwayOSD theming" if [[ ! -d ~/.config/swayosd ]]; then mkdir -p ~/.config/swayosd cp -r ~/.local/share/omarchy/config/swayosd/* ~/.config/swayosd/ + + pkill swayosd-server + setsid uwsm app -- swayosd-server &>/dev/null & fi From 8908ce91f8eb1830eff90ee14402039aac0e3144 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 23 Jul 2025 14:54:57 -0400 Subject: [PATCH 12/12] Trailing slash --- bin/omarchy-refresh-swayosd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/omarchy-refresh-swayosd b/bin/omarchy-refresh-swayosd index 04e2e26..aa63918 100755 --- a/bin/omarchy-refresh-swayosd +++ b/bin/omarchy-refresh-swayosd @@ -1,7 +1,7 @@ #!/bin/bash cp -f ~/.config/swayosd/config.toml ~/.config/swayosd/config.toml.bak 2>/dev/null -cp -f ~/.local/share/omarchy/config/swayosd/config.toml ~/.config/swayosd 3>/dev/null +cp -f ~/.local/share/omarchy/config/swayosd/config.toml ~/.config/swayosd/ 3>/dev/null if cmp -s ~/.config/swayosd/config.toml.bak ~/.config/swayosd/config.toml; then rm ~/.config/swayosd//config.toml.bak