Rename overlay
This commit is contained in:
parent
90baba3e1b
commit
c12598ee3c
14
cachix.nix
14
cachix.nix
|
@ -1,14 +0,0 @@
|
|||
|
||||
# WARN: this file will get overwritten by $ cachix use <name>
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
folder = ./cachix;
|
||||
toImport = name: value: folder + ("/" + name);
|
||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
||||
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||
in {
|
||||
inherit imports;
|
||||
nix.binaryCaches = ["https://cache.nixos.org/"];
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
|
||||
{
|
||||
nix = {
|
||||
binaryCaches = [
|
||||
"https://hercules-ci.cachix.org"
|
||||
];
|
||||
binaryCachePublicKeys = [
|
||||
"hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ in {
|
|||
./mpclient.nix
|
||||
./neovim
|
||||
];
|
||||
nixpkgs.overlays = import ../overlays.nix { inherit lib; };
|
||||
nixpkgs.overlays = import ../overlays { inherit lib; };
|
||||
|
||||
programs = {
|
||||
home-manager.enable = true;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
inherit (pkgs.xorg) xev;
|
||||
inherit (pkgs.gitAndTools) hub;
|
||||
inherit (pkgs)
|
||||
meld icedtea8_web octave filezilla cachix nix-review gparted
|
||||
meld icedtea8_web octave filezilla nix-review gparted
|
||||
grafana-devel;
|
||||
};
|
||||
}
|
||||
|
|
11
overlays.nix
11
overlays.nix
|
@ -1,11 +0,0 @@
|
|||
{ lib }:
|
||||
let
|
||||
overlayPath = ./overlays;
|
||||
candidates = lib.attrNames (builtins.readDir overlayPath);
|
||||
pathToOverlay = n: overlayPath + ("/" + n);
|
||||
isNixFile = n: builtins.match ".*\\.nix" n != null;
|
||||
isNixDir = n: builtins.pathExists (pathToOverlay n + "/default.nix");
|
||||
isOverlay = n: isNixDir n || isNixFile n;
|
||||
overlays = builtins.filter isOverlay candidates;
|
||||
importOverlay = n: import (pathToOverlay n);
|
||||
in map importOverlay overlays
|
|
@ -2,7 +2,6 @@
|
|||
let me = config.m-0.private.me;
|
||||
in {
|
||||
imports = [
|
||||
../cachix.nix
|
||||
../common
|
||||
./modules/laptop.nix
|
||||
./modules/loginctl-linger.nix
|
||||
|
@ -11,7 +10,7 @@ in {
|
|||
i18n = { defaultLocale = "en_US.UTF-8"; };
|
||||
|
||||
# For nixos-rebuild
|
||||
nixpkgs.overlays = import ../overlays.nix { inherit lib; };
|
||||
nixpkgs.overlays = import ../overlays { inherit lib; };
|
||||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
|
|
Loading…
Reference in a new issue