From b60bc98e3a967037bd10d019bbbfd7920f3b61f1 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sun, 21 Apr 2024 14:00:10 -0500 Subject: [PATCH 1/4] Fixes color for hyprlock time --- user/wm/hyprland/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 2be0e08..7fe885e 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -473,7 +473,7 @@ label { monitor = text = $TIME - color = rgba(200, 200, 200, 1.0) + color = rgb(''+config.lib.stylix.colors.base07-rgb-r+'',''+config.lib.stylix.colors.base07-rgb-g+'', ''+config.lib.stylix.colors.base07-rgb-b+'') font_size = 20 font_family = Intel One Mono rotate = 0 # degrees, counter-clockwise From 8823f8b1c9f4c60fd3e5e96b9c77a093bb3382a7 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sun, 21 Apr 2024 14:30:14 -0500 Subject: [PATCH 2/4] Some hyprland fixes --- user/wm/hyprland/hyprland.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 7fe885e..bd6ae57 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -42,7 +42,7 @@ exec-once = emacs --daemon exec-once = hypridle - #exec-once = hyprdim # currently broken :( + exec-once = hyprdim -d 1200 -s 0.25 -D 0.25 -p exec-once = obs-notification-mute-daemon exec = ~/.swaybg-stylix @@ -178,7 +178,8 @@ bind=SUPER,Z,exec,pypr toggle term && hyprctl dispatch bringactivetotop bind=SUPER,F,exec,pypr toggle ranger && hyprctl dispatch bringactivetotop - bind=SUPER,N,exec,pypr toggle musikcube && hyprctl dispatch bringactivetotop + bind=SUPER,N,exec,pypr toggle numbat && hyprctl dispatch bringactivetotop + bind=SUPER,M,exec,pypr toggle musikcube && hyprctl dispatch bringactivetotop bind=SUPER,B,exec,pypr toggle btm && hyprctl dispatch bringactivetotop bind=SUPER,code:172,exec,pypr toggle pavucontrol && hyprctl dispatch bringactivetotop $scratchpadsize = size 80% 85% @@ -189,6 +190,11 @@ windowrulev2 = workspace special silent,$scratchpad windowrulev2 = center,$scratchpad + $savetodisk = title:^(Save to Disk)$ + windowrulev2 = float,$savetodisk + windowrulev2 = size 70% 75%,$savetodisk + windowrulev2 = center,$savetodisk + $pavucontrol = class:^(pavucontrol)$ windowrulev2 = float,$pavucontrol windowrulev2 = size 86% 40%,$pavucontrol @@ -202,8 +208,6 @@ windowrulev2 = move 18% 25%,$miniframe windowrulev2 = animation popin 1 20,$miniframe - windowrulev2 = float,title:^(Kdenlive)$ - windowrulev2 = float,class:^(pokefinder)$ windowrulev2 = opacity 0.80,title:ORUI @@ -497,6 +501,10 @@ "command": "kitty --class scratchpad -e ranger", "margin": 50 }, + "numbat": { + "command": "alacritty --class scratchpad -e numbat", + "margin": 50 + }, "musikcube": { "command": "alacritty --class scratchpad -e musikcube", "margin": 50 From 2fb2c23851cb875858bc8a0b5e77edc100d5ee3f Mon Sep 17 00:00:00 2001 From: Emmet Date: Sun, 21 Apr 2024 14:40:27 -0500 Subject: [PATCH 3/4] Sync posthook output fixes --- sync-posthook.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sync-posthook.sh b/sync-posthook.sh index 220c2ca..f36d411 100755 --- a/sync-posthook.sh +++ b/sync-posthook.sh @@ -7,15 +7,15 @@ # xmonad pgrep xmobar &> /dev/null && echo "Killing old xmobar instances" && echo "Running killall xmobar" && killall xmobar &> /dev/null; # xmonad will restart xmobar -pgrep xmonad &> /dev/null && echo "Recompiling xmonad" && echo "Running xmonad --recompile && xmonad --restart" && xmonad --recompile && xmonad --restart; +pgrep xmonad &> /dev/null && echo "Recompiling xmonad" && echo "Running xmonad --recompile && xmonad --restart" && xmonad --recompile &> /dev/null && xmonad --restart &> /dev/null; pgrep .dunst-wrapped &> /dev/null && echo "Restarting dunst" && killall .dunst-wrapped && echo "Running dunst" && dunst &> /dev/null & disown; -pgrep xmonad &> /dev/null && echo "Reapplying background from stylix via feh" && echo "Running ~/.fehbg-stylix" && ~/.fehbg-stylix & disown; +pgrep xmonad &> /dev/null && echo "Reapplying background from stylix via feh" && echo "Running ~/.fehbg-stylix" && ~/.fehbg-stylix &> /dev/null & disown; # hyprland pgrep Hyprland &> /dev/null && echo "Reloading hyprland" && hyprctl reload 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 & disown; +pgrep Hyprland &> /dev/null && echo "Reapplying background from stylix via swaybg" && echo "Running ~/.swaybg-stylix" && ~/.swaybg-stylix &> /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)"; +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; From 53ccc5921fba3c148c3afae9aaf52d3cfb78e2d4 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sun, 21 Apr 2024 14:40:41 -0500 Subject: [PATCH 4/4] Shorter hyprdim + added kill button(s) --- user/wm/hyprland/hyprland.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index bd6ae57..9fc57fa 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -42,7 +42,7 @@ exec-once = emacs --daemon exec-once = hypridle - exec-once = hyprdim -d 1200 -s 0.25 -D 0.25 -p + exec-once = hyprdim -d 450 -s 0.25 -D 0.25 -p exec-once = obs-notification-mute-daemon exec = ~/.swaybg-stylix @@ -92,6 +92,8 @@ bind=SUPER,TAB,exec,pypr expose bind=SUPER,V,exec,wl-copy $(wl-paste | tr '\n' ' ') bind=SUPERSHIFT,T,exec,screenshot-ocr + bind=CTRLALT,Delete,exec,hyprctl kill + bind=SUPERSHIFT,K,exec,hyprctl kill bind = SUPER,R,pass,^(com\.obsproject\.Studio)$ bind = SUPERSHIFT,R,pass,^(com\.obsproject\.Studio)$