[Packages+Overlays] Move several package overrides in overlays

Makes them available for everyone and everything.
Add Veracrypt

Signed-off-by: Antoine Viallon <antoine@lesviallon.fr>
This commit is contained in:
Antoine Viallon 2022-03-25 03:01:37 +01:00
parent 6771dd826f
commit e462306e6e
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
3 changed files with 28 additions and 32 deletions

View file

@ -5,19 +5,13 @@ let
desktopCfg = config.aviallon.desktop;
generalCfg = config.aviallon.general;
optimizeWithFlag = pkg: flag:
pkg.overrideAttrs (attrs: {
NIX_CFLAGS_COMPILE = (attrs.NIX_CFLAGS_COMPILE or "") + " ${flag}";
doCheck = false;
});
optimizeWithFlags = pkg: flags: pkgs.lib.foldl' (pkg: flag: optimizeWithFlag pkg flag) pkg flags;
optimizeForThisHost = pkg: optimizeWithFlags pkg (builtins.trace "${toString config.aviallon.programs.compileFlags}" config.aviallon.programs.compileFlags);
in
{
imports = [
./programs/nano.nix
./programs/git.nix
./programs/htop.nix
./overlays.nix
];
options.aviallon.programs = {
@ -45,23 +39,6 @@ in
programs.java.enable = true;
nixpkgs.config.packageOverrides = pkgs: {
nano = optimizeForThisHost pkgs.nano;
rsyncOptimized = optimizeForThisHost pkgs.rsync;
opensshOptimized = optimizeForThisHost pkgs.openssh;
steam = pkgs.steam.override {
withJava = true;
};
veracrypt = optimizeForThisHost pkgs.veracrypt;
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
inherit pkgs;
};
};
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
environment.systemPackages = with pkgs; with libsForQt5; [