From 89892f4d09d8205bdfacde3867ca832878493231 Mon Sep 17 00:00:00 2001
From: Soramane <61896496+soramanew@users.noreply.github.com>
Date: Wed, 16 Jul 2025 13:43:12 +1000
Subject: nix: optionally include shell

---
 default.nix | 32 +++++++++++++++------------
 flake.lock  | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix   |  7 ++++++
 3 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/default.nix b/default.nix
index 904b22d..e856f88 100644
--- a/default.nix
+++ b/default.nix
@@ -15,6 +15,8 @@
   wl-screenrec,
   dconf,
   killall,
+  caelestia-shell,
+  withShell ? false,
   discordBin ? "discord",
   qtctStyle ? "Fusion",
 }:
@@ -37,20 +39,22 @@ python3.pkgs.buildPythonApplication {
   pythonImportsCheck = ["caelestia"];
 
   nativeBuildInputs = [installShellFiles];
-  propagatedBuildInputs = [
-    swappy
-    libnotify
-    slurp
-    wl-clipboard
-    cliphist
-    app2unit
-    dart-sass
-    grim
-    fuzzel
-    wl-screenrec
-    dconf
-    killall
-  ];
+  propagatedBuildInputs =
+    [
+      swappy
+      libnotify
+      slurp
+      wl-clipboard
+      cliphist
+      app2unit
+      dart-sass
+      grim
+      fuzzel
+      wl-screenrec
+      dconf
+      killall
+    ]
+    ++ lib.optional withShell caelestia-shell;
 
   SETUPTOOLS_SCM_PRETEND_VERSION = 1;
 
diff --git a/flake.lock b/flake.lock
index 8c73182..27861ab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,56 @@
         "type": "github"
       }
     },
+    "caelestia-cli": {
+      "inputs": {
+        "app2unit": [
+          "caelestia-shell",
+          "app2unit"
+        ],
+        "nixpkgs": [
+          "caelestia-shell",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752566000,
+        "narHash": "sha256-xaSDZXvZtuM+88PsmfTDWv6+VxN5cOsT/5/czsk3xgI=",
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "rev": "b1019d11924d1bc9440f457ddf94fc0d8a230ff4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "type": "github"
+      }
+    },
+    "caelestia-shell": {
+      "inputs": {
+        "app2unit": [
+          "app2unit"
+        ],
+        "caelestia-cli": "caelestia-cli",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": "quickshell"
+      },
+      "locked": {
+        "lastModified": 1752637099,
+        "narHash": "sha256-08oPnEGYkuU7Vqa4F7rOi4E9j2Drigm3DxdOA+/mgF4=",
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "rev": "19431534c954f763eb095dd131fd0b19ff74837b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1752480373,
@@ -36,9 +86,31 @@
         "type": "github"
       }
     },
+    "quickshell": {
+      "inputs": {
+        "nixpkgs": [
+          "caelestia-shell",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752631407,
+        "narHash": "sha256-dLDtKxh1VabwLxv5xbjI+oRkDyqWEKGITU+0dEaaW28=",
+        "ref": "refs/heads/master",
+        "rev": "4d8055f1cd9924bcace59405894b8879633eb83d",
+        "revCount": 638,
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
+      }
+    },
     "root": {
       "inputs": {
         "app2unit": "app2unit",
+        "caelestia-shell": "caelestia-shell",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 0e41be5..e9c4c31 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,12 @@
       url = "github:soramanew/app2unit";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    caelestia-shell = {
+      url = "github:caelestia-dots/shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.app2unit.follows = "app2unit";
+    };
   };
 
   outputs = {
@@ -26,6 +32,7 @@
       caelestia-cli = pkgs.callPackage ./default.nix {
         rev = self.rev or self.dirtyRev;
         app2unit = inputs.app2unit.packages.${pkgs.system}.default;
+        caelestia-shell = inputs.caelestia-cli.packages.${pkgs.system}.default;
       };
       default = caelestia-cli;
     });
-- 
cgit v1.2.3-freya