From 0b00e7e70eefd3b22b65a29506003bd984dfb6f2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 28 Jul 2015 20:19:54 +0200
Subject: makefu:rename to user-toplevel structure

---
 makefu/1systems/pnp.nix | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 makefu/1systems/pnp.nix

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
new file mode 100644
index 000000000..1019c4d70
--- /dev/null
+++ b/makefu/1systems/pnp.nix
@@ -0,0 +1,47 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+      ../../2configs/makefu/base.nix
+      ../../2configs/makefu/cgit-retiolum.nix
+    ];
+  krebs.build.host = config.krebs.hosts.pnp;
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  boot.loader.grub.device = "/dev/vda";
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+  hardware.enableAllFirmware = true;
+  hardware.cpu.amd.updateMicrocode = true;
+
+# networking.firewall is enabled by default
+  networking.firewall.allowedTCPPorts = [ 80 ];
+
+  fileSystems."/" =
+  { device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
+  krebs.retiolum = {
+    enable = true;
+    hosts = ../../Zhosts;
+    connectTo = [
+      "gum"
+      "pigstarter"
+      "fastpoke"
+    ];
+  };
+
+# $ nix-env -qaP | grep wget
+    environment.systemPackages = with pkgs; [
+      jq
+    ];
+}
-- 
cgit v1.3.1


From 9575e56d6980cd9770befce5605eabd290ca5dbb Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 29 Jul 2015 01:07:41 +0200
Subject: update paths in makefu cfg

---
 makefu/1systems/pnp.nix           | 4 ++--
 makefu/2configs/base.nix          | 1 +
 makefu/2configs/cgit-retiolum.nix | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'makefu/1systems')

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 ";
-- 
cgit v1.3.1


From e5b8e2e4a4e15f587586d308b159d657bf0ede9c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 29 Jul 2015 15:14:52 +0200
Subject: init: repunit

---
 makefu/1systems/repunit | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 makefu/1systems/repunit

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/repunit b/makefu/1systems/repunit
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.3.1