From 19431534c954f763eb095dd131fd0b19ff74837b Mon Sep 17 00:00:00 2001 From: Soramane <61896496+soramanew@users.noreply.github.com> Date: Wed, 16 Jul 2025 13:38:19 +1000 Subject: nix: optionally include cli update flake inputs --- default.nix | 39 ++++++++++++++++++++++----------------- flake.lock | 32 ++++++++++++++++++++++++++++---- flake.nix | 7 +++++++ 3 files changed, 57 insertions(+), 21 deletions(-) diff --git a/default.nix b/default.nix index 05c9f40..a13388a 100644 --- a/default.nix +++ b/default.nix @@ -24,24 +24,29 @@ quickshell, aubio, pipewire, + caelestia-cli, + withCli ? false, }: let - runtimeDeps = [ - fish - ddcutil - brightnessctl - app2unit - cava - networkmanager - lm_sensors - grim - swappy - wl-clipboard - libqalculate - inotify-tools - bluez - bash - hyprland - ]; + runtimeDeps = + [ + fish + ddcutil + brightnessctl + app2unit + cava + networkmanager + lm_sensors + grim + swappy + wl-clipboard + libqalculate + inotify-tools + bluez + bash + hyprland + ] + ++ lib.optional withCli caelestia-cli; + fontconfig = makeFontsConf { fontDirectories = [material-symbols]; }; diff --git a/flake.lock b/flake.lock index accd66a..81bc09a 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,29 @@ "type": "github" } }, + "caelestia-cli": { + "inputs": { + "app2unit": [ + "app2unit" + ], + "nixpkgs": [ + "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" + } + }, "nixpkgs": { "locked": { "lastModified": 1752480373, @@ -43,11 +66,11 @@ ] }, "locked": { - "lastModified": 1752486994, - "narHash": "sha256-/11zPRDdPPn61GXDyvDes9otFTP5lLqmETAtwMdeYWI=", + "lastModified": 1752631407, + "narHash": "sha256-dLDtKxh1VabwLxv5xbjI+oRkDyqWEKGITU+0dEaaW28=", "ref": "refs/heads/master", - "rev": "5ac9096c1c63f6940c6b95f1118b540dfe029278", - "revCount": 632, + "rev": "4d8055f1cd9924bcace59405894b8879633eb83d", + "revCount": 638, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -59,6 +82,7 @@ "root": { "inputs": { "app2unit": "app2unit", + "caelestia-cli": "caelestia-cli", "nixpkgs": "nixpkgs", "quickshell": "quickshell" } diff --git a/flake.nix b/flake.nix index 6a91668..a68b6fa 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,12 @@ url = "github:soramanew/app2unit"; inputs.nixpkgs.follows = "nixpkgs"; }; + + caelestia-cli = { + url = "github:caelestia-dots/cli"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.app2unit.follows = "app2unit"; + }; }; outputs = { @@ -35,6 +41,7 @@ withI3 = false; }; app2unit = inputs.app2unit.packages.${pkgs.system}.default; + caelestia-cli = inputs.caelestia-cli.packages.${pkgs.system}.default.override; }; default = caelestia-shell; }); -- cgit v1.2.3-freya