diff --git a/modules/home/core/apps.nix b/modules/home/core/apps.nix index 2ba3db7..38013d8 100644 --- a/modules/home/core/apps.nix +++ b/modules/home/core/apps.nix @@ -34,7 +34,6 @@ portablemc ferium - steamguard-cli virt-manager ]; } diff --git a/modules/home/rice/hyprland.nix b/modules/home/rice/hyprland.nix index 2db9add..1c19b75 100644 --- a/modules/home/rice/hyprland.nix +++ b/modules/home/rice/hyprland.nix @@ -139,13 +139,13 @@ layerrule = [ "no_anim on, match:namespace selection" # hyprshot overlay - "no_anim on, match:namespace hyprpicker" "animation fade, match:namespace swww-daemon" "animation fade, match:namespace logout_dialog" "animation fade, match:namespace hyprshutdown" + "above_lock 1, match:namespace waybar" "above_lock 2, match:namespace notifications" - # "above_lock 1, match:namespace waybar" - # "above_lock 2, match:namespace logout_dialog" + "above_lock 2, match:namespace selection" + "above_lock 2, match:namespace logout_dialog" ]; windowrule = [ diff --git a/modules/home/rice/hyprlock.nix b/modules/home/rice/hyprlock.nix index 44bb09a..bde1f8d 100644 --- a/modules/home/rice/hyprlock.nix +++ b/modules/home/rice/hyprlock.nix @@ -23,60 +23,23 @@ background = [ { path = "screenshot"; - brightness = 0.5; + brightness = 0.25; blur_passes = 3; - blur_size = 2; + blur_size = 1; } ]; label = [ - # { - # text = " 󰌾 "; - # color = "$subtext1"; - # font_size = 64; - # position = "0, 0"; - # shadow_passes = 1; - # shadow_boost = 0.5; - # halign = "center"; - # valign = "center"; - # } { - text = "cmd[update:1000] echo \"$(date +'%I:%M')\""; - color = "rgba(216, 222, 233, 0.7)"; - font_size = "120"; - font_family = rice.font; - position = "0, 240"; + text = " 󰌾 "; + color = "$subtext1"; + font_size = 64; + position = "0, 0"; + shadow_passes = 1; + shadow_boost = 0.5; halign = "center"; valign = "center"; } - { - text = "cmd[update:1000] echo \"$(date +'%A, %d %B')\""; - color = "rgba(216, 222, 233, 0.7)"; - font_size = "30"; - font_family = rice.font; - position = "0, 105"; - halign = "center"; - valign = "center"; - } - { - text = "󰤄 Hibernate"; - color = "rgba(255, 255, 255, 0.7)"; - font_size = "10"; - onclick = "systemctl hibernate"; - font_family = rice.font; - position = "${toString (rice.gap.outer + 12)}, -${toString (rice.gap.outer + 8)}"; - halign = "left"; - valign = "top"; - } - { - text = "cmd[update:1000] echo \" $(upower -i $(upower -e | grep 'BAT') | grep 'percentage' | awk '{print $2}' | sed 's/%//')%\""; - color = "rgba(255, 255, 255, 0.7)"; - font_size = "10"; - font_family = rice.font; - position = "-${toString (rice.gap.outer + 12)}, -${toString (rice.gap.outer + 8)}"; - halign = "right"; - valign = "top"; - } ]; input-field = [ @@ -95,7 +58,7 @@ outer_color = if rice.borders.colored then "$accent" else "$overlay0"; inner_color = "$crust"; font_color = "$text"; - placeholder_text = "󰌾 Type your password"; + placeholder_text = "Type your password"; font_family = rice.font; # font_family = "monospace"; diff --git a/modules/home/rice/keybinds.nix b/modules/home/rice/keybinds.nix index d84ed78..461799a 100644 --- a/modules/home/rice/keybinds.nix +++ b/modules/home/rice/keybinds.nix @@ -61,7 +61,14 @@ bindc = [ "SUPER, mouse:274, killactive" ]; - + + bindl = [ + ", switch:on:Lid Switch, exec, systemctl suspend" + "SUPER, SPACE, exec, playerctl play-pause" + "SUPER, M, exec, wlogout" + "SUPER, TAB, exec, pkill -SIGUSR1 waybar" + ]; + bindel = [ ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" @@ -70,18 +77,8 @@ ",XF86MonBrightnessUp, exec, brightnessctl s 10%+" ",XF86MonBrightnessDown, exec, brightnessctl s 10%-" ]; - - bindl = [ - ", switch:on:Lid Switch, exec, systemctl suspend" - "SUPER, SPACE, exec, playerctl play-pause" - # "SUPER, M, exec, wlogout" - # "SUPER, TAB, exec, pkill -SIGUSR1 waybar" - ]; bind = [ - "SUPER, M, exec, wlogout" - "SUPER, TAB, exec, pkill -SIGUSR1 waybar" - ",XF86Favorites, togglespecialworkspace, x" ",XF86Bluetooth, exec, [float; size 75%] uwsm app -- blueman-manager" ",XF86Keyboard, exec, hyprctl dispatch submap reset" diff --git a/modules/home/rice/waybar.nix b/modules/home/rice/waybar.nix index 461bdac..8481f4f 100644 --- a/modules/home/rice/waybar.nix +++ b/modules/home/rice/waybar.nix @@ -63,7 +63,7 @@ interval = 5; format = " {used}"; on-click = "hyprctl dispatch exec '[float; size 75%]' kitty btop"; - on-click-right = "kitty sh -c 'sudo nix-collect-garbage -d; nix-collect-garbage -d; nix store optimise; sudo journalctl --rotate --vacuum-time=1s --vacuum-files=1; read'"; + on-click-right = "kitty sh -c 'sudo nix-collect-garbage -d; nix-collect-garbage -d; read'"; }; "network" = { interval = 1;