diff options
| author | Alejandro Soto <alejandro@34project.org> | 2022-12-28 18:30:43 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2022-12-28 18:45:03 -0600 |
| commit | e508b2b5d7c7e3504bb5e8ff33fd3bbfc006f9ef (patch) | |
| tree | 8b575f860890e2e77d5a3146558b628e4b2b91e1 | |
| parent | ccbd359a8f9089a1e7a9566fdca62e26a2bb447c (diff) | |
flake: move nixpkgs config to pkgs/config
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | home/path.nix | 9 | ||||
| -rw-r--r-- | pkgs/config/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/config/unfree.nix | 1 | ||||
| -rw-r--r-- | sys/default.nix | 4 |
5 files changed, 8 insertions, 12 deletions
@@ -24,7 +24,7 @@ importPkgs = flake: import flake { inherit system; - config.android_sdk.accept_license = true; + config = import ./pkgs/config nixpkgs.lib; overlays = [ nur.overlay ]; }; diff --git a/home/path.nix b/home/path.nix index 152091d..ca76cfb 100644 --- a/home/path.nix +++ b/home/path.nix @@ -44,13 +44,4 @@ with lib; { pkgs.xsel pkgs.zoom-us ]; - - nixpkgs.config.allowUnfreePredicate = pkg: elem (getName pkg) [ - "anydesk" - "mssql-tools" - "quartus-prime-lite-unwrapped" - "tools" # androidsdk - "teams" - "zoom" - ]; } diff --git a/pkgs/config/default.nix b/pkgs/config/default.nix new file mode 100644 index 0000000..6787b5e --- /dev/null +++ b/pkgs/config/default.nix @@ -0,0 +1,4 @@ +lib: with lib; { + android_sdk.accept_license = true; + allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg); +} diff --git a/pkgs/config/unfree.nix b/pkgs/config/unfree.nix new file mode 100644 index 0000000..1bb3788 --- /dev/null +++ b/pkgs/config/unfree.nix @@ -0,0 +1 @@ +# This file has been lustrated. diff --git a/sys/default.nix b/sys/default.nix index 47203f9..228c126 100644 --- a/sys/default.nix +++ b/sys/default.nix @@ -21,11 +21,11 @@ with lib; { nix = { package = pkgs.nixFlakes; extraOptions = '' - experimental-features = nix-command flakes + experimental-features = nix-command flakes repl-flake ''; }; - # shenvs necesita systemd 251 + # hm-isolation necesita systemd 251 systemd = mkIf (config.system.nixos.release == "22.05") { package = pkgs.unstable.systemd; }; |
