diff --git a/common/os/lix.nix b/common/os/lix.nix index 3d4ddaa..7e4d927 100644 --- a/common/os/lix.nix +++ b/common/os/lix.nix @@ -5,25 +5,30 @@ lib, ... }: -lib.mkMerge [ - { - nixpkgs.overlays = [ - (final: prev: { - inherit (prev.lixPackageSets.stable) - nixpkgs-review - nix-eval-jobs - nix-fast-build - colmena - ; - }) - ]; - } - (lib.mkIf config.nix.monitored.enable { - nix.monitored = { - package = pkgs.nix-monitored.override { - nix = pkgs.lixPackageSets.stable.lix; +let + enableLix = false; +in +lib.mkIf enableLix ( + lib.mkMerge [ + { + nixpkgs.overlays = [ + (final: prev: { + inherit (prev.lixPackageSets.stable) + nixpkgs-review + nix-eval-jobs + nix-fast-build + colmena + ; + }) + ]; + } + (lib.mkIf config.nix.monitored.enable { + nix.monitored = { + package = pkgs.nix-monitored.override { + nix = pkgs.lixPackageSets.stable.lix; + }; }; - }; - }) - (lib.mkIf (!config.nix.monitored.enable) { nix.package = pkgs.lixPackageSets.stable.lix; }) -] + }) + (lib.mkIf (!config.nix.monitored.enable) { nix.package = pkgs.lixPackageSets.stable.lix; }) + ] +) diff --git a/flake.lock b/flake.lock index 8df873d..b09db5e 100644 --- a/flake.lock +++ b/flake.lock @@ -424,15 +424,15 @@ "locked": { "lastModified": 1786116588, "narHash": "sha256-umh83wRIobnUQmvxwdBXJALmBhGtmTZEgebJfHi0aoQ=", - "owner": "Mop-u", - "repo": "moppkgs", + "ref": "refs/heads/main", "rev": "4c8511e9b44fa01cb33e5e1fd363e6fc9076da4e", - "type": "github" + "revCount": 47, + "type": "git", + "url": "https://tangled.org/moppu.dev/moppkgs" }, "original": { - "owner": "Mop-u", - "repo": "moppkgs", - "type": "github" + "type": "git", + "url": "https://tangled.org/moppu.dev/moppkgs" } }, "niri": { @@ -932,11 +932,11 @@ "rev": "c0a8d0db4853aab4f44edd292e2205ad6c87c08e", "revCount": 466, "type": "git", - "url": "https://tangled.org/did:plc:myvr5hsmvqsslk6xgrrubn4e" + "url": "https://tangled.org/moppu.dev/sidonia" }, "original": { "type": "git", - "url": "https://tangled.org/did:plc:myvr5hsmvqsslk6xgrrubn4e" + "url": "https://tangled.org/moppu.dev/sidonia" } }, "sops-nix": { @@ -1129,11 +1129,11 @@ "rev": "1b2a86c0465a2db029fb3d1bcfccf78f2e1bf3a6", "revCount": 3098, "type": "git", - "url": "https://tangled.org/@tangled.org/core" + "url": "https://tangled.org/tangled.org/core" }, "original": { "type": "git", - "url": "https://tangled.org/@tangled.org/core" + "url": "https://tangled.org/tangled.org/core" } }, "treefmt-nix": {