ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

moved overlay definition and made overlays more transparent

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2022-01-27 16:36:51 +01:00
parent f00500a8e6
commit 545bdf1f6e
Signed by: ellmau
GPG Key ID: C804A9C1B7AF8256
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
baseconfiguration.nix
View File

@ -1,12 +1,4 @@
{ pkgs, name, system, flakes, flakeOutputs, ...}:
let
overlay-unstable = final: prev: {
unstable = import flakes.nixpkgs-unstable {
system = "${system}";
config.allowUnfree=true;
};
};
in
{ pkgs, extraOverlays, name, flakes, flakeOutputs, ...}:
{ config, pkgs, lib, ...}:
{
imports =
@ -57,7 +49,7 @@ in
};
};
nixpkgs = {
overlays = [ flakes.emacs-overlay.overlay overlay-unstable flakeOutputs.overlay ];
overlays = [ flakes.emacs-overlay.overlay flakeOutputs.overlay ] ++ extraOverlays;
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"skypeforlinux"
"teams"

8
default.nix
View File

@ -5,9 +5,15 @@ let
name = if builtins.isString args then args else args.name;
system = if args ? system then args.system else "x86_64-linux";
extraModules = if args ? extraModules then args.extraModules else [ ];
extraOverlays = if args ? extraOverlays then args.extraOverlays else [ ];
extraOverlays = if args ? extraOverlays then args.extraOverlays else [ overlay-unstable ];
pkgs = flakes.nixpkgs;
configuration = if args ? configuration then args.configuration else import ./baseconfiguration.nix {inherit extraOverlays system pkgs name flakes flakeOutputs;} ;
overlay-unstable = final: prev: {
unstable = import flakes.nixpkgs-unstable {
system = "${system}";
config.allowUnfree=true;
};
};
in
{
inherit name;