5 files changed, 46 insertions, 29 deletions
diff --git a/system/desktops/default.nix b/system/desktops/default.nix
new file mode 100644
index 0000000..8f9270f
--- /dev/null
+++ b/system/desktops/default.nix
@@ -0,0 +1,8 @@
+{...}: {
+  imports = [
+    ./hyprland.nix
+    ./ly.nix
+    ./sway.nix
+    ./wayland.nix
+  ];
+}
diff --git a/system/desktops/hyprland.nix b/system/desktops/hyprland.nix
new file mode 100644
index 0000000..91170bd
--- /dev/null
+++ b/system/desktops/hyprland.nix
@@ -0,0 +1,29 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkDefault;
+  cfg = config.desktops.hyprland;
+in {
+  config = mkIf cfg.enable {
+    desktops.wayland.enable = true;
+
+    xdg.portal = {
+      extraPortals = [
+        inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
+      ];
+      config = {
+        hyprland.common = ["gtk" "hyprland"];
+      };
+    };
+
+    programs.hyprland = {
+      enable = true;
+      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+      portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+    };
+  };
+}
diff --git a/modules/desktops/ly.nix b/system/desktops/ly.nix
index 9e9e51b..ac53495 100644
--- a/modules/desktops/ly.nix
+++ b/system/desktops/ly.nix
@@ -2,18 +2,17 @@
   lib,
   config,
   pkgs,
-  self,
-  system,
+  inputs,
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.desktops;
+  cfg = config.desktops.ly;
 in {
-  config = mkIf cfg.ly {
+  config = mkIf cfg.enable {
     # display manager
     services.displayManager.ly = {
       enable = true;
-      package = self.packages.${system}.ly;
+      package = inputs.self.packages.${pkgs.system}.ly;
 
       settings = let
         base = "0x00${config.theme.colors.base}";
diff --git a/modules/desktops/sway/default.nix b/system/desktops/sway.nix
index be3766d..622d54c 100644
--- a/modules/desktops/sway/default.nix
+++ b/system/desktops/sway.nix
@@ -5,16 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkDefault;
-  cfg = config.desktops;
+  cfg = config.desktops.sway;
 in {
-  imports = [
-    ./binds.nix
-    ./config.nix
-    ./idle.nix
-  ];
-
-  config = mkIf cfg.sway {
-    desktops.wayland = true;
+  config = mkIf cfg.enable {
+    desktops.wayland.enable = true;
 
     # TODO: set NIXOS_OZONE_WL env var
 
@@ -35,18 +29,5 @@ in {
         gtk = false;
       };
     };
-
-    home-manager.users.${config.user} = {
-      wayland.windowManager.sway = {
-        enable = true;
-        package = pkgs.swayfx;
-
-        # TODO: get swayfx to work with check config
-        checkConfig = false;
-
-        xwayland = true;
-        systemd.enable = true;
-      };
-    };
   };
 }
diff --git a/modules/desktops/wayland.nix b/system/desktops/wayland.nix
index 600651f..8a81fdf 100644
--- a/modules/desktops/wayland.nix
+++ b/system/desktops/wayland.nix
@@ -5,9 +5,9 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.desktops;
+  cfg = config.desktops.wayland;
 in {
-  config = mkIf cfg.wayland {
+  config = mkIf cfg.enable {
     xdg.portal = {
       enable = true;
       xdgOpenUsePortal = true;