modules/other/xdg.nix

@@ -22,12 +22,7 @@ in {
     };
   };
 
-  xdg = {
-    autostart.enable = true;
-    menus.enable = true;
-    icons.enable = true;
-    mime = {
-      enable = true;
+  xdg.mime = {
     defaultApplications = {
       "text/html" = [primary_browser];
       "x-scheme-handler/http" = [primary_browser];
@@ -68,5 +63,4 @@ in {
       "application/pdf" = [pdf_viewer];
     };
   };
-  };
 }

modules/wms/wayland/niri/module.nix

@@ -11,31 +11,13 @@ in {
     enable = true;
   };
   programs.xwayland.enable = lib.mkForce false;
-  services.gnome.gnome-keyring.enable = true;
+  services.gnome.gnome-keyring.enable = lib.mkForce false;
   environment.systemPackages = builtins.attrValues {
     inherit (pkgs) wmenu swaylock avizo playerctl xwayland-satellite;
   };
 
-  systemd.user.services.niri-polkit = {
-    description = "PolicyKit Authentication Agent for niri";
-    wantedBy = ["niri.service"];
-    after = ["graphical-session.target"];
-    partOf = ["graphical-session.target"];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";
-      Restart = "on-failure";
-      RestartSec = 1;
-      TimeoutStopSec = 10;
-    };
-  };
-
-  services.displayManager.sessionPackages = [
-    cfg.package
-  ];
-
   xdg.portal = {
-    enable =  true;
+    enable = lib.mkDefault true;
 
     configPackages = [cfg.package];
 

modules/wms/xfce/module.nix

@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-in {
-  services.xserver = {
-    enable = true;
-    desktopManager = {
-      xterm.enable = false;
-      xfce = {
-        enable = true;
-        enableWaylandSession = true;
-        waylandSessionCompositor = lib.getExe pkgs.niri;
-
-        noDesktop = false;
-        enableXfwm = false;
-      };
-    };
-  };
-  services.displayManager.defaultSession = "xfce";
-}