From eab8520ef867213a885987b33d9160ea80ae3cb6 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 12 Apr 2023 15:10:01 +0100
Subject: [PATCH] Add hyprpaper config, workspace setup for hyprland, move eww
 powermenu to foreground

---
 .../env/config/eww/powermenu/eww.yuck         |  2 +-
 .../env/config/hypr/hyprland.conf             | 44 ++++++++++++++-----
 .../env/config/hypr/hyprpaper.conf            |  7 +++
 3 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 nixos/home-manager/env/config/hypr/hyprpaper.conf

diff --git a/nixos/home-manager/env/config/eww/powermenu/eww.yuck b/nixos/home-manager/env/config/eww/powermenu/eww.yuck
index 48927ba0..40bcf944 100644
--- a/nixos/home-manager/env/config/eww/powermenu/eww.yuck
+++ b/nixos/home-manager/env/config/eww/powermenu/eww.yuck
@@ -1,6 +1,6 @@
 (defwindow powermenu
   :monitor 0
-  :stacking "bg"
+  :stacking "fg"
   :windowtype "normal"
   :wm-ignore true
   :geometry (geometry :width "100%" :height "100%")
diff --git a/nixos/home-manager/env/config/hypr/hyprland.conf b/nixos/home-manager/env/config/hypr/hyprland.conf
index 56a170ce..44f22ca2 100644
--- a/nixos/home-manager/env/config/hypr/hyprland.conf
+++ b/nixos/home-manager/env/config/hypr/hyprland.conf
@@ -8,7 +8,7 @@ monitor=DP-1,preferred,auto,auto,transform,1
 
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
-exec-once = waybar -c ~/.dotfiles/nixos/home-manager/env/config/waybar/config & eww daemon & eww open powermenu
+exec-once = hyprpaper -c ~/.dotfiles/nixos/home-manager/env/config/hypr/hyprpaper.conf & waybar -c ~/.dotfiles/nixos/home-manager/env/config/waybar/config & eww daemon
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
@@ -99,31 +99,53 @@ device:epic-mouse-v1 {
     sensitivity = -0.5
 }
 
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrule = float, ^(pavucontrol)$
+windowrule = workspace 1, ^(foot)$
+windowrule = workspace 2, ^(firefox)$
+windowrule = workspace 3, ^(dolphin)$
+windowrule = workspace 4, ^(thunderbird)$
+windowrule = workspace 4, ^(mailspring)$
+windowrule = workspace 5, ^(element)$
+windowrule = workspace 5, ^(signal)$
+windowrule = workspace 6, ^(steam)$
+windowrule = workspace 7, ^(bitwarden)$
+windowrule = workspace 8, ^(Nxplayer.bin)$
 
+wsbind=1,HDMI-A-1
+wsbind=2,HDMI-A-1
+wsbind=3,HDMI-A-1
+wsbind=4,HDMI-A-1
+wsbind=5,HDMI-A-1
+wsbind=6,HDMI-A-1
+wsbind=7,HDMI-A-1
+wsbind=8,HDMI-A-1
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, kitty
-bind = $mainMod, C, killactive, 
-bind = $mainMod, M, exit, 
+bind = $mainMod, Return, exec, kitty
+bind = $mainMod, Q, killactive,
+bind = $mainMod, M, exit,
 bind = $mainMod, E, exec, dolphin
-bind = $mainMod, V, togglefloating, 
+bind = $mainMod, V, togglefloating,
 bind = $mainMod, R, exec, wofi --show drun
+bind = $mainMod, Space, exec, wofi --show drun
 bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
+bind = $mainMod, G, togglesplit, # dwindle
+bind = $mainMod, F1, exec, swaylock
+bind = $mainMod, W, exec, eww open --toggle powermenu
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
+bind = $mainMod, H, movefocus, l
 bind = $mainMod, right, movefocus, r
+bind = $mainMod, L, movefocus, r
 bind = $mainMod, up, movefocus, u
+bind = $mainMod, K, movefocus, u
 bind = $mainMod, down, movefocus, d
+bind = $mainMod, J, movefocus, d
 
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
@@ -151,7 +173,9 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, bracketleft, workspace, e+1
 bind = $mainMod, mouse_up, workspace, e-1
+bind = $mainMod, bracketright, workspace, e-1
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
diff --git a/nixos/home-manager/env/config/hypr/hyprpaper.conf b/nixos/home-manager/env/config/hypr/hyprpaper.conf
new file mode 100644
index 00000000..4e992cd1
--- /dev/null
+++ b/nixos/home-manager/env/config/hypr/hyprpaper.conf
@@ -0,0 +1,7 @@
+preload = ~/.dotfiles/wallpaper/images_dark/1920x1080.png
+preload = ~/.dotfiles/wallpaper/images_dark/1920x1200.png
+preload = ~/.dotfiles/wallpaper/images_dark/1080x1920.png
+
+wallpaper = HDMI-A-1,~/.dotfiles/wallpaper/images_dark/1920x1200.png
+wallpaper = DP-1,~/.dotfiles/wallpaper/images_dark/1080x1920.png
+wallpaper = *,~/.dotfiles/wallpaper/images_dark/1920x1080.png