diff --git a/flake.lock b/flake.lock
index cd0f7b8e..80c25a96 100644
--- a/flake.lock
+++ b/flake.lock
@@ -33,6 +33,54 @@
         "type": "github"
       }
     },
+    "caelestia": {
+      "inputs": {
+        "caelestia-cli": "caelestia-cli",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": [
+          "quickshell"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762651107,
+        "narHash": "sha256-V++8JREoP1TC6ROYByMAKx/cSyxza0tp1tUNOpq5Z4k=",
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "rev": "c0ea060ffecd3f38233652556d3085d094082400",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "type": "github"
+      }
+    },
+    "caelestia-cli": {
+      "inputs": {
+        "caelestia-shell": [
+          "caelestia"
+        ],
+        "nixpkgs": [
+          "caelestia",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762480719,
+        "narHash": "sha256-TjTMNmndJJIxP/N6owC/CoAPiRuM99fNaQbZqHDtwLw=",
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "rev": "9323fbf1b497204e17dff103cf412daf04a5c723",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1754269165,
@@ -974,6 +1022,22 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1750776420,
+        "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -1159,6 +1223,7 @@
     },
     "root": {
       "inputs": {
+        "caelestia": "caelestia",
         "devshell": "devshell",
         "disko": "disko",
         "hardware": "hardware",
@@ -1180,7 +1245,8 @@
         "nur": "nur",
         "quickshell": "quickshell",
         "sops-nix": "sops-nix",
-        "textfox": "textfox"
+        "textfox": "textfox",
+        "waifu-cursors": "waifu-cursors"
       }
     },
     "rust-overlay": {
@@ -1320,6 +1386,24 @@
         "type": "github"
       }
     },
+    "waifu-cursors": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1755614728,
+        "narHash": "sha256-FAzG8sav8N+1T5jsJa2gghkKrWnE+qo11rRZx2KX/Oo=",
+        "owner": "kagurazakei",
+        "repo": "waifu-cursors",
+        "rev": "8cb6137997c1a8d59b4b1ab1945ec00de5ad540a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kagurazakei",
+        "repo": "waifu-cursors",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
diff --git a/flake.nix b/flake.nix
index e3b57324..279bedc6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,10 +62,13 @@
     noctalia.inputs.nixpkgs.follows = "nixpkgs";
     noctalia.inputs.quickshell.follows = "quickshell";
 
+    # Lol
+    waifu-cursors.url = "github:kagurazakei/waifu-cursors";
+
     # Caelestia shell
-    # caelestia.url = "github:caelestia-dots/shell";
-    # caelestia.inputs.nixpkgs.follows = "nixpkgs";
-    # caelestia.inputs.quickshell.follows = "quickshell";
+    caelestia.url = "github:caelestia-dots/shell";
+    caelestia.inputs.nixpkgs.follows = "nixpkgs";
+    caelestia.inputs.quickshell.follows = "quickshell";
     # caelestia-cli.url = "github:caelestia-dots/cli";
     # caelestia-cli.inputs.nixpkgs.follows = "nixpkgs";
 
diff --git a/home/modules/default.nix b/home/modules/default.nix
index 21689f38..d9df9a50 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -34,6 +34,7 @@
     inputs.textfox.homeManagerModules.default
     # inputs.niri.homeModules.niri # Imported by system module
     inputs.noctalia.homeModules.default
+    inputs.caelestia.homeManagerModules.default
     # inputs.dankMaterialShell.homeModules.dankMaterialShell.default
     # inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
 
diff --git a/home/modules/hyprland/caelestia.nix b/home/modules/hyprland/caelestia.nix
new file mode 100644
index 00000000..9996564a
--- /dev/null
+++ b/home/modules/hyprland/caelestia.nix
@@ -0,0 +1,26 @@
+{
+  config,
+  hyprland,
+  color,
+}: {
+  enable = hyprland.caelestia.enable;
+  systemd = {
+    enable = false; # Start from hyprland autostart
+    target = "graphical-session.target";
+    environment = [];
+  };
+
+  settings = {
+    bar.status = {
+      showBattery = false;
+    };
+    paths.wallpaperDir = "~/NixFlake/wallpapers";
+  };
+
+  cli = {
+    enable = hyprland.caelestia.enable;
+    settings = {
+      theme.enableGtk = false;
+    };
+  };
+}
diff --git a/home/modules/hyprland/options.nix b/home/modules/hyprland/options.nix
index b44a7b2b..5052d8f3 100644
--- a/home/modules/hyprland/options.nix
+++ b/home/modules/hyprland/options.nix
@@ -5,12 +5,13 @@
 }: {
   enable = lib.mkEnableOption "Hyprland Window Manager + Compositor";
 
-  dunst.enable = lib.mkEnableOption "Enable dunst notification daemon";
+  dunst.enable = lib.mkEnableOption "Enable Dunst notification daemon";
   bars.enable = lib.mkEnableOption "Enable window bars";
   dynamicCursor.enable = lib.mkEnableOption "Enable dynamic cursors";
   trails.enable = lib.mkEnableOption "Enable dynamic window trails";
-  hyprspace.enable = lib.mkEnableOption "Enable hyprspace workspace overview";
-  hyprpanel.enable = lib.mkEnableOption "Enable hyprpanel";
+  hyprspace.enable = lib.mkEnableOption "Enable Hyprspace workspace overview";
+  hyprpanel.enable = lib.mkEnableOption "Enable Hyprpanel";
+  caelestia.enable = lib.mkEnableOption "Enable Caelestia";
 
   keyboard = {
     layout = lib.mkOption {