From 645c8cfbf08bb54d54636d150e723e0004855b65 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Wed, 6 Nov 2024 16:28:22 +0100 Subject: [PATCH] system: remove nix import from core to system/default.nix --- system/core/default.nix | 1 - system/default.nix | 1 + system/nix/nixpkgs.nix | 16 +++++----------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/system/core/default.nix b/system/core/default.nix index 5e70f1f..fd481b2 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -4,7 +4,6 @@ ./users.nix ./security.nix ./networking.nix - ../nix ]; i18n = { defaultLocale = "en_US.UTF-8"; diff --git a/system/default.nix b/system/default.nix index c66a623..48a6962 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,6 +1,7 @@ { imports = [ ./core + ./nix ./hardware/printing.nix ./hardware/fwupd.nix diff --git a/system/nix/nixpkgs.nix b/system/nix/nixpkgs.nix index da6bc52..e47634f 100644 --- a/system/nix/nixpkgs.nix +++ b/system/nix/nixpkgs.nix @@ -1,18 +1,12 @@ _: { nixpkgs = { - overlays = [ - (_: prev: { - lib = - prev.lib - // import ../../lib { - inherit (prev) lib pkgs; - }; - }) - ]; - config = { allowUnfree = true; - permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2" "segger-jlink-qt4-796s" "openssl-1.1.1w"]; + permittedInsecurePackages = [ + "cinny-4.2.2" + "cinny-unwrapped-4.2.2" + "segger-jlink-qt4-796s" + ]; segger-jlink.acceptLicense = true; }; };