overlays: Create overlays

This commit is contained in:
2021-08-24 11:36:15 +02:00
parent e3c5c694a6
commit 669c20a354
12 changed files with 46 additions and 71 deletions

View File

@@ -1,9 +1,6 @@
{ config, pkgs, modulesPath, lib, ... }:
let
customPkgs = import ../packages/overlay.nix;
unstable = (import ../modules/unstable.nix config);
in {
{
imports = [
./generic.nix
../modules/hardware/generic.nix ../modules/hardware/bluetooth.nix ../modules/hardware/wifi.nix ../modules/hardware/video.nix ../modules/hardware/mobile.nix
@@ -15,13 +12,11 @@ in {
];
nixpkgs.overlays = [
customPkgs
# Unstable, NUR, ...
(import ../overlays/unstable.nix pkgs)
(import ../overlays/nur.nix pkgs)
(import ../overlays/custom.nix pkgs)
];
nixpkgs.config.packageOverrides = pkgs: {
nur = (import ../modules/nur.nix pkgs);
unstable = unstable;
};
environment = {
systemPackages = with pkgs; [

View File

@@ -1,9 +1,6 @@
{ config, pkgs, modulesPath, lib, ... }:
let
unstable = (import ../modules/unstable.nix config);
customPkgs = import ../packages/overlay.nix;
in {
{
imports = [
./generic.nix
../modules/hardware/generic.nix ../modules/hardware/video.nix
@@ -17,14 +14,13 @@ in {
ref = "master";
rev = "ce0e9482d53d69bedc8416d8a984d00e17607826";
}))
customPkgs
# Unstable, NUR, ...
(import ../overlays/unstable.nix pkgs)
(import ../overlays/nur.nix pkgs)
(import ../overlays/custom.nix pkgs)
];
nixpkgs.config.packageOverrides = pkgs: {
nur = (import ../modules/nur.nix pkgs);
unstable = unstable;
};
environment = {
systemPackages = with pkgs; [
emacsPgtkGcc

View File

@@ -1,8 +1,6 @@
{ config, pkgs, modulesPath, lib, fetchGit, ... }:
let
customPkgs = import ../packages/overlay.nix;
in {
{
imports = [
./generic.nix
../modules/hardware/generic.nix ../modules/hardware/video.nix ../modules/hardware/desktop.nix
@@ -80,12 +78,9 @@ in {
})
# Unstable, NUR, ...
(final: prev: {
unstable = (import ../modules/unstable.nix config);
nur = (import ../modules/nur.nix pkgs);
})
customPkgs
(import ../overlays/unstable.nix pkgs)
(import ../overlays/nur.nix pkgs)
(import ../overlays/custom.nix pkgs)
];
security = {