From 0be6fcd72acf867fd7255d4c9f9d6a1d7a26e0c7 Mon Sep 17 00:00:00 2001
From: Jonni Liljamo <jonni@liljamo.com>
Date: Sun, 13 Oct 2024 16:34:20 +0300
Subject: [PATCH] feat: various changes to hyprland role, switch alice from
 plasma to hyprland

---
 hosts/alice/default.nix  |  5 ++++-
 hosts/alice/hyprland.nix | 28 ++++++++++++++++++++++++++++
 hosts/arwen/default.nix  |  5 ++++-
 hosts/arwen/hyprland.nix | 18 ++++++++++++++++++
 roles/hyprland.nix       | 35 ++++++++++++++++++++---------------
 5 files changed, 74 insertions(+), 17 deletions(-)
 create mode 100644 hosts/alice/hyprland.nix
 create mode 100644 hosts/arwen/hyprland.nix

diff --git a/hosts/alice/default.nix b/hosts/alice/default.nix
index eb686e0..5e36e6e 100644
--- a/hosts/alice/default.nix
+++ b/hosts/alice/default.nix
@@ -3,6 +3,10 @@
   pkgs,
   ...
 }: {
+  imports = [
+    ./hyprland.nix
+  ];
+
   sops.secrets.rootPwd.neededForUsers = true;
   sops.secrets.skyePwd.neededForUsers = true;
 
@@ -65,7 +69,6 @@
     enable = true;
     nvidia.enable = true;
   };
-  roles.plasma.enable = true;
 
   roles.gaming = {
     enable = true;
diff --git a/hosts/alice/hyprland.nix b/hosts/alice/hyprland.nix
new file mode 100644
index 0000000..67c5f30
--- /dev/null
+++ b/hosts/alice/hyprland.nix
@@ -0,0 +1,28 @@
+{
+  roles.hyprland.enable = true;
+
+  hm = {
+    wayland.windowManager.hyprland.settings = {
+      monitor = [
+        "DP-2,3840x2160@60,0x0,1"
+        "DP-1,2560x1440@59,3840x0,1"
+        "HDMI-A-1,1920x1080@60,6400x0,1,transform,1"
+      ];
+    };
+
+    programs.wpaperd.settings = {
+      DP-2 = {
+        path = "/home/skye/Nextcloud/Wallpapers/forest";
+        duration = "15m";
+      };
+      DP-1 = {
+        path = "/home/skye/Nextcloud/Wallpapers/minimalgals";
+        duration = "15m";
+      };
+      HDMI-A-1 = {
+        path = "/home/skye/Nextcloud/Wallpapers/sailormoonmobile";
+        duration = "15m";
+      };
+    };
+  };
+}
diff --git a/hosts/arwen/default.nix b/hosts/arwen/default.nix
index 53a63a3..db5cd00 100644
--- a/hosts/arwen/default.nix
+++ b/hosts/arwen/default.nix
@@ -1,4 +1,8 @@
 {config, ...}: {
+  imports = [
+    ./hyprland.nix
+  ];
+
   sops.secrets.rootPwd.neededForUsers = true;
   sops.secrets.skyePwd.neededForUsers = true;
 
@@ -49,7 +53,6 @@
     enable = true;
     amd.enable = true;
   };
-  roles.hyprland.enable = true;
 
   roles.gaming = {
     enable = true;
diff --git a/hosts/arwen/hyprland.nix b/hosts/arwen/hyprland.nix
new file mode 100644
index 0000000..18967bb
--- /dev/null
+++ b/hosts/arwen/hyprland.nix
@@ -0,0 +1,18 @@
+{
+  roles.hyprland.enable = true;
+
+  hm = {
+    wayland.windowManager.hyprland.settings = {
+      monitor = [
+        "eDP-1,1920x1080@60,0x0,1"
+      ];
+    };
+
+    programs.wpaperd.settings = {
+      eDP-1 = {
+        path = "/home/skye/wallpapers/middleearth";
+        duration = "5m";
+      };
+    };
+  };
+}
diff --git a/roles/hyprland.nix b/roles/hyprland.nix
index 5fc4f28..167c8a1 100644
--- a/roles/hyprland.nix
+++ b/roles/hyprland.nix
@@ -15,16 +15,15 @@ in {
 
     programs.hyprland.enable = true;
 
+    security.pam.services.hyprlock = {};
+
     hm = {
       wayland.windowManager.hyprland = {
         enable = true;
+        # NOTE: These are just the default settings.
         settings = {
-          monitor = [
-            "eDP-1,1920x1080@60,0x0,1"
-          ];
-
           exec-once = [
-            "wpaperd"
+            "wpaperd -d"
           ];
 
           general = {
@@ -66,6 +65,8 @@ in {
             "$mod SHIFT, return, exec, bemenu-run"
             "$mod SHIFT, x, exec, hyprlock"
 
+            "$mod, w, exec, wpaperctl next"
+
             "$mod SHIFT, c, killactive"
             "$mod SHIFT, q, exit"
 
@@ -122,23 +123,27 @@ in {
       programs.hyprlock = {
         enable = true;
         settings = {
+          general = {
+            no_fade_in = true;
+            no_fade_out = true;
+          };
           background = [
             {
-              path = "/home/skye/dev/femboys.png";
+              #path = "/home/skye/dev/femboys.png";
+              color = "rgba(255, 255, 255, 1.0)";
+            }
+          ];
+          input-field = [
+            {
+              monitor = "";
+              size = "200, 50";
+              position = "0, 0";
             }
           ];
         };
       };
 
-      programs.wpaperd = {
-        enable = true;
-        settings = {
-          eDP-1 = {
-            path = "/home/skye/wallpapers/middleearth";
-            duration = "5m";
-          };
-        };
-      };
+      programs.wpaperd.enable = true;
     };
   };
 }
-- 
2.44.1