From f666c217906382bd63dddc83f7f822c1798c3df7 Mon Sep 17 00:00:00 2001
From: System administrator <root@nixos.lan>
Date: Sat, 22 Aug 2015 23:28:41 +0000
Subject: add pornocauster systems

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

(limited to 'makefu/1systems/pornocauster.nix')

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
new file mode 100644
index 00000000..b8ba9289
--- /dev/null
+++ b/makefu/1systems/pornocauster.nix
@@ -0,0 +1,43 @@
+#
+#
+#
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ../2configs/base.nix
+      ../2configs/base-gui.nix
+      ../2configs/tinc-basic-retiolum.nix
+      #../2configs/sda-crypto-root.nix
+      ../2configs/sda-crypto-root-home.nix
+      # hardware specifics are in here
+      ../2configs/tp-x200.nix
+
+      #../2configs/disable_v6.nix
+      #../2configs/rad1o.nix
+
+      #../2configs/exim-retiolum.nix
+    ];
+  # not working in vm
+  krebs.build.host = config.krebs.hosts.pornocauster;
+  krebs.build.user = config.krebs.users.makefu;
+  krebs.build.target = "root@localhost";
+
+  boot.kernelModules = [ "kvm-intel" ];
+
+
+  networking.firewall.allowedTCPPorts = [
+    25
+  ];
+
+  krebs.build.deps = {
+    nixpkgs = {
+      #url = https://github.com/NixOS/nixpkgs;
+      # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L)
+      url = https://github.com/makefu/nixpkgs;
+      #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe";
+      rev = "f5fe787f778b872c6b2221598501c9310cb83915";
+    };
+  };
+}
-- 
cgit v1.2.3


From 7a1e2f83b242b6779e1590082fbe93a8ed429611 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 23 Aug 2015 02:48:35 +0200
Subject: makefu: cleanup,refactoring after transfer

---
 makefu/1systems/pornocauster.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'makefu/1systems/pornocauster.nix')

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index b8ba9289..b6b7a59b 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -7,22 +7,24 @@
   imports =
     [ # Include the results of the hardware scan.
       ../2configs/base.nix
-      ../2configs/base-gui.nix
+      ../2configs/main-laptop.nix #< base-gui
+
       ../2configs/tinc-basic-retiolum.nix
       #../2configs/sda-crypto-root.nix
       ../2configs/sda-crypto-root-home.nix
-      # hardware specifics are in here
-      ../2configs/tp-x200.nix
 
+      ../2configs/zsh-user.nix
+      ../2configs/exim-retiolum.nix
       #../2configs/disable_v6.nix
-      #../2configs/rad1o.nix
 
-      #../2configs/exim-retiolum.nix
+      # hardware specifics are in here
+      ../2configs/tp-x220.nix
     ];
-  # not working in vm
+
   krebs.build.host = config.krebs.hosts.pornocauster;
   krebs.build.user = config.krebs.users.makefu;
-  krebs.build.target = "root@localhost";
+  krebs.build.target = "root@pornocauster";
+
 
   boot.kernelModules = [ "kvm-intel" ];
 
@@ -36,7 +38,6 @@
       #url = https://github.com/NixOS/nixpkgs;
       # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L)
       url = https://github.com/makefu/nixpkgs;
-      #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe";
       rev = "f5fe787f778b872c6b2221598501c9310cb83915";
     };
   };
-- 
cgit v1.2.3


From 6c206726e33e51cfac947ada4ad5ec7e5e107830 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 23 Aug 2015 14:15:41 +0200
Subject: makefu: add button-3 scrolling to x220 config

---
 makefu/1systems/pornocauster.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'makefu/1systems/pornocauster.nix')

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index b6b7a59b..21859453 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -25,10 +25,6 @@
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@pornocauster";
 
-
-  boot.kernelModules = [ "kvm-intel" ];
-
-
   networking.firewall.allowedTCPPorts = [
     25
   ];
-- 
cgit v1.2.3


From a0f6ac66e1420d9e3efa0443e05aee13b313b6d3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 24 Aug 2015 11:06:10 +0200
Subject: makefu: add virtualization

---
 makefu/1systems/pornocauster.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems/pornocauster.nix')

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 21859453..40aa5bb1 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -9,13 +9,19 @@
       ../2configs/base.nix
       ../2configs/main-laptop.nix #< base-gui
 
+      # Krebs
       ../2configs/tinc-basic-retiolum.nix
+      #../2configs/disable_v6.nix
+
       #../2configs/sda-crypto-root.nix
       ../2configs/sda-crypto-root-home.nix
 
       ../2configs/zsh-user.nix
+
+      # applications
       ../2configs/exim-retiolum.nix
-      #../2configs/disable_v6.nix
+      ../2configs/virtualization.nix
+      ../2configs/wwan.nix
 
       # hardware specifics are in here
       ../2configs/tp-x220.nix
-- 
cgit v1.2.3