chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't allow just any unfree software

Browse source
This commit is contained in:
Charlotte Van Petegem 2021-01-07 18:41:42 +01:00
parent 8d10382c46
commit 8aa29e173c
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/nix.nix
View file

@ -7,9 +7,6 @@ let
enableNixDirenvIntegration = true; enableNixDirenvIntegration = true;
}; };
}; };
baseUnfree = {
xdg.configFile."nixpkgs/config.nix".source = ./nix/unfree.nix;
};
baseNixIndex = { baseNixIndex = {
home.packages = with pkgs; [ nix-index ]; home.packages = with pkgs; [ nix-index ];
programs.zsh.initExtra = '' programs.zsh.initExtra = ''
@ -87,7 +84,14 @@ in
''); '');
}; };
nixpkgs.config = lib.mkIf config.chvp.nix.enableUnfree (import ./nix/unfree.nix); nixpkgs.config = lib.mkIf config.chvp.nix.enableUnfree {
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"citrix-workspace"
"dropbox"
"teams"
"google-chrome"
];
};
nixpkgs.overlays = lib.mkIf config.chvp.nix.enableFlakes [ nixpkgs.overlays = lib.mkIf config.chvp.nix.enableFlakes [
(self: super: { (self: super: {
nix = super.nixUnstable; nix = super.nixUnstable;
@ -97,12 +101,7 @@ in
home-manager.users.charlotte = { ... }: home-manager.users.charlotte = { ... }:
lib.recursiveUpdate lib.recursiveUpdate
(lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv) (lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv)
(lib.recursiveUpdate (lib.optionalAttrs config.chvp.nix.enableNixIndex baseNixIndex);
(lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree) home-manager.users.root = { ... }: lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv;
(lib.optionalAttrs config.chvp.nix.enableNixIndex baseNixIndex));
home-manager.users.root = { ... }:
lib.recursiveUpdate
(lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv)
(lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree);
}; };
} }

1
modules/nix/unfree.nix
View file

@ -1 +0,0 @@
{ allowUnfree = true; }