aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Packages] fix issues with newer flake-utils-plus versions overriding nixpkgs.pkgs

Browse source 
Will probably drop flake-utils-plus in the future because of that.
This commit is contained in:
Antoine Viallon 2024-01-10 22:10:20 +01:00
parent b2e758f4c8
commit 0e3649ddee
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -49,6 +49,8 @@
default = aviallon; default = aviallon;
}; };
nixpkgsConfig = self.nixosModules.aviallon.aviallon.programs.config;
specialArgs = inputs // { inherit myLib; }; specialArgs = inputs // { inherit myLib; };
}; };
} }

2
hardware/amd/amdgpu.nix
View file

@ -28,7 +28,7 @@ in {
] ]
; ;
nixpkgs.config.rocmSupport = mkDefault devCfg.enable; aviallon.programs.config.rocmSupport = mkDefault devCfg.enable;
services.xserver.videoDrivers = [] services.xserver.videoDrivers = []
++ optional cfg.useProprietary "amdgpu-pro" ++ optional cfg.useProprietary "amdgpu-pro"

10
packages.nix
View file

@ -27,13 +27,19 @@ in
description = "Allow specific unfree software to be installed"; description = "Allow specific unfree software to be installed";
type = types.listOf types.str; type = types.listOf types.str;
}; };
config = mkOption {
default = {};
type = types.attrs;
example = { cudaSupport = true; };
description = "nixpkgs config settings to be applied to all nixpkgs instances";
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.java.enable = mkDefault (!generalCfg.minimal); programs.java.enable = mkDefault (!generalCfg.minimal);
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList; aviallon.programs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
environment.systemPackages = with pkgs; [] environment.systemPackages = with pkgs; []
++ [ ++ [
@ -70,8 +76,6 @@ in
newSession = true; newSession = true;
}; };
aviallon.programs.allowUnfreeList = [];
programs.ccache.enable = true; programs.ccache.enable = true;
nix.settings.extra-sandbox-paths = [ nix.settings.extra-sandbox-paths = [