diff options
author | makefu <github@syntax-fehler.de> | 2015-11-06 23:54:27 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-11-06 23:54:27 +0100 |
commit | b630a10e40506b45e29558afb5729b4241369e7b (patch) | |
tree | 36984a9577021da0a64bfc4c6beba5ddeabad18b /2configs | |
parent | e53b817438488046d9f9301f1a3838b4c69cfbe4 (diff) |
m 2: base -> default, rm base-sources
Diffstat (limited to '2configs')
-rw-r--r-- | 2configs/base-sources.nix | 21 | ||||
-rw-r--r-- | 2configs/default.nix (renamed from 2configs/base.nix) | 33 | ||||
-rw-r--r-- | 2configs/unstable-sources.nix | 16 |
3 files changed, 32 insertions, 38 deletions
diff --git a/2configs/base-sources.nix b/2configs/base-sources.nix deleted file mode 100644 index 65c6e8e76..000000000 --- a/2configs/base-sources.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - system.stateVersion = "15.09"; - krebs.build.source = { - git.nixpkgs = { - #url = https://github.com/NixOS/nixpkgs; - url = https://github.com/makefu/nixpkgs; - rev = "78340b042463fd35caa587b0db2e400e5666dbe1"; # nixos-15.09 + cherry-picked iodine - }; - - dir.secrets = { - host = config.krebs.hosts.pornocauster; - path = "/home/makefu/secrets/${config.krebs.build.host.name}/"; - }; - dir.stockholm = { - host = config.krebs.hosts.pornocauster; - path = toString ../.. ; - }; - }; -} diff --git a/2configs/base.nix b/2configs/default.nix index 4e38c27f8..3d9174788 100644 --- a/2configs/base.nix +++ b/2configs/default.nix @@ -2,6 +2,8 @@ with lib; { + system.stateVersion = "15.09"; + imports = [ { users.extraUsers = @@ -10,10 +12,36 @@ with lib; } ./vim.nix ]; - krebs.enable = true; - krebs.search-domain = "retiolum"; + krebs = { + enable = true; + search-domain = "retiolum"; + build = { + target = mkDefault "root@${config.krebs.build.host.name}"; + user = config.krebs.users.makefu; + source = { + git.nixpkgs = { + #url = https://github.com/NixOS/nixpkgs; + url = mkDefault https://github.com/makefu/nixpkgs; + rev = mkDefault "78340b042463fd35caa587b0db2e400e5666dbe1"; # nixos-15.09 + cherry-picking + target-path = "/var/src/nixpkgs"; + }; + + dir.secrets = { + host = config.krebs.hosts.pornocauster; + path = "/home/makefu/secrets/${config.krebs.build.host.name}/"; + }; + + dir.stockholm = { + host = config.krebs.hosts.pornocauster; + path = "/home/makefu/stockholm" ; + target-path = "/var/src/stockholm"; + }; + }; + }; + }; + users.extraUsers = { root = { openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ]; @@ -56,7 +84,6 @@ with lib; environment.systemPackages = with pkgs; [ jq git - vim gnumake rxvt_unicode.terminfo htop diff --git a/2configs/unstable-sources.nix b/2configs/unstable-sources.nix index 7bd5f50cb..7a9a8a81c 100644 --- a/2configs/unstable-sources.nix +++ b/2configs/unstable-sources.nix @@ -1,20 +1,8 @@ -{ config, lib, pkgs, ... }: +_: { - system.stateVersion = "15.09"; - krebs.build.source = { - git.nixpkgs = { + krebs.build.source.git.nixpkgs = { url = https://github.com/makefu/nixpkgs; rev = "15b5bbfbd1c8a55e7d9e05dd9058dc102fac04fe"; # cherry-picked collectd }; - - dir.secrets = { - host = config.krebs.hosts.pornocauster; - path = "/home/makefu/secrets/${config.krebs.build.host.name}/"; - }; - dir.stockholm = { - host = config.krebs.hosts.pornocauster; - path = toString ../.. ; - }; - }; } |