fix: make portals great again!

modules/nix-config/de.nix

@@ -11,31 +11,6 @@ let
   };
 in
 {
-  programs.niri.enable = true;
-  services.dbus.packages = [ pkgs.nautilus ];
-  services.dbus.implementation = "broker";
-  services.xserver.desktopManager.runXdgAutostartIfNone = true;
-
-  # For god's sake, never touch this code again, so much pain has been released on the following lines.
-  xdg.portal = {
-    enable = true;
-    xdgOpenUsePortal = true;
-    extraPortals = lib.mkForce [
-      pkgs.xdg-desktop-portal-wlr
-      pkgs.xdg-desktop-portal-gtk
-    ];
-    config = {
-      niri = {
-        default = lib.mkForce [
-          "wlr"
-          "gtk"
-        ];
-        "org.freedesktop.impl.portal.ScreenCast" = [ "wlr" ];
-        "org.freedesktop.impl.portal.Screenshot" = [ "wlr" ];
-      };
-    };
-  };
-
   services = {
     xserver.enable = true;
     xserver.excludePackages = with pkgs; [
@@ -59,13 +34,6 @@ in
 
     gnome.gnome-keyring.enable = true;
   };
-  environment.etc."xdg/autostart/niri.desktop".text = ''
-    [Desktop Entry]
-    Name=Niri
-    Exec=${config.programs.niri.package}/bin/niri-session
-    Type=Application
-    X-GDM-SessionRegisters=true
-  '';
   environment.plasma6.excludePackages = with pkgs.kdePackages; [
     elisa
     konsole

modules/nix-config/default.nix

@@ -23,28 +23,6 @@
     else
       [ ]
   );
-
-  xdg.portal = {
-    enable = true;
-    config = {
-      common = {
-        default = [
-          "gnome"
-          "gtk"
-        ];
-        "org.freedesktop.impl.portal.ScreenCast" = "gnome";
-        "org.freedesktop.impl.portal.Screenshot" = "gnome";
-        "org.freedesktop.impl.portal.RemoteDesktop" = "gnome";
-      };
-    };
-    xdgOpenUsePortal = true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal
-      xdg-desktop-portal-gtk
-      xdg-desktop-portal-gnome
-    ];
-  };
-
   time.timeZone = "Europe/Rome";
 
   # Select internationalisation properties.

modules/programs/default.nix

@@ -5,6 +5,11 @@
   ...
 }:
 {
+  imports = [
+
+  ]
+  ++ (if currentSystemDe == "niri" then [ ./niri.nix ] else [ ]);
+
   programs = {
     gamescope = {
       enable = true;

modules/programs/niri.nix

@@ -0,0 +1,34 @@
+{ pkgs, lib, config, ... }:
+{
+  programs.niri.enable = true;
+
+  services.dbus.packages = [ pkgs.nautilus ];
+  services.dbus.implementation = "broker";
+  services.xserver.desktopManager.runXdgAutostartIfNone = true;
+  services.upower.enable = true;
+  services.displayManager.dms-greeter = {
+    enable = true;
+    compositor.name = "niri";
+  };
+
+  # For god's sake, never touch this code again, so much pain has been released on the following lines.
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+    extraPortals = lib.mkForce [
+      pkgs.xdg-desktop-portal-wlr
+      pkgs.xdg-desktop-portal-gtk
+    ];
+    config = {
+      niri = {
+        default = lib.mkForce [
+          "gtk"
+          "wlr"
+        ];
+        "org.freedesktop.impl.portal.ScreenCast" = [ "wlr" ];
+        "org.freedesktop.impl.portal.Screenshot" = [ "wlr" ];
+      };
+    };
+  };
+
+}