diff options
author | makefu <github@syntax-fehler.de> | 2017-06-01 10:08:56 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-06-01 10:08:56 +0200 |
commit | f4daa30033313221303ebc7a2e4aeb83a090987e (patch) | |
tree | 35c1e003dccef2d11cf945b60522b456ae878aba | |
parent | a19e4c630d187de61ccc12832ebf5e251204c315 (diff) | |
parent | ee5fdf7a55b517afcf9cdc1223a4d212592ab9a2 (diff) |
Merge remote-tracking branch 'lass/master'
-rw-r--r-- | lib/types.nix | 7 | ||||
-rw-r--r-- | nin/2configs/default.nix | 2 | ||||
-rw-r--r-- | nin/2configs/nixpkgs.nix | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/lib/types.nix b/lib/types.nix index 30de5e1..530cd1e 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -31,6 +31,13 @@ rec { default = null; }; + managed = mkOption { + description = '' + If true, then the host's configuration is defined in stockholm. + ''; + type = bool; + }; + owner = mkOption { type = user; }; diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix index a1ed76d..cb02521 100644 --- a/nin/2configs/default.nix +++ b/nin/2configs/default.nix @@ -59,7 +59,7 @@ with import <stockholm/lib>; krebs = { enable = true; - search-domain = "retiolum"; + search-domain = "r"; build = { user = config.krebs.users.nin; source = let inherit (config.krebs.build) host; in { diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix index 9c3eaff..14ddb79 100644 --- a/nin/2configs/nixpkgs.nix +++ b/nin/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "5b0c9d4"; + ref = "0afb6d7"; }; } |