diff --git a/base/common_hardware.nix b/base/common_hardware.nix index e63eb76..07f0b88 100644 --- a/base/common_hardware.nix +++ b/base/common_hardware.nix @@ -91,7 +91,8 @@ in # Enable sound with pipewire. hardware = { pulseaudio.enable = false; - cpu.${config.conf.cpu}.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + cpu.${config.conf.cpu}.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; }; security.rtkit.enable = true; diff --git a/flake.nix b/flake.nix index 3f12f65..2c2b320 100644 --- a/flake.nix +++ b/flake.nix @@ -54,10 +54,28 @@ outputs = { self, ... }@inputs: let + permittedPackages = [ + "olm-3.2.16" + # well done dotnet... + # this is just for omnisharp + "dotnet-core-combined" + "dotnet-wrapped-combined" + "dotnet-combined" + "dotnet-sdk-6.0.428" + "dotnet-sdk-wrapped-6.0.428" + "dotnet-sdk-6.0.136" + "dotnet-sdk-wrapped-6.0.136" + "dotnet-sdk-7.0.120" + "dotnet-sdk-wrapped-7.0.120" + "dotnet-sdk-7.0.410" + "dotnet-sdk-wrapped-7.0.410" + "jitsi-meet-1.0.8043" + ]; stable = import inputs.stable { system = "x86_64-linux"; config = { allowUnfree = true; + permittedInsecurePackages = permittedPackages; }; }; pkgs = import inputs.nixpkgs { @@ -65,33 +83,23 @@ overlays = [ inputs.nur.overlays.default ]; config = { allowUnsupportedSystem = true; - permittedInsecurePackages = [ - "olm-3.2.16" - # well done dotnet... - # this is just for omnisharp - "dotnet-core-combined" - "dotnet-wrapped-combined" - "dotnet-combined" - "dotnet-sdk-6.0.428" - "dotnet-sdk-wrapped-6.0.428" - "dotnet-sdk-6.0.136" - "dotnet-sdk-wrapped-6.0.136" - "dotnet-sdk-7.0.120" - "dotnet-sdk-wrapped-7.0.120" - "dotnet-sdk-7.0.410" - "dotnet-sdk-wrapped-7.0.410" - ]; + permittedInsecurePackages = permittedPackages; allowUnfree = true; }; }; in rec { dashNixLib = import ./lib { - inherit self inputs pkgs; + inherit + self + inputs + pkgs + stable + ; lib = inputs.nixpkgs.lib; }; docs = import ./docs { - inherit inputs pkgs; + inherit inputs pkgs stable; lib = inputs.nixpkgs.lib; build_systems = dashNixLib.build_systems; }; diff --git a/lib/default.nix b/lib/default.nix index f2bdc8b..8bad291 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -2,6 +2,7 @@ inputs, pkgs, self, + stable, lib, ... }: @@ -68,7 +69,6 @@ }, additionalInputs ? { }, overridePkgs ? false, - pkgOverrides ? pkgs, ... }: builtins.listToAttrs ( @@ -90,7 +90,8 @@ additionalHomeConfig root ; - pkgs = if overridePkgs then pkgs else pkgOverrides; + pkgs = if overridePkgs then pkgs else stable; + alternativePkgs = if overridePkgs then stable else pkgs; hostName = name; homeMods = mods.home; additionalHomeMods = additionalMods.home;