1 files changed, 4 insertions, 14 deletions

diff --git a/modules/desktop.nix b/modules/desktop.nix
index 0099d75..ebe30e6 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -13,14 +13,10 @@ in {
 
     programs.kdeconnect.enable = true;
     # Performs some setup needed by river.
-    programs.sway.enable = true;
-    programs.sway.wrapperFeatures.gtk = true;
     programs.xwayland.enable = true;
     programs.dconf.enable = true;
 
-    xdg.portal.enable = true;
-    xdg.portal.wlr.enable = true;
-    xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-kde];
+    xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-kde ];
     services.dbus.enable = true;
     services.udisks2.enable = true;
 
@@ -37,10 +33,7 @@ in {
 	      });
       })
       (final: prev: {
-        river = final.unstable.river;
         lswt = final.unstable.lswt;
-        swayidle = final.unstable.swayidle;
-        swaylock = final.unstable.swaylock;
       })
     ];
 
@@ -54,7 +47,6 @@ in {
     };
 
     security.rtkit.enable = true;
-    security.pam.services.swaylock = {};
     hardware.pulseaudio.enable = false;
     services.printing.enable = true;
 
@@ -87,7 +79,7 @@ in {
     };
 
     programs.firefox.enable = true;
-    programs.firefox.nativeMessagingHosts.packages = [ pkgs.tridactyl-native ];
+    programs.firefox.package = pkgs.librewolf;
 
     environment.systemPackages = with pkgs; [
       anki
@@ -98,8 +90,6 @@ in {
       waybar
       light
       playerctl
-      swaylock
-      swayidle
       grim
       slurp
       wlr-randr
@@ -188,14 +178,14 @@ in {
       avahi.openFirewall = true;
 
       displayManager.sddm.enable = true;
-      displayManager.sessionPackages = with pkgs; [ river ];
+      displayManager.sddm.wayland.enable = true;
 
       xserver = {
         enable = true;
         xkb.layout = "us";
         xkb.options = "caps:ctrl_modifier";
 
-        desktopManager.plasma5 = { enable = true; };
+        desktopManager.plasma6.enable = true;
 
         windowManager.xmonad = {
           enable = true;