summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-07-29 01:07:41 +0200
committermakefu <github@syntax-fehler.de>2015-07-29 01:07:41 +0200
commit9575e56d6980cd9770befce5605eabd290ca5dbb (patch)
tree990f3149e39481ff3ec4de9b7d7d9e6c9458aa67
parentf7e206b608a2844c4e81173a673369402f8da06b (diff)
update paths in makefu cfg
-rw-r--r--makefu/1systems/pnp.nix4
-rw-r--r--makefu/2configs/base.nix1
-rw-r--r--makefu/2configs/cgit-retiolum.nix4
3 files changed, 5 insertions, 4 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 1019c4d70..e28c82938 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -8,8 +8,8 @@
imports =
[ # Include the results of the hardware scan.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
- ../../2configs/makefu/base.nix
- ../../2configs/makefu/cgit-retiolum.nix
+ ../2configs/base.nix
+ ../2configs/cgit-retiolum.nix
];
krebs.build.host = config.krebs.hosts.pnp;
diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index b052b13e4..8dfb2ef27 100644
--- a/makefu/2configs/base.nix
+++ b/makefu/2configs/base.nix
@@ -39,6 +39,7 @@ with lib;
'';
environment.systemPackages = with pkgs; [
+ jq
git
vim
gnumake
diff --git a/makefu/2configs/cgit-retiolum.nix b/makefu/2configs/cgit-retiolum.nix
index 7b8e3bc97..e10769335 100644
--- a/makefu/2configs/cgit-retiolum.nix
+++ b/makefu/2configs/cgit-retiolum.nix
@@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }:
# TODO: remove tv lib :)
-with import ../../4lib/tv { inherit lib pkgs; };
+with import ../../tv/4lib/{ inherit lib pkgs; };
let
out = {
- imports = [ ../../3modules/krebs/git.nix ];
+ imports = [ ];
krebs.git = {
enable = true;
root-title = "public repositories ";