diff --git a/flake.lock b/flake.lock
index fc0c1a4..e1e2364 100644
--- a/flake.lock
+++ b/flake.lock
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761484058,
-        "narHash": "sha256-1sSwP+wRGRRgBoi+FwOMVVP49RNux8KUgi/usb8n/z4=",
+        "lastModified": 1761610875,
+        "narHash": "sha256-hI0+1nQwQQM6i1p5x2X6Z8CxXjUYWRbKj8P2XbMopSw=",
         "owner": "AvengeMedia",
         "repo": "DankMaterialShell",
-        "rev": "c6efccd61c5e8e3e790f9545f55d354566a3929f",
+        "rev": "53507ef56bfeb453c4bc15c4011aeea98263ca27",
         "type": "github"
       },
       "original": {
@@ -79,6 +79,26 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760701190,
+        "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "dms-cli": {
       "inputs": {
         "gomod2nix": "gomod2nix",
@@ -87,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761431120,
-        "narHash": "sha256-TT1KN727ZWlmd4atpXTeWDx0Wk+YqlS1PbZWUf4CibY=",
+        "lastModified": 1761596158,
+        "narHash": "sha256-PDILfm8U6CiSHLG7f79wpHJxXHre9LSiXtoyWvVpp0s=",
         "owner": "AvengeMedia",
         "repo": "danklinux",
-        "rev": "a14e9a868bfbc861ab45a38e512715e8e12a2ef6",
+        "rev": "fce392f4c076961bfa3a6ca00ac27270cef07a91",
         "type": "github"
       },
       "original": {
@@ -195,11 +215,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1761452766,
-        "narHash": "sha256-Ez5UlTWtGNTkhii1ZIMPWxW6SlsUp7YSm+gTI1v9F8o=",
+        "lastModified": 1761598306,
+        "narHash": "sha256-0/bnV6NQk0oLzUTHm7Q02oe1xuNtDgKgQgWFGzUCXwI=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "a82ad89ef3a0cb773eb649435b0d2ba59b5957aa",
+        "rev": "d40321a8d8ba4292cd55caf288989d4a91891b15",
         "type": "github"
       },
       "original": {
@@ -385,11 +405,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1761482075,
-        "narHash": "sha256-bg63CfWgmKMCcabeIsz/5/E2Q1uhKzpbbL4u/ENRRZQ=",
+        "lastModified": 1761601789,
+        "narHash": "sha256-F8HDu+xAZ2GhYRZPTMbFgXfA6VI7pN95juP3/llCKx8=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "748d2f656ee4952090eb4ce8702ee05c82d228cb",
+        "rev": "309c3c78485781a28ad9f5bef48b09ecb3b81473",
         "type": "github"
       },
       "original": {
@@ -594,11 +614,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761443969,
-        "narHash": "sha256-iK8EZX+0I8nRhNRCEkmYmh2pifNTXhpcRsiUkObUK8c=",
+        "lastModified": 1761616257,
+        "narHash": "sha256-MMMrpfS7kQoGCU9cufSdFUiSKftwgWyS98RdWl5muXM=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "5e6ced46102b654619d0b60356b1268511053cba",
+        "rev": "e647a985731e7a058db3f375de0f6fac71ddde2e",
         "type": "github"
       },
       "original": {
@@ -698,11 +718,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1761173472,
-        "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
+        "lastModified": 1761468971,
+        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
+        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
         "type": "github"
       },
       "original": {
@@ -778,11 +798,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760822546,
-        "narHash": "sha256-cy3wJQQzQbZ/EYUfTDuMiP/haPOjkqGgWOPPl7K9oiM=",
+        "lastModified": 1761643228,
+        "narHash": "sha256-G16tcvlv9tHqrNQB8UTtdqTd6jur9wNuik1Kx6NDH5Y=",
         "ref": "refs/heads/master",
-        "rev": "3e2ce40b18af943f9ba370ed73565e9f487663ef",
-        "revCount": 697,
+        "rev": "1b147a2c78983877909f9e531fc8ce17c35a297a",
+        "revCount": 698,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -795,6 +815,7 @@
       "inputs": {
         "dankMaterialShell": "dankMaterialShell",
         "dgop": "dgop",
+        "disko": "disko",
         "dms-cli": "dms-cli",
         "ghostty": "ghostty",
         "grim-hyprland": "grim-hyprland",
@@ -872,11 +893,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1761349956,
-        "narHash": "sha256-tH3wHnOJms+U4k/rK2Nn1RfBrhffX92jLP/2VndSn0w=",
+        "lastModified": 1761594641,
+        "narHash": "sha256-sImk6SJQASDLQo8l+0zWWaBgg7TueLS6lTvdH5pBZpo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "02f2cb8e0feb4596d20cc52fda73ccee960e3538",
+        "rev": "1666250dbe4141e4ca8aaf89b40a3a51c2e36144",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d68fb33..a1881ea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,11 @@
       url = "github:eriedaberrie/grim-hyprland";
     };
 
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # TODO: sops-nix = {
     #   url = "github:Mic92/sops-nix";
     #   inputs.nixpkgs.follows = "nixpkgs";
@@ -75,6 +80,7 @@
     hyprland = {
       url = "github:hyprwm/Hyprland";
     };
+
     # nvm didnt even end up working
     # hyprspace = {
     #  url = "github:KZDKM/Hyprspace/";
@@ -91,8 +97,10 @@
     ghostty,
     hu-tao-cursor,
     dgop,
+    dms-cli,
     dankMaterialShell,
     pinix,
+    disko,
     #sops-nix,
     ...
   } @ inputs: let
@@ -131,13 +139,14 @@
             overlays = [
               (final: prev: {
                 ollama = unstablePkgs.ollama-cuda;
-                # broken atm
-                # rpcs3 = unstablePkgs.rpcs3;
+                #rpcs3 = unstablePkgs.rpcs3;
                 quickshell = unstable.legacyPackages.${system}.quickshell;
                 ghostty = inputs.ghostty.packages.${system}.default;
                 hu-tao-animated-cursor = inputs.hu-tao-cursor.packages.${system}.default;
                 grim-hyprland = inputs.grim-hyprland.packages.${system}.default;
                 dgop = inputs.dgop.packages.${system}.default;
+                dms-cli = inputs.dms-cli.packages.${system}.default;
+                DMShell = inputs.dankMaterialShell.packages.${system}.default;
                 pinix = inputs.pinix.packages.${system}.default;
               })
               (final: prev: {
@@ -147,7 +156,6 @@
                   binary-font
                   minijinja-cli
                   thorium
-                  voicevox
                   ;
               })
 
@@ -181,6 +189,7 @@
         inherit inputs;
       };
       modules = [
+        disko.nixosModules.disko
         {
           nixpkgs = {
             config = {
diff --git a/home-manager/modules/quickshell.nix b/home-manager/modules/quickshell.nix
index dedf0f9..97ed39c 100644
--- a/home-manager/modules/quickshell.nix
+++ b/home-manager/modules/quickshell.nix
@@ -4,12 +4,12 @@
   lib,
   ...
 }: {
-
   home.packages = with pkgs; [
     quickshell
+    DMShell
+    dms-cli
     dgop
     ddcutil
-    accountsservice
     cliphist
   ];
   home.sessionPath = ["${pkgs.quickshell}/bin"];
diff --git a/hosts/modules/hyprland.nix b/hosts/modules/hyprland.nix
index c4b4752..d296838 100644
--- a/hosts/modules/hyprland.nix
+++ b/hosts/modules/hyprland.nix
@@ -22,6 +22,8 @@
 
   security.polkit.enable = true;
 
+  services.accounts-daemon.enable = true;
+
   environment.systemPackages = with pkgs; [
     qt5.qtwayland
     qt6.qtwayland
@@ -46,9 +48,9 @@
     hyprpicker
     nwg-look
     gsimplecal
-    # hyprspace
     kdePackages.xwaylandvideobridge
     matugen
     brightnessctl
+    xwayland-satellite
   ];
 }