2 files changed, 21 insertions, 5 deletions

diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index e831f87f..cc7472ea 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -10,10 +10,6 @@ in {
   "$terminal" = "kitty";
   "$menu" = "fuzzel";
 
-  exec-once = [
-    "wpaperd"
-  ];
-
   env = [
     "NIXOS_OZONE_WL,1"
     "QT_QPA_PLATFORM,wayland"
@@ -85,7 +81,9 @@ in {
   };
 
   cursor = {
+    use_cpu_buffer = true;
     hide_on_key_press = true;
+    no_hardware_cursors = 0;
   };
 
   input = {
@@ -147,7 +145,10 @@ in {
     "$mainMod SHIFT, up, swapwindow, u"
     "$mainMod SHIFT, down, swapwindow, d"
 
-    "$mainMod, T, cyclenext"
+    "$mainMod, N, cyclenext, tiled"
+    "$mainMod, T, cyclenext, prev tiled"
+    "$mainMod SHIFT, N, swapnext"
+    "$mainMod SHIFT, T, swapnext, prev"
 
     "$mainMod, G, focusmonitor, 0"
     "$mainMod, C, focusmonitor, 1"
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 33bf7ef2..c8400c28 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -322,6 +322,21 @@ in {
         ExecStopPost = "${pkgs.coreutils}/bin/rm -rfv \"$CACHE_DIRECTORY\"";
       };
     };
+    wpaperd = {
+      Install = {
+        WantedBy = ["graphical-session.target"];
+      };
+      Unit = {
+        BindsTo = ["graphical-session-pre.target"];
+        After = ["graphical-session-pre.target"];
+      };
+      Service = {
+        ExecStart = lib.getExe cfg.programs.wpaperd.package;
+        Type = "simple";
+        Restart = "always";
+        RestartSec = "2s";
+      };
+    };
   } // listToAttrs (map ({host, port}: nameValuePair "proxy-to-autossh-socks@${toString port}" {
       Unit = {
         Requires = ["autossh-socks@${host}:${toString (port + 1)}.service" "proxy-to-autossh-socks@${toString port}.socket"];