usr: cli: add clashctl to cachix

xieby1 · May 24, 2024 · 8eb3818 · 8eb3818
1 parent 24df5e5
commit 8eb3818
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/home.nix b/home.nix
@@ -14,7 +14,7 @@
 {
   imports = [
     ./opt.nix
-    ./modules/cachix.nix
+    ./usr/modules/cachix.nix
     ./usr/cli.nix
     # Q: how to use isGui here?
     # A: Not possible.

diff --git a/usr/cli/clash.nix b/usr/cli/clash.nix
@@ -1,9 +1,13 @@
 { config, pkgs, stdenv, lib, ... }:
-{
+let
+  clashctl = pkgs.callPackage ./clashctl.nix {};
+in {
   imports = [{
     home.packages = [
       pkgs.clash-meta
-    ] ++ lib.optional (!config.isNixOnDroid) (pkgs.callPackage ./clashctl.nix {});
+    ] ++ lib.optional (!config.isNixOnDroid) clashctl;
+    cachix_packages = lib.optional (!config.isNixOnDroid) clashctl;
+
     systemd.user.services.clash = {
       Unit = {
         Description = "Auto start clash";

diff --git a/usr/modules/cachix.nix b/usr/modules/cachix.nix
@@ -6,6 +6,6 @@
     (builtins.pathExists config.cachix_dhall) &&
     (config.cachix_packages != [])
   ) {
-    home.activation = lib.hm.dag.entryAfter ["writeBoundary"] config._cachix_push;
+    home.activation.cachix_push = lib.hm.dag.entryAfter ["writeBoundary"] config._cachix_push;
   };
 }