From 5894e4de02d5d046eb876251189e34577b224b9c Mon Sep 17 00:00:00 2001
From: Sameer Rahmani <lxsameer@gnu.org>
Date: Wed, 27 Mar 2024 20:33:54 +0000
Subject: [PATCH] Remove plasma-mgr

---
 flake.nix           |  2 --
 worlds/maryland.nix | 20 ++++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index 40ffbfc..804844a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,8 +38,6 @@
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
 
-    plasma-mgr.url = "github:pjones/plasma-manager";
-
     stylix.url = "github:danth/stylix/fcff15ac5ffbe81f1c66e352f3167c270d79cdab";
     # TODO: Checkout hercules
     # hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent";
diff --git a/worlds/maryland.nix b/worlds/maryland.nix
index 7efa55d..6d30ffa 100644
--- a/worlds/maryland.nix
+++ b/worlds/maryland.nix
@@ -40,22 +40,13 @@ let
 
     services.xserver.enable = true;
     services.xserver.autorun = lib.mkForce true;
-    # services.xserver.desktopManager.plasma5.enable = true;
-    # services.xserver.desktopManager.plasma5.runUsingSystemd = true;
-    # services.xserver.displayManager = lib.mkForce {
-    #     defaultSession = "plasma";
-    #     sddm.enable = true;
-    # };
+    services.xserver.desktopManager.plasma5.enable = true;
+    services.xserver.desktopManager.plasma5.runUsingSystemd = true;
     services.xserver.displayManager = lib.mkForce {
-        defaultSession = "gnome-xorg";
-	gdm.enable = true;
+        defaultSession = "plasma";
+        sddm.enable = true;
     };
 
-    services.xserver.desktopManager.gnome.enable = lib.mkForce true;
-    environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator gnome.adwaita-icon-theme ];
-    services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
-    programs.dconf.enable = true;
-
     services.dbus.enable = true;
     # I want to fully control my users via nix
     users.mutableUsers = false;
@@ -121,9 +112,6 @@ in {
         home-manager.extraSpecialArgs = {
           inherit inputs fg42;
         };
-        extraModules = [
-          inputs.plasma-mgr.homeManagerModules.plasma-manager
-        ];
       }
     ]);