Update desktop config, split up files

3 files changed, 26 insertions, 16 deletions

diff --git a/host/Rory-desktop/optional/gui/hyprland.nix b/host/Rory-desktop/optional/gui/hyprland.nix
new file mode 100644

index 0000000..5fcbfb4
--- /dev/null
+++ b/host/Rory-desktop/optional/gui/hyprland.nix
@@ -0,0 +1,26 @@
+{
+  pkgs,
+  hyprland,
+  hy3,
+  ...
+}:
+
+{
+  programs.hyprland = {
+    enable = true;
+    package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+  };
+
+  programs.hyprlock.enable = true;
+  environment.systemPackages = with pkgs;[
+    wmenu
+  ];
+
+  environment.etc."hyprPlugins" = {
+    text = ''
+      plugin = ${hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3}/lib/libhy3.so
+    '';
+  };
+
+  xdg.portal.wlr.enable = true;
+}
diff --git a/host/Rory-desktop/optional/gui/x11.nix b/host/Rory-desktop/optional/gui/i3.nix

index 9070298..9070298 100644
--- a/host/Rory-desktop/optional/gui/x11.nix
+++ b/host/Rory-desktop/optional/gui/i3.nix
diff --git a/host/Rory-desktop/optional/gui/wayland.nix b/host/Rory-desktop/optional/gui/sway.nix

index a8f7db7..f19635f 100644
--- a/host/Rory-desktop/optional/gui/wayland.nix
+++ b/host/Rory-desktop/optional/gui/sway.nix
@@ -35,21 +35,5 @@
     ];
   };
 
-  programs.hyprland = {
-    enable = true;
-    package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-  };
-
-  programs.hyprlock.enable = true;
-  environment.systemPackages = with pkgs;[
-    wmenu
-  ];
-
-  environment.etc."hyprPlugins" = {
-    text = ''
-      plugin = ${hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3}/lib/libhy3.so
-    '';
-  };
-
   xdg.portal.wlr.enable = true;
 }