Update to nix-only build and user-toplevel

pnp now contains information about the target

2 files changed, 25 insertions, 11 deletions

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index e28c82938..4c4ce716f 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -12,6 +12,21 @@
       ../2configs/cgit-retiolum.nix
     ];
   krebs.build.host = config.krebs.hosts.pnp;
+  krebs.build.user = config.krebs.users.makefu;
+  krebs.build.target = "root@pnp";
+
+  krebs.build.deps = {
+    nixpkgs = {
+      url = https://github.com/NixOS/nixpkgs;
+      rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
+    };
+    secrets = {
+      url = "/home/makefu/secrets/${config.krebs.build.host.name}";
+    };
+    stockholm = {
+      url = toString ../..;
+    };
+  };
 
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
diff --git a/makefu/2configs/cgit-retiolum.nix b/makefu/2configs/cgit-retiolum.nix
index e10769335..777c16cfb 100644
--- a/makefu/2configs/cgit-retiolum.nix
+++ b/makefu/2configs/cgit-retiolum.nix
@@ -1,17 +1,8 @@
 { config, lib, pkgs, ... }:
 # TODO: remove tv lib :)
-with import ../../tv/4lib/{ inherit lib pkgs; };
+with import ../../tv/4lib { inherit lib pkgs; };
 let
 
-  out = {
-    imports = [ ];
-    krebs.git = {
-      enable = true;
-      root-title = "public repositories ";
-      root-desc = "keep on krebsing";
-      inherit repos rules;
-    };
-  };
   repos = priv-repos // krebs-repos ;
   rules = concatMap krebs-rules (attrValues krebs-repos) ++ concatMap priv-rules (attrValues priv-repos);
 
@@ -67,4 +58,12 @@ let
   krebs-rules = with config.krebs.users; repo:
     set-owners repo [ makefu ] ++ set-ro-access repo krebsminister ;
 
-in out
+in {
+  imports = [ ../../3modules/krebs/git.nix ];
+  krebs.git = {
+    enable = true;
+    root-title = "public repositories ";
+    root-desc = "keep on krebsing";
+    inherit repos rules;
+  };
+}