From c45080ccd5451fefba52a3ac5adfd9de7b84a594 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Mon, 6 Nov 2023 13:37:38 +0100
Subject: [PATCH] enable flatpak on all desktops

---
 modules/desktop/default.nix | 6 +++++-
 modules/desktop/kde.nix     | 3 ---
 vinzenz-lpt.nix             | 3 ---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 0408581..33a8fcc 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -23,11 +23,14 @@ in {
 
   config = lib.mkIf isEnabled {
     services = {
+      # Enable the X11 windowing system / wayland depending on DE
       xserver = {
-        # Enable the X11 windowing system / wayland depending on DE
         enable = true;
         libinput.enable = true;
       };
+
+      # flatpak xdg-portal-kde crashes, otherwise this would be global
+      flatpak.enable = true;
     };
 
     # Enable sound with pipewire.
@@ -76,6 +79,7 @@ in {
       # save some boot time because nothing actually requires network connectivity
       services.NetworkManager-wait-online.enable = false;
 
+      # prevent stuck units from preventing shutdown (default is 120s)
       extraConfig = ''
         DefaultTimeoutStopSec=12s
       '';
diff --git a/modules/desktop/kde.nix b/modules/desktop/kde.nix
index 0c5a713..c6b6590 100644
--- a/modules/desktop/kde.nix
+++ b/modules/desktop/kde.nix
@@ -11,9 +11,6 @@ in {
   config = lib.mkIf isEnabled {
     my.desktop.enable = true;
 
-    # flatpak xdg-portal-kde crashes, otherwise this would be global
-    services.flatpak.enable = false;
-
     services = {
       # Enable the KDE Plasma Desktop Environment.
       xserver = {
diff --git a/vinzenz-lpt.nix b/vinzenz-lpt.nix
index 1d04d75..1bb1eda 100644
--- a/vinzenz-lpt.nix
+++ b/vinzenz-lpt.nix
@@ -15,8 +15,5 @@
         enablePrinting = true;
       };
     };
-
-    # flatpak xdg-portal-kde crashes, otherwise this would be global
-    services.flatpak.enable = true;
   };
 }