From f04eddf7fd7b070422611ebd90a3c17f15369ead Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 20 Sep 2024 13:09:50 -0400 Subject: Revert "treewide: use lix-module for lix" This reverts commit f77aeb0db935f60590aa5b6975857b528c8f6a51. --- modules/shared/base/nix.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'modules/shared') diff --git a/modules/shared/base/nix.nix b/modules/shared/base/nix.nix index 4a720ec..0c13276 100644 --- a/modules/shared/base/nix.nix +++ b/modules/shared/base/nix.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - inputs, ... }: let @@ -22,6 +21,8 @@ in config = lib.mkIf cfg.enable { nix = { + package = lib.mkIf cfg.lix.enable pkgs.lix; + settings = { auto-optimise-store = pkgs.stdenv.isLinux; experimental-features = @@ -48,9 +49,6 @@ in }; }; - nixpkgs = { - config.allowUnfree = lib.mkDefault true; - overlays = lib.mkIf cfg.lix.enable [ inputs.lix-module.overlays.lixFromNixpkgs ]; - }; + nixpkgs.config.allowUnfree = lib.mkDefault true; }; } -- cgit v1.2.3