Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse Source
This commit is contained in:
lassulus 2015-11-09 03:11:27 +01:00
commit 0d752ae79b
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -32,7 +32,7 @@ let stockholm = {
upath = lib.nspath current-user-name; upath = lib.nspath current-user-name;
base-module = { config, ... }: { base-module = { config, ... }: {
imports = builtins.filter builtins.pathExists (lib.concatLists [ imports = builtins.filter lib.dir.has-default-nix (lib.concatLists [
(map (f: f "2configs") [ upath ]) (map (f: f "2configs") [ upath ])
(map (f: f "3modules") [ kpath upath ]) (map (f: f "3modules") [ kpath upath ])
]); ]);

2
krebs/4lib/default.nix
View File

@ -14,6 +14,8 @@ rec {
types = import ./types.nix { inherit lib; }; types = import ./types.nix { inherit lib; };
dir.has-default-nix = path: pathExists (path + "/default.nix");
dns = import ./dns.nix { inherit lib; }; dns = import ./dns.nix { inherit lib; };
listset = import ./listset.nix { inherit lib; }; listset = import ./listset.nix { inherit lib; };
shell = import ./shell.nix { inherit lib; }; shell = import ./shell.nix { inherit lib; };

15
tv/1systems/cd.nix
View File

@ -4,23 +4,8 @@ with lib;
{ {
krebs.build.host = config.krebs.hosts.cd; krebs.build.host = config.krebs.hosts.cd;
krebs.build.user = config.krebs.users.tv;
krebs.build.target = "root@cd.internet"; krebs.build.target = "root@cd.internet";
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
path = "/home/tv/secrets/cd";
};
dir.stockholm = {
path = "/home/tv/stockholm";
};
};
imports = [ imports = [
../2configs/hw/CAC-Developer-2.nix ../2configs/hw/CAC-Developer-2.nix
../2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/fs/CAC-CentOS-7-64bit.nix