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

[Packages+Overlays] Move several package overrides in overlays

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

12
desktop.nix
View file

@ -202,9 +202,7 @@ in {
yakuake yakuake
pinentry-qt pinentry-qt
plasma-pa plasma-pa
( ark.override { ark
unfreeEnableUnrar = true;
} )
p7zip p7zip
vlc vlc
skanlite skanlite
@ -215,13 +213,13 @@ in {
korganizer korganizer
]; ];
services.packagekit.enable = true;
aviallon.programs.allowUnfreeList = [ aviallon.programs.allowUnfreeList = [
"unrar" "spotify"
"ark" "spotify-unwrapped"
]; ];
services.packagekit.enable = true;
networking.networkmanager = { networking.networkmanager = {
packages = [ packages = [
pkgs.networkmanager-openvpn pkgs.networkmanager-openvpn

23
overlays.nix
View file

@ -3,6 +3,13 @@ with lib;
let let
cfg = config.aviallon.overlays; cfg = config.aviallon.overlays;
unstable = import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz") { config = config.nixpkgs.config; }; unstable = import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz") { config = config.nixpkgs.config; };
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 "${getName pkg}: ${toString config.aviallon.programs.compileFlags}" config.aviallon.programs.compileFlags);
in in
{ {
options.aviallon.overlays = { options.aviallon.overlays = {
@ -25,12 +32,26 @@ in
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
inherit unstable; inherit unstable;
}) })
(self: super: {
opensshOptimized = optimizeForThisHost super.openssh;
rsyncOptimized = optimizeForThisHost super.rsync;
nano = optimizeForThisHost super.nano;
veracrypt = optimizeForThisHost pkgs.veracrypt;
steam = super.steam.override {
withJava = true;
};
ark = optimizeForThisHost (super.ark.override {
unfreeEnableUnrar = true;
});
})
# (self: super: { # (self: super: {
# nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { # nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
# inherit pkgs; # inherit pkgs;
# }; # };
# }) # })
]; ];
aviallon.programs.allowUnfreeList = [ "unrar" "ark" ];
}; };
} }

25
packages.nix
View file

@ -5,19 +5,13 @@ let
desktopCfg = config.aviallon.desktop; desktopCfg = config.aviallon.desktop;
generalCfg = config.aviallon.general; 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 in
{ {
imports = [ imports = [
./programs/nano.nix ./programs/nano.nix
./programs/git.nix ./programs/git.nix
./programs/htop.nix ./programs/htop.nix
./overlays.nix
]; ];
options.aviallon.programs = { options.aviallon.programs = {
@ -45,23 +39,6 @@ in
programs.java.enable = true; 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; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) cfg.allowUnfreeList;
environment.systemPackages = with pkgs; with libsForQt5; [ environment.systemPackages = with pkgs; with libsForQt5; [