diff --git a/flake.lock b/flake.lock
index de4a657..2cf9905 100644
--- a/flake.lock
+++ b/flake.lock
@@ -398,6 +398,28 @@
       }
     },
     "home-manager_3": {
+      "inputs": {
+        "nixpkgs": [
+          "plasma-mgr",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710888565,
+        "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-23.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_4": {
       "inputs": {
         "nixpkgs": [
           "stylix",
@@ -550,6 +572,22 @@
       }
     },
     "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1711124224,
+        "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1700856099,
         "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
@@ -565,6 +603,25 @@
         "type": "github"
       }
     },
+    "plasma-mgr": {
+      "inputs": {
+        "home-manager": "home-manager_3",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1711549217,
+        "narHash": "sha256-O9fCqmgrlRyNpApIVqhYyVSjKWfVzrw9qsEzeTYfBEc=",
+        "owner": "pjones",
+        "repo": "plasma-manager",
+        "rev": "298f345f3ca9528ca88dbbbdcadfc270b7582ded",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pjones",
+        "repo": "plasma-manager",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -575,6 +632,7 @@
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_4",
+        "plasma-mgr": "plasma-mgr",
         "stylix": "stylix"
       }
     },
@@ -591,8 +649,8 @@
         "base16-vim": "base16-vim",
         "flake-compat": "flake-compat",
         "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_5"
+        "home-manager": "home-manager_4",
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1708896938,
diff --git a/flake.nix b/flake.nix
index 804844a..40ffbfc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,6 +38,8 @@
     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/users/mary/desktop.nix b/users/mary/desktop.nix
index ae9af5d..62a5a4a 100644
--- a/users/mary/desktop.nix
+++ b/users/mary/desktop.nix
@@ -116,7 +116,6 @@
 
     shotwell
     flameshot
-
   ];
 
   # basic configuration of git, please change to your own
diff --git a/worlds/majin/disks.nix b/worlds/majin/disks.nix
index 726b95a..54ba453 100644
--- a/worlds/majin/disks.nix
+++ b/worlds/majin/disks.nix
@@ -1,56 +1,58 @@
 {
-  devices = {
-    disk = {
-      oneT = {
-        device = "/dev/disk/by-id/nvme-Seagate_FireCuda_530_ZP1000GM30013_7VQ04CBH";
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-	          home = {
-              size = "100%";
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/home";
+  disko = {
+    devices = {
+      disk = {
+        oneT = {
+          device = "/dev/disk/by-id/nvme-Seagate_FireCuda_530_ZP1000GM30013_7VQ04CBH";
+          type = "disk";
+          content = {
+            type = "gpt";
+            partitions = {
+	            home = {
+                size = "100%";
+                content = {
+                  type = "filesystem";
+                  format = "ext4";
+                  mountpoint = "/home";
+                };
               };
-            };
+	          };
 	        };
-	      };
-      };
+        };
 
-      twoT = {
-        device = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_2TB_S7DNNJ0WA07648B";
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "1G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
+        twoT = {
+          device = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_2TB_S7DNNJ0WA07648B";
+          type = "disk";
+          content = {
+            type = "gpt";
+            partitions = {
+              ESP = {
+                size = "1G";
+                type = "EF00";
+                content = {
+                  type = "filesystem";
+                  format = "vfat";
+                  mountpoint = "/boot";
+                };
               };
-            };
-            swap = {
-              size = "64G";
-              content = {
-                type = "swap";
-                resumeDevice = true;
+              swap = {
+                size = "64G";
+                content = {
+                  type = "swap";
+                  resumeDevice = true;
+                };
               };
-            };
 
-            root = {
-              size = "100%";
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/";
+              root = {
+                size = "100%";
+                content = {
+                  type = "filesystem";
+                  format = "ext4";
+                  mountpoint = "/";
+                };
               };
-            };
 
+            };
           };
         };
       };
diff --git a/worlds/maryland.nix b/worlds/maryland.nix
index 6fdb9c2..7efa55d 100644
--- a/worlds/maryland.nix
+++ b/worlds/maryland.nix
@@ -121,6 +121,9 @@ in {
         home-manager.extraSpecialArgs = {
           inherit inputs fg42;
         };
+        extraModules = [
+          inputs.plasma-mgr.homeManagerModules.plasma-manager
+        ];
       }
     ]);