switch to standard nix avoid lix build failures and reduces maintenance burden
3 files changed, 0 insertions(+), 19 deletions(-)
D shared/lix.nix
@@ -1,8 +0,0 @@ -{ pkgs, ... }: -let - useLix = true; - # nix eval --inputs-from . nixpkgs#lixPackageSets --apply builtins.attrNames --json - lixPkgs = if pkgs.stdenv.isDarwin then pkgs.lixPackageSets.latest else pkgs.lixPackageSets.stable; -in -# enables switching all lix/nix dependencies at once -if useLix then lixPkgs else pkgs
M system/settings/configuration/nix.nix → system/settings/configuration/nix.nix
@@ -7,12 +7,9 @@ let kb = 1000; mb = 1000 * kb; gb = 1000 * mb; - - lixPackageSet = import ../../../shared/lix.nix { inherit pkgs; }; in { nix = { - package = lixPackageSet.lix; distributedBuilds = lib.mkDefault true; settings = {@@ -29,13 +26,11 @@ fallback = true; substituters = [ "https://nix-community.cachix.org" - "https://cache.lix.systems" "https://binarycache.alin.ovh" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "binarycache.alin.ovh:ZwqO3XMuajPictjwih8OY2+RXnOKpjZEZFHJjGSxAI4=" - "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ]; experimental-features = [
M user/settings/nix.nix → user/settings/nix.nix
@@ -2,17 +2,11 @@ { pkgs, ... }: -let - lixPackageSet = import ../../shared/lix.nix { inherit pkgs; }; -in { nixpkgs.config = import ../config.nix; nix = { - # needed for "standalone" home-manager, conflicts with module - package = lixPackageSet.lix; assumeXdg = true; }; - programs.direnv.nix-direnv.package = lixPackageSet.nix-direnv; programs.nh = { enable = true;