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

move source config from module system to 1systems/*/source.nix

Browse Source
This commit is contained in:
nin 2017-07-13 23:53:54 +02:00
parent c462776406
commit 01fc0e14ef
7 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nin/1systems/hiawatha.nix → nin/1systems/hiawatha/config.nix
View File

@ -8,13 +8,13 @@ with lib;
{ {
imports = [ imports = [
../. <stockholm/nin>
<nixpkgs/nixos/modules/installer/scan/not-detected.nix> <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
../2configs/copyq.nix #../2configs/copyq.nix
../2configs/games.nix <stockholm/nin/2configs/games.nix>
../2configs/git.nix <stockholm/nin/2configs/git.nix>
../2configs/retiolum.nix <stockholm/nin/2configs/retiolum.nix>
../2configs/termite.nix <stockholm/nin/2configs/termite.nix>
]; ];
krebs.build.host = config.krebs.hosts.hiawatha; krebs.build.host = config.krebs.hosts.hiawatha;
@ -33,6 +33,11 @@ with lib;
fsType = "tmpfs"; fsType = "tmpfs";
}; };
fileSystems."/home" =
{ device = "/dev/fam/home";
};
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/2f319b08-2560-401d-b53c-2abd28f1a010"; { device = "/dev/disk/by-uuid/2f319b08-2560-401d-b53c-2abd28f1a010";
fsType = "ext2"; fsType = "ext2";

4
nin/1systems/hiawatha/source.nix Normal file
View File

@ -0,0 +1,4 @@
import <stockholm/nin/source.nix> {
name = "hiawatha";
secure = true;
}

8
nin/1systems/onondaga.nix → nin/1systems/onondaga/config.nix
View File

@ -6,11 +6,11 @@
{ {
imports = [ imports = [
../. <stockholm/nin>
<nixpkgs/nixos/modules/profiles/qemu-guest.nix> <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/retiolum.nix <stockholm/nin/2configs/retiolum.nix>
../2configs/weechat.nix <stockholm/nin/2configs/weechat.nix>
../2configs/git.nix <stockholm/nin/2configs/git.nix>
]; ];
krebs.build.host = config.krebs.hosts.onondaga; krebs.build.host = config.krebs.hosts.onondaga;

4
nin/1systems/onondaga/source.nix Normal file
View File

@ -0,0 +1,4 @@
import <stockholm/nin/source.nix> {
name = "onondaga";
secure = true;
}

9
nin/2configs/default.nix
View File

@ -3,7 +3,6 @@
with import <stockholm/lib>; with import <stockholm/lib>;
{ {
imports = [ imports = [
../2configs/nixpkgs.nix
../2configs/vim.nix ../2configs/vim.nix
{ {
users.extraUsers = users.extraUsers =
@ -62,14 +61,6 @@ with import <stockholm/lib>;
search-domain = "r"; search-domain = "r";
build = { build = {
user = config.krebs.users.nin; user = config.krebs.users.nin;
source = let inherit (config.krebs.build) host; in {
nixos-config.symlink = "stockholm/nin/1systems/${host.name}.nix";
secrets.file =
if getEnv "dummy_secrets" == "true"
then toString <stockholm/nin/6tests/dummysecrets>
else "/home/nin/secrets/${host.name}";
stockholm.file = getEnv "PWD";
};
}; };
}; };

8
nin/2configs/nixpkgs.nix
View File

@ -1,8 +0,0 @@
{ ... }:
{
krebs.build.source.nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
ref = "01c3847";
};
}

19
nin/source.nix Normal file
View File

@ -0,0 +1,19 @@
with import <stockholm/lib>;
host@{ name, secure ? false }: let
builder = if getEnv "dummy_secrets" == "true"
then "buildbot"
else "nin";
_file = <stockholm> + "/nin/1systems/${name}/source.nix";
in
evalSource (toString _file) {
nixos-config.symlink = "stockholm/nin/1systems/${name}/config.nix";
secrets.file = getAttr builder {
buildbot = toString <stockholm/nin/2configs/tests/dummy-secrets>;
nin = "/home/nin/secrets/${name}";
};
stockholm.file = toString <stockholm>;
nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
ref = "01c3847";
};
}