update commits, remove cliHEADmain

4 files changed, 12 insertions, 74 deletions

diff --git a/flake.lock b/flake.lock
index 14b45df..ae51d11 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,33 +1,12 @@
 {
   "nodes": {
-    "caelestia-cli": {
-      "inputs": {
-        "caelestia-shell": [],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1767905196,
-        "narHash": "sha256-72Z9vz1dq9FtLc7rjU9GwErUNmKZd6ZBIX1tUznwq7U=",
-        "ref": "refs/heads/main",
-        "rev": "8056a87db5c2f6a8df23f2b6b1867471e2b8995d",
-        "revCount": 419,
-        "type": "git",
-        "url": "https://g.freya.cat/caelestia-cli"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://g.freya.cat/caelestia-cli"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773389992,
-        "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
+        "lastModified": 1779560665,
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {
@@ -44,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773648506,
-        "narHash": "sha256-uVdqQIOzmMcHy1bUyF5NdZ3T5f1/5OVSNx3nIoXV6Os=",
+        "lastModified": 1779430452,
+        "narHash": "sha256-zTslhsxLqUlRTML506iougTGzyR38Fzhzn7t4KDEuuE=",
         "ref": "refs/heads/master",
-        "rev": "6705e2da778d216e81dbdc3764a3f50e89bfd87d",
-        "revCount": 761,
+        "rev": "4b4fca3224ab977dc515ac0bb78d00b3dfa71e00",
+        "revCount": 819,
         "type": "git",
         "url": "https://git.outfoxxed.me/quickshell/quickshell"
       },
@@ -59,7 +38,6 @@
     },
     "root": {
       "inputs": {
-        "caelestia-cli": "caelestia-cli",
         "nixpkgs": "nixpkgs",
         "quickshell": "quickshell"
       }
diff --git a/flake.nix b/flake.nix
index 76ed57b..a8ed038 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,12 +8,6 @@
       url = "git+https://git.outfoxxed.me/quickshell/quickshell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    caelestia-cli = {
-      url = "git+https://g.freya.cat/caelestia-cli";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.caelestia-shell.follows = "";
-    };
   };
 
   outputs = {
@@ -36,9 +30,7 @@
           withX11 = false;
           withI3 = false;
         };
-        caelestia-cli = inputs.caelestia-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
       };
-      with-cli = caelestia-shell.override {withCli = true;};
       debug = caelestia-shell.override {debug = true;};
       default = caelestia-shell;
     });
diff --git a/nix/default.nix b/nix/default.nix
index 80dc92f..fdb4f31 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -20,9 +20,7 @@
   cmake,
   ninja,
   pkg-config,
-  caelestia-cli,
   debug ? false,
-  withCli ? false,
   extraRuntimeDeps ? [],
 }: let
   version = "1.0.0";
@@ -36,8 +34,7 @@
       wl-clipboard
       hyprland
     ]
-    ++ extraRuntimeDeps
-    ++ lib.optional withCli caelestia-cli;
+    ++ extraRuntimeDeps;
 
   fontconfig = makeFontsConf {
     fontDirectories = [material-symbols rubik nerd-fonts.caskaydia-cove];
diff --git a/nix/hm-module.nix b/nix/hm-module.nix
index 2976cf6..1b9f1ea 100644
--- a/nix/hm-module.nix
+++ b/nix/hm-module.nix
@@ -5,10 +5,6 @@ self: {
   ...
 }: let
   inherit (pkgs.stdenv.hostPlatform) system;
-
-  cli-default = self.inputs.caelestia-cli.packages.${system}.default;
-  shell-default = self.packages.${system}.with-cli;
-
   cfg = config.programs.caelestia;
 in {
   imports = [
@@ -19,7 +15,7 @@ in {
       enable = mkEnableOption "Enable Caelestia shell";
       package = mkOption {
         type = types.package;
-        default = shell-default;
+        default = self.packages.${system}.default;
         description = "The package of Caelestia shell";
       };
       systemd = {
@@ -54,32 +50,10 @@ in {
         default = "";
         description = "Caelestia shell extra configs written to shell.json";
       };
-      cli = {
-        enable = mkEnableOption "Enable Caelestia CLI";
-        package = mkOption {
-          type = types.package;
-          default = cli-default;
-          description = "The package of Caelestia CLI"; # Doesn't override the shell's CLI, only change from home.packages
-        };
-        settings = mkOption {
-          type = types.attrsOf types.anything;
-          default = {};
-          description = "Caelestia CLI settings";
-        };
-        extraConfig = mkOption {
-          type = types.str;
-          default = "";
-          description = "Caelestia CLI extra configs written to cli.json";
-        };
-      };
     };
   };
 
-  config = let
-    cli = cfg.cli.package;
-    shell = cfg.package;
-  in
-    lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
       systemd.user.services.caelestia = lib.mkIf cfg.systemd.enable {
         Unit = {
           Description = "Caelestia Shell Service";
@@ -92,7 +66,7 @@ in {
 
         Service = {
           Type = "exec";
-          ExecStart = "${shell}/bin/caelestia-shell";
+          ExecStart = "${cfg.package}/bin/caelestia-shell";
           Restart = "on-failure";
           RestartSec = "5s";
           TimeoutStopSec = "5s";
@@ -126,11 +100,8 @@ in {
         "caelestia/shell.json" = lib.mkIf (shouldGenerate cfg) {
           text = mkConfig cfg;
         };
-        "caelestia/cli.json" = lib.mkIf (shouldGenerate cfg.cli) {
-          text = mkConfig cfg.cli;
-        };
       };
 
-      home.packages = [shell] ++ lib.optional cfg.cli.enable cli;
+      home.packages = [ cfg.package ];
     };
 }