1 files changed, 25 insertions, 6 deletions

diff --git a/modules/desktop.nix b/modules/desktop.nix
index 15f1112..752d264 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -14,6 +14,9 @@ in {
     programs.kdeconnect.enable = true;
 
     xdg.portal.enable = true;
+    xdg.portal.wlr.enable = true;
+    xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-kde];
+    services.dbus.enable = true;
 
     location.latitude = 40.0;
     location.longitude = -74.0;
@@ -26,11 +29,14 @@ in {
     nixpkgs.overlays = [
       (final: prev: {
         xmonad = (prev.xmonad-with-packages.override {
-	  packages = self: [ self.xmonad-contrib self.xmonad-extras ];
-	});
-	#.overrideAttrs (oldAttrs: rec {
-        #  buildInputs = oldAttrs.buildInputs + [ pkgs.xlibs.libXft ];
-        #});
+	        packages = self: [ self.xmonad-contrib self.xmonad-extras ];
+	      });
+      })
+      (final: prev: {
+        river = final.unstable.river;
+        lswt = final.unstable.lswt;
+        swayidle = final.unstable.swayidle;
+        swaylock = final.unstable.swaylock;
       })
     ];
 
@@ -76,6 +82,18 @@ in {
     };
 
     environment.systemPackages = with pkgs; [
+      # Wayland packages
+      river
+      waybar
+      light
+      playerctl
+      swaylock
+      swayidle
+      grim
+      wlopm
+      wev
+      lswt
+
       (conky.override { pulseSupport = true; })
       wezterm
       anki
@@ -165,7 +183,8 @@ in {
           extraPackages = hpkgs: [ hpkgs.xmobar hpkgs.split ];
         };
 
-        displayManager.lightdm.enable = true;
+        displayManager.sddm.enable = true;
+        displayManager.sessionPackages = with pkgs; [ river ];
       };
 
       # redshift = {