diff --git a/flake.lock b/flake.lock
index eca4d1b..387c6ec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,51 @@
 {
   "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,
@@ -185,8 +231,30 @@
         "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 9cee2ae..5c2daee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,9 +25,10 @@
           inputs.home-manager.lib.homeManagerConfiguration {
             extraSpecialArgs = { inherit inputs; };
             pkgs = inputs.nixpkgs.legacyPackages.${system};
-            modules = [
+            modules = with inputs;[
               ./hmModules
-              inputs.nixvim.homeModules.nixvim
+              nixvim.homeModules.nixvim
+              caelestia-shell.homeManagerModules.default
             ] ++ extraModules;
         };
       in {
@@ -58,6 +59,13 @@
       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
new file mode 100644
index 0000000..3849079
--- /dev/null
+++ b/hmModules/apps/caelestia-shell/app.nix
@@ -0,0 +1,61 @@
+{ 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 d01589f..b221b66 100644
--- a/users/onizuka/default.nix
+++ b/users/onizuka/default.nix
@@ -1,28 +1,6 @@
 { 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;
@@ -37,6 +15,7 @@
       };
     };
   };
+  caelestia-shell.enable = true;
 
   colors.enable = true;
   manpages.enable = true;