diff --git a/flake.lock b/flake.lock
index 387c6ec..eca4d1b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,51 +1,5 @@
 {
   "nodes": {
-    "caelestia-cli": {
-      "inputs": {
-        "caelestia-shell": [
-          "caelestia-shell"
-        ],
-        "nixpkgs": [
-          "caelestia-shell",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1777726295,
-        "narHash": "sha256-Db9B3uTLDSj7zjQ4L3tIk9RcxHXbWRKw5fw8JozikyI=",
-        "owner": "caelestia-dots",
-        "repo": "cli",
-        "rev": "a00e71d6b7572a8dbbb7945a45b79acf2401ad56",
-        "type": "github"
-      },
-      "original": {
-        "owner": "caelestia-dots",
-        "repo": "cli",
-        "type": "github"
-      }
-    },
-    "caelestia-shell": {
-      "inputs": {
-        "caelestia-cli": "caelestia-cli",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "quickshell": "quickshell"
-      },
-      "locked": {
-        "lastModified": 1778065483,
-        "narHash": "sha256-o16Q7F9BjZFIPKDis/w/aBbSY6hZRPP/svS8GJ1xuoM=",
-        "owner": "caelestia-dots",
-        "repo": "shell",
-        "rev": "4763a690cd41ba8c13e69d89a0d2d655332d1e89",
-        "type": "github"
-      },
-      "original": {
-        "owner": "caelestia-dots",
-        "repo": "shell",
-        "type": "github"
-      }
-    },
     "easy-hosts": {
       "locked": {
         "lastModified": 1755470564,
@@ -231,30 +185,8 @@
         "type": "github"
       }
     },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "caelestia-shell",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1777706159,
-        "narHash": "sha256-TuD8hw9lkRCEb+6v93iB7HDvcmvH8R0qyD6wBmPGfv8=",
-        "ref": "refs/heads/master",
-        "rev": "8db8ca1fecfcce8def1f9265fa1742baa0e0c271",
-        "revCount": 813,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      }
-    },
     "root": {
       "inputs": {
-        "caelestia-shell": "caelestia-shell",
         "easy-hosts": "easy-hosts",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index 5c2daee..9cee2ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,10 +25,9 @@
           inputs.home-manager.lib.homeManagerConfiguration {
             extraSpecialArgs = { inherit inputs; };
             pkgs = inputs.nixpkgs.legacyPackages.${system};
-            modules = with inputs;[
+            modules = [
               ./hmModules
-              nixvim.homeModules.nixvim
-              caelestia-shell.homeManagerModules.default
+              inputs.nixvim.homeModules.nixvim
             ] ++ extraModules;
         };
       in {
@@ -59,13 +58,6 @@
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
 
-    caelestia-shell = {
-      type = "github";
-      owner = "caelestia-dots";
-      repo = "shell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     easy-hosts = {
       type = "github";
       owner = "tgirlcloud";
diff --git a/hmModules/apps/caelestia-shell/app.nix b/hmModules/apps/caelestia-shell/app.nix
deleted file mode 100644
index 3849079..0000000
--- a/hmModules/apps/caelestia-shell/app.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ inputs, config, lib, pkgs, ... }:
-
-{
-  options.caelestia-shell = {
-    enable = lib.mkEnableOption "Enables caelestia-shell";
-  };
-
-  config = lib.mkIf config.caelestia-shell.enable {
-    programs.caelestia = {
-      enable = true;
-      cli.enable = true;
-      systemd.enable = true;
-      settings = {
-        general.idle.timeouts = [ { timeout = 180; idleAction = "lock"; } ];
-        appearance = {
-          anim.durations.scale = 0.8;
-          transparency = { base = 0.75; enabled = true; layers = 0.4; };
-        };
-        background.desktopClock = {
-          enabled = true;
-          scale = 2.0;
-        };
-        bar = {
-          clock = {
-            background = true;
-            showDate = true;
-            showIcon = false;
-          };
-          entries = [
-            { id = "logo"; enabled = true; }
-            { id = "spacer"; enabled = true; }
-            { id = "tray"; enabled = true; }
-            { id = "clock"; enabled = true; }
-            { id = "power"; enabled = true; }
-          ];
-          persistent = false;
-          popouts = { activeWindow = false; statusIcons = false; };
-          scrollActions = { workspaces = false; brightness = false; };
-          showOnHover = true;
-        };
-        border = {
-          rounding = 6;
-          thickness = 4;
-        };
-        dashboard.showMedia = false;
-        launcher.enabled = false;
-        osd.enableBrightness = false;
-        paths.wallpaperDir = "${config.xdg.userDirs.pictures}/wallpapers";
-        services = {
-          weatherLocation = "47.61600, -122.31903";
-          useFahrenheit = false;
-          useTwelveHourClock = false;
-        };
-        utilities = {
-          enabled = false;
-          toasts.configLoaded = false;
-        };
-      };
-    };
-  };
-}
diff --git a/users/onizuka/default.nix b/users/onizuka/default.nix
index b221b66..d01589f 100644
--- a/users/onizuka/default.nix
+++ b/users/onizuka/default.nix
@@ -1,6 +1,28 @@
 { config, pkgs, ... }:
 
 {
+  # "DP-2" = [
+  #   "home"
+  #   "web"
+  #   "med"
+  #   "game"
+  # ];
+  # "DP-1" = [
+  #   "chat"
+  # ];
+  # RULES
+  # "name:web" = [ "class:(librewolf)" ];
+  # "name:med" = [ "class:(librewolf),title:Picture-in-Picture" ];
+  # "name:chat" = [ "class:(Beeper)" ];
+  # "name:game" = [ "class:(lutris)" "class:(explorer.exe)" ];
+  # OPAQUE:
+  # "initialTitle:^(Discord Popout)$"
+  # "class:^(firefox)$"
+  # "class:^(Gimp)$"
+  # "class:^(feh)$"
+  # "class:^(mpv)$"
+  # path = "${config.home.homeDirectory}/med/pix/bg.png";
+  # theme = "miku";
   niri = {
     enable = true;
     mouse.accel = -0.53;
@@ -15,7 +37,6 @@
       };
     };
   };
-  caelestia-shell.enable = true;
 
   colors.enable = true;
   manpages.enable = true;