diff --git a/sync-posthook.sh b/sync-posthook.sh index 1589450..383937b 100755 --- a/sync-posthook.sh +++ b/sync-posthook.sh @@ -15,7 +15,7 @@ pgrep xmonad &> /dev/null && echo "Reapplying background from stylix via feh" && pgrep Hyprland &> /dev/null && echo "Reloading hyprland" && hyprctl reload &> /dev/null; pgrep .waybar-wrapped &> /dev/null && echo "Restarting waybar" && killall .waybar-wrapped && echo "Running waybar" && waybar &> /dev/null & disown; pgrep fnott &> /dev/null && echo "Restarting fnott" && killall fnott && echo "Running fnott" && fnott &> /dev/null & disown; -pgrep Hyprland &> /dev/null && echo "Reapplying background from stylix via swaybg" && echo "Running ~/.swaybg-stylix" && ~/.swaybg-stylix &> /dev/null & disown; +pgrep hyprpaper &> /dev/null && echo "Reapplying background via hyprpaper" && killall hyprpaper && echo "Running hyprpaper" && hyprpaper &> /dev/null & disown; # emacs pgrep emacs &> /dev/null && echo "Reloading emacs stylix theme" && echo "Running emacsclient --no-wait --eval \"(load-theme 'doom-stylix t nil)\"" && emacsclient --no-wait --eval "(load-theme 'doom-stylix t nil)" &> /dev/null; diff --git a/user/style/stylix.nix b/user/style/stylix.nix index c7d65d0..d9ab7a3 100644 --- a/user/style/stylix.nix +++ b/user/style/stylix.nix @@ -84,20 +84,6 @@ in feh --no-fehbg --bg-fill ''+config.stylix.image+''; ''; home.file.".fehbg-stylix".executable = true; - home.file.".swaybg-stylix".text = '' - #!/bin/sh - swaybg -m fill -i ''+config.stylix.image+''; - ''; - home.file.".swaybg-stylix".executable = true; - home.file.".swayidle-stylix".text = '' - #!/bin/sh - swaylock_cmd='swaylock --indicator-radius 200 --screenshots --effect-blur 10x10' - swayidle -w timeout 300 "$swaylock_cmd --fade-in 0.5 --grace 5" \ - timeout 600 'hyprctl dispatch dpms off' \ - resume 'hyprctl dispatch dpms on' \ - before-sleep "$swaylock_cmd" - ''; - home.file.".swayidle-stylix".executable = true; home.file = { ".config/qt5ct/colors/oomox-current.conf".source = config.lib.stylix.colors { template = builtins.readFile ./oomox-current.conf.mustache; @@ -116,11 +102,8 @@ in home.file.".config/hypr/hyprpaper.conf".text = '' preload = ''+config.stylix.image+'' - wallpaper = eDP-1,''+config.stylix.image+'' + wallpaper = ,''+config.stylix.image+'' - wallpaper = HDMI-A-1,''+config.stylix.image+'' - - wallpaper = DP-1,''+config.stylix.image+'' ''; home.packages = with pkgs; [ libsForQt5.qt5ct pkgs.libsForQt5.breeze-qt5 libsForQt5.breeze-icons diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index dde9fe5..ff21307 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -62,7 +62,7 @@ in exec-once = hypridle exec-once = obs-notification-mute-daemon - exec = ~/.swaybg-stylix + exec-once = hyprpaper general { layout = master @@ -378,7 +378,7 @@ in hyprland-protocols hyprpicker hypridle - swaybg + hyprpaper fnott fuzzel keepmenu