refreshed config

3 files changed, 62 insertions, 2 deletions

diff --git a/modules/desktop/wms/default.nix b/modules/desktop/wms/default.nix
new file mode 100644
index 0000000..94d0e05
--- /dev/null
+++ b/modules/desktop/wms/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./hyprland.nix
+    ./xfce.nix
+  ];
+}
diff --git a/modules/desktop/wms/hyprland.nix b/modules/desktop/wms/hyprland.nix
new file mode 100644
index 0000000..8243b3d
--- /dev/null
+++ b/modules/desktop/wms/hyprland.nix
@@ -0,0 +1,43 @@
+{pkgs, lib, config, ...}: 
+  let cfg = config.addons.desktop.hyprland;  
+in {
+  options.addons.desktop.hyprland = {
+    enable = lib.mkEnableOption "Enable Hyprland"; 
+  };
+
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    (import ../../../utils/makeWm.nix "hyprland" "wayland" )
+    {
+      programs.hyprland.enable = true; 
+      programs.hyprland.withUWSM  = true; 
+      programs.uwsm = {
+        enable = true; 
+        waylandCompositors ={
+          hyprland = {
+            prettyName = "Hyprland";
+            comment = "Hyprland compositor managed by UWSM";
+            binPath = "/run/current-system/sw/bin/Hyprland";
+          };
+        };
+      };
+
+    environment.systemPackages = with pkgs; [
+      hyprland
+      hyprshot
+      hypridle
+      hyprpaper
+      hyprpicker
+      hyprnotify
+      hyprcursor
+      hyprpolkitagent
+      wofi
+      waybar
+      waybar-mpris
+      mako
+      xdg-desktop-portal-gnome 
+      xdg-desktop-portal-hyprland
+      wl-clipboard
+    ]; 
+    }
+  ]);
+} 
diff --git a/nixos/desktop/xfce.nix b/modules/desktop/wms/xfce.nix
index 563b205..0c62ee0 100644
--- a/nixos/desktop/xfce.nix
+++ b/modules/desktop/wms/xfce.nix
@@ -1,5 +1,15 @@
-{pkgs, ...}:
-{
+{pkgs, config, lib, ...}:
+let 
+  cfg = config.addons.desktop.xfce; 
+in {
+  
+  options.addons.desktop.xfce = {
+    enable = lib.mkEnableOption "Enable xfce";
+  };
+  
+  config = lib.mkIf cfg.enable (lib.mkMerge [ 
+  (import ../../../utils/makeWm.nix "xfce" "x11" )
+  {
    environment.systemPackages = with pkgs; [
      # XFCE stuff
      xfce.catfish
@@ -23,4 +33,5 @@
      gnome-disk-utility
    ];
    services.xserver.desktopManager.xfce.enable = true; 
+  }]);
 }