From 4ffded8c0ba74ca633ee7421945915a52793585d Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Wed, 13 Jul 2022 19:37:41 +0200
Subject: [PATCH] plasma: move to desktop

---
 modules/default.nix                                   |  2 +-
 .../plasma/default.nix => desktop/plasma.nix}         | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename modules/{programs/plasma/default.nix => desktop/plasma.nix} (93%)

diff --git a/modules/default.nix b/modules/default.nix
index 4c780d6..18a4d7f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -21,7 +21,6 @@
     ./programs/waybar
     ./programs/zsh
     ./programs/xournalpp
-    ./programs/plasma
     ./programs/office
     ./programs/gaming
     ./programs/bluray
@@ -58,5 +57,6 @@
 
     # Desktop
     ./desktop/phosh.nix
+    ./desktop/plasma.nix
   ];
 }
diff --git a/modules/programs/plasma/default.nix b/modules/desktop/plasma.nix
similarity index 93%
rename from modules/programs/plasma/default.nix
rename to modules/desktop/plasma.nix
index 90eabcf..731e549 100644
--- a/modules/programs/plasma/default.nix
+++ b/modules/desktop/plasma.nix
@@ -28,11 +28,10 @@ in {
       };
       desktopManager.plasma5 = {
         enable = true;
-        #runUsingSystemd = true;
-        #supportDDC = true;
+        runUsingSystemd = true;
+        supportDDC = true;
         mobile.enable = cfg.mobile.enable;
 
-        /*
         kdeglobals = lib.mkIf cfg.mobile.enable {
           KDE = {
             StartDragDist = "10";
@@ -88,7 +87,6 @@ in {
             InputMethod = "${pkgs.maliit-keyboard}/usr/share/applications/com.github.maliit.keyboard.desktop";
           };
         };
-        */
       };
 
       # See https://github.com/NixOS/nixpkgs/commit/a506f9c79700255c215dddb53455d5e2bed6c1af
@@ -104,13 +102,12 @@ in {
     };
     
     environment.systemPackages = let
-      /*plasmaMobilePackages = with pkgs.libsForQt5; with plasma5; with kdeApplications; with kdeFrameworks; [
+      plasmaMobilePackages = with pkgs.libsForQt5; with plasma5; with kdeApplications; with kdeFrameworks; [
         plasma-mobile
         plasma-nano
         pkgs.maliit-framework
         pkgs.maliit-keyboard
-      ];*/
-      plasmaMobilePackages = [];
+      ];
       kdePackages = with pkgs.libsForQt5; [
         okular
         kdeconnect-kde