From 00bc48d90f95bf9d5de2da6b6c82bca7d78b87f2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 2 Aug 2015 23:12:38 +0200
Subject: add host tsp (traveling salesman problem)

---
 makefu/1systems/tsp.nix      | 90 ++++++++++++++++++++++++++++++++++++++++++++
 makefu/2configs/base-gui.nix | 23 +++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 makefu/1systems/tsp.nix
 create mode 100644 makefu/2configs/base-gui.nix

(limited to 'makefu')

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
new file mode 100644
index 000000000..3de2d300c
--- /dev/null
+++ b/makefu/1systems/tsp.nix
@@ -0,0 +1,90 @@
+# 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.
+      ../2configs/base.nix
+      ../2configs/base-gui.nix
+    ];
+  services.xserver = {
+    videoDriver = "intel";
+  };
+  krebs.build.host = config.krebs.hosts.tsp;
+  krebs.build.user = config.krebs.users.makefu;
+  krebs.build.target = "root@tsp";
+
+  krebs.build.deps = {
+    nixpkgs = {
+      url = https://github.com/NixOS/nixpkgs;
+      rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
+    };
+    # TODO generalize in base.nix
+    secrets = {
+      url = "/home/makefu/secrets/${config.krebs.build.host.name}";
+    };
+    # TODO generalize in base.nix
+    stockholm = {
+      url = toString ../..;
+    };
+  };
+
+  krebs.retiolum = {
+    enable = true;
+    hosts = ../../Zhosts;
+    connectTo = [
+      "gum"
+      "pigstarter"
+      "fastpoke"
+    ];
+  };
+
+  boot = {
+    #x200 specifics
+    kernelModules = [ "tp_smapi" "msr" ];
+    extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
+
+    loader.grub.enable =true;
+    loader.grub.version =2;
+    loader.grub.device = "/dev/sda";
+
+    # crypto boot
+    # TODO: use UUID
+    initrd.luks.devices = [ { name = "luksroot"; device= "/dev/sda2";}];
+    initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ];
+    initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
+  };
+  fileSystems = {
+    "/" = {
+      device = "/dev/mapper/luksroot";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-label/nixboot";
+      fsType = "ext4";
+    };
+  };
+
+  # hardware specifics
+  networking.wireless.enable = true;
+
+  hardware.enableAllFirmware = true;
+  nixpkgs.config.allowUnfree = true;
+
+  # TODO: generalize to numCPU + 1
+  nix.maxJobs = 3;
+
+
+  networking.firewall.rejectPackets = true;
+  networking.firewall.allowPing = true;
+
+
+  # $ nix-env -qaP | grep wget
+  environment.systemPackages = with pkgs; [
+    vim
+    jq
+  ];
+}
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
new file mode 100644
index 000000000..5f977251f
--- /dev/null
+++ b/makefu/2configs/base-gui.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+  imports = [ ];
+  services.xserver.enable = true;
+  services.xserver.layout = "us";
+
+# use awesome, direct boot into
+  services.xserver.displayManager.auto.enable =true;
+  services.xserver.displayManager.auto.user =config.krebs.users.makefu;
+  services.xserver.windowManager.awesome.enable = true;
+
+  security.setuidPrograms = [ "slock" ];
+
+# use pulseaudio
+  environment.systemPackages = [ pkgs.slock ];
+  hardware.pulseaudio = {
+    enable = true;
+    systemWide = true;
+  };
+
+}
-- 
cgit v1.2.3


From a385b9a4ec7751276c81e09b51427b22a344c9a3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 4 Aug 2015 16:13:50 +0200
Subject: add minimal graphite installation to pnp

---
 makefu/2configs/graphite-standalone.nix | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 makefu/2configs/graphite-standalone.nix

(limited to 'makefu')

diff --git a/makefu/2configs/graphite-standalone.nix b/makefu/2configs/graphite-standalone.nix
new file mode 100644
index 000000000..50c623ab9
--- /dev/null
+++ b/makefu/2configs/graphite-standalone.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+# graphite-web on port 8080
+# carbon cache on port 2003 (tcp/udp)
+with lib;
+{
+  imports = [ ];
+  services.graphite = {
+    web = {
+      enable = true;
+      host = "0.0.0.0";
+    };
+    carbon = {
+      enableCache = true;
+      # save disk usage by restricting to 1 bulk update per second
+      config = ''
+        [cache]
+        MAX_CACHE_SIZE = inf
+        MAX_UPDATES_PER_SECOND = 1
+        MAX_CREATES_PER_MINUTE = 50
+        '';
+      storageSchemas = ''
+        [carbon]
+        pattern = ^carbon\.
+        retentions = 60:90d
+
+        [default]
+        pattern = .*
+        retentions = 60s:30d,300s:1y
+        '';
+    };
+  };
+}
-- 
cgit v1.2.3


From b3c25831d1ac80578222cc7d0e8f3559f92f34c1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 5 Aug 2015 14:56:38 +0200
Subject: add graphite to pnp

---
 makefu/1systems/pnp.nix          | 10 ++++++++--
 makefu/2configs/graphite-web.nix | 24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 makefu/2configs/graphite-web.nix

(limited to 'makefu')

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 549658983..a8df522f2 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -10,6 +10,7 @@
       <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
       ../2configs/base.nix
       ../2configs/cgit-retiolum.nix
+      ../2configs/graphite-standalone.nix
     ];
   krebs.build.host = config.krebs.hosts.pnp;
   krebs.build.user = config.krebs.users.makefu;
@@ -38,8 +39,13 @@
   hardware.enableAllFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
-# networking.firewall is enabled by default
-  networking.firewall.allowedTCPPorts = [ 80 ];
+  networking.firewall.allowedTCPPorts = [
+  # nginx runs on 80
+                                          80
+  # graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp
+                                          8080 2003
+                                        ];
+  networking.firewall.allowedUDPPorts = [ 2003 ];
   networking.firewall.rejectPackets = true;
   networking.firewall.allowPing = true;
 
diff --git a/makefu/2configs/graphite-web.nix b/makefu/2configs/graphite-web.nix
new file mode 100644
index 000000000..daa1d49a3
--- /dev/null
+++ b/makefu/2configs/graphite-web.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+  imports = [ ];
+  services.graphite = {
+    web = {
+      enable = true;
+      host = "0.0.0.0";
+    };
+    carbon = {
+      enableCache = true;
+      storageSchemas = ''
+        [carbon]
+        pattern = ^carbon\.
+        retentions = 60:90d
+
+        [default]
+        pattern = .*
+        retentions = 60s:30d,300s:1y
+        '';
+    };
+  };
+}
-- 
cgit v1.2.3


From dd8c918c876f923b7ca5d9446b03c0b01f82b531 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 5 Aug 2015 15:11:52 +0200
Subject: test vicious for awesome on tsp

---
 makefu/1systems/tsp.nix      | 13 ++++++++-----
 makefu/2configs/base-gui.nix | 21 ++++++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 3de2d300c..d67a5c076 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -10,17 +10,20 @@
       ../2configs/base.nix
       ../2configs/base-gui.nix
     ];
-  services.xserver = {
-    videoDriver = "intel";
-  };
+  # not working in vm
+  #services.xserver = {
+  #  videoDriver = "intel";
+  #};
   krebs.build.host = config.krebs.hosts.tsp;
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@tsp";
 
   krebs.build.deps = {
     nixpkgs = {
-      url = https://github.com/NixOS/nixpkgs;
-      rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
+      #url = https://github.com/NixOS/nixpkgs;
+      url = https://github.com/makefu/nixpkgs;
+      #rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
+      rev = "08275910ba86ed9bd7a2608e6a1e5285faf24cb2";
     };
     # TODO generalize in base.nix
     secrets = {
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 5f977251f..056005f75 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -3,13 +3,24 @@
 with lib;
 {
   imports = [ ];
-  services.xserver.enable = true;
-  services.xserver.layout = "us";
+  services.xserver = {
+    enable = true;
+    layout = "us";
 
 # use awesome, direct boot into
-  services.xserver.displayManager.auto.enable =true;
-  services.xserver.displayManager.auto.user =config.krebs.users.makefu;
-  services.xserver.windowManager.awesome.enable = true;
+    displayManager.auto.enable = true;
+# TODO: use config.krebs.users.makefu ... or not
+    displayManager.auto.user = "makefu";
+
+    windowManager = {
+      awesome.enable = true;
+      awesome.luaModules = [ pkgs.luaPackages.vicious ];
+      default = "awesome";
+    };
+
+    desktopManager.xterm.enable = false;
+    desktopManager.default = "none";
+  };
 
   security.setuidPrograms = [ "slock" ];
 
-- 
cgit v1.2.3


From eeb7a84e988c0fa41113643505d2965b0f81ffb9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 5 Aug 2015 16:54:15 +0200
Subject: use unstable nixpkgs release

---
 makefu/1systems/tsp.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu')

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index d67a5c076..2d3fd9225 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -23,7 +23,8 @@
       #url = https://github.com/NixOS/nixpkgs;
       url = https://github.com/makefu/nixpkgs;
       #rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
-      rev = "08275910ba86ed9bd7a2608e6a1e5285faf24cb2";
+      #rev = "08275910ba86ed9bd7a2608e6a1e5285faf24cb2";
+      rev = "53d79a8074e7a4465515e67ea565dc73cbc14c5c";
     };
     # TODO generalize in base.nix
     secrets = {
-- 
cgit v1.2.3


From 91a112c24294154be3b812e2b52e1c651d336aff Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 7 Aug 2015 12:10:02 +0200
Subject: refactor tsp

---
 makefu/1systems/tsp.nix             | 51 +++----------------------------------
 makefu/2configs/base-gui.nix        | 26 ++++++++++++-------
 makefu/2configs/base.nix            | 14 +++++++++-
 makefu/2configs/sda-crypto-root.nix | 27 ++++++++++++++++++++
 makefu/2configs/tp-x200.nix         | 23 +++++++++++++++++
 5 files changed, 84 insertions(+), 57 deletions(-)
 create mode 100644 makefu/2configs/sda-crypto-root.nix
 create mode 100644 makefu/2configs/tp-x200.nix

(limited to 'makefu')

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 2d3fd9225..3979b70b9 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -9,11 +9,10 @@
     [ # Include the results of the hardware scan.
       ../2configs/base.nix
       ../2configs/base-gui.nix
+      ../2configs/tp-x200.nix
+      ../2configs/sda-crypto-root.nix
     ];
   # not working in vm
-  #services.xserver = {
-  #  videoDriver = "intel";
-  #};
   krebs.build.host = config.krebs.hosts.tsp;
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@tsp";
@@ -21,18 +20,9 @@
   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 = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
-      #rev = "08275910ba86ed9bd7a2608e6a1e5285faf24cb2";
-      rev = "53d79a8074e7a4465515e67ea565dc73cbc14c5c";
-    };
-    # TODO generalize in base.nix
-    secrets = {
-      url = "/home/makefu/secrets/${config.krebs.build.host.name}";
-    };
-    # TODO generalize in base.nix
-    stockholm = {
-      url = toString ../..;
+      rev = "8b8b65da24f13f9317504e8bcba476f9161613fe";
     };
   };
 
@@ -46,40 +36,7 @@
     ];
   };
 
-  boot = {
-    #x200 specifics
-    kernelModules = [ "tp_smapi" "msr" ];
-    extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
-
-    loader.grub.enable =true;
-    loader.grub.version =2;
-    loader.grub.device = "/dev/sda";
-
-    # crypto boot
-    # TODO: use UUID
-    initrd.luks.devices = [ { name = "luksroot"; device= "/dev/sda2";}];
-    initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ];
-    initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
-  };
-  fileSystems = {
-    "/" = {
-      device = "/dev/mapper/luksroot";
-      fsType = "ext4";
-    };
-    "/boot" = {
-      device = "/dev/disk/by-label/nixboot";
-      fsType = "ext4";
-    };
-  };
-
   # hardware specifics
-  networking.wireless.enable = true;
-
-  hardware.enableAllFirmware = true;
-  nixpkgs.config.allowUnfree = true;
-
-  # TODO: generalize to numCPU + 1
-  nix.maxJobs = 3;
 
 
   networking.firewall.rejectPackets = true;
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 056005f75..7f329c6ce 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -1,31 +1,39 @@
 { config, lib, pkgs, ... }:
-
+##
+# of course this name is a lie - it prepares a GUI environment close to my
+# current configuration.
+#
+# autologin with mainUser into awesome
+##
+#
 with lib;
+let
+  mainUser = config.krebs.build.user.name;
+in
 {
   imports = [ ];
   services.xserver = {
     enable = true;
     layout = "us";
 
-# use awesome, direct boot into
-    displayManager.auto.enable = true;
-# TODO: use config.krebs.users.makefu ... or not
-    displayManager.auto.user = "makefu";
-
     windowManager = {
       awesome.enable = true;
       awesome.luaModules = [ pkgs.luaPackages.vicious ];
       default = "awesome";
     };
 
+    displayManager.auto.enable = true;
+    displayManager.auto.user = mainUser;
     desktopManager.xterm.enable = false;
-    desktopManager.default = "none";
   };
 
   security.setuidPrograms = [ "slock" ];
 
-# use pulseaudio
-  environment.systemPackages = [ pkgs.slock ];
+  environment.systemPackages = [
+    pkgs.slock
+    pkgs.rxvt_unicode-with-plugins
+  ];
+
   hardware.pulseaudio = {
     enable = true;
     systemWide = true;
diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index 8dfb2ef27..792cccc71 100644
--- a/makefu/2configs/base.nix
+++ b/makefu/2configs/base.nix
@@ -6,7 +6,7 @@ with lib;
   krebs.enable = true;
   krebs.search-domain = "retiolum";
 
-  networking.hostName = config.krebs.build.host.name;
+
   users.extraUsers = {
     root = {
         openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
@@ -24,6 +24,18 @@ with lib;
     };
   };
 
+  networking.hostName = config.krebs.build.host.name;
+  nix.maxJobs = config.krebs.build.host.cores + 1;
+
+  krebs.build.deps = {
+    secrets = {
+      url = "/home/makefu/secrets/${config.krebs.build.host.name}";
+    };
+    stockholm = {
+      url = toString ../..;
+    };
+  };
+
   services.openssh.enable = true;
   nix.useChroot = true;
 
diff --git a/makefu/2configs/sda-crypto-root.nix b/makefu/2configs/sda-crypto-root.nix
new file mode 100644
index 000000000..0d979a0b8
--- /dev/null
+++ b/makefu/2configs/sda-crypto-root.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+# sda:  bootloader grub2
+# sda1: boot ext4 (label nixboot)
+# sda2: cryptoluks -> ext4
+with lib;
+{
+  boot = {
+    loader.grub.enable =true;
+    loader.grub.version =2;
+    loader.grub.device = "/dev/sda";
+
+    initrd.luks.devices = [ { name = "luksroot"; device= "/dev/sda2";}];
+    initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ];
+    initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
+  };
+  fileSystems = {
+    "/" = {
+      device = "/dev/mapper/luksroot";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-label/nixboot";
+      fsType = "ext4";
+    };
+  };
+}
diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
new file mode 100644
index 000000000..64d3f85a1
--- /dev/null
+++ b/makefu/2configs/tp-x200.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+  #services.xserver = {
+  #  videoDriver = "intel";
+  #};
+
+  boot = {
+    kernelModules = [ "tp_smapi" "msr" ];
+    extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
+
+  };
+
+  networking.wireless.enable = true;
+
+  hardware.enableAllFirmware = true;
+  nixpkgs.config.allowUnfree = true;
+
+  hardware.trackpoint.enable = true;
+  hardware.trackpoint.sensitivity = 255;
+  hardware.trackpoint.speed = 255;
+}
-- 
cgit v1.2.3


From 4d460eb95f398797df4d502be496a79481bdd809 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 7 Aug 2015 12:53:02 +0200
Subject: refactor pnp

---
 makefu/1systems/pnp.nix                 | 45 +++++++--------------------------
 makefu/2configs/graphite-standalone.nix |  1 +
 makefu/2configs/graphite-web.nix        | 24 ------------------
 makefu/2configs/tinc-basic-retiolum.nix | 14 ++++++++++
 makefu/2configs/vm-single-partition.nix | 20 +++++++++++++++
 5 files changed, 44 insertions(+), 60 deletions(-)
 delete mode 100644 makefu/2configs/graphite-web.nix
 create mode 100644 makefu/2configs/tinc-basic-retiolum.nix
 create mode 100644 makefu/2configs/vm-single-partition.nix

(limited to 'makefu')

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index a8df522f2..bc4c679b7 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -11,6 +11,8 @@
       ../2configs/base.nix
       ../2configs/cgit-retiolum.nix
       ../2configs/graphite-standalone.nix
+      ../2configs/vm-single-partition.nix
+      ../2configs/tinc-basic-retiolum.nix
     ];
   krebs.build.host = config.krebs.hosts.pnp;
   krebs.build.user = config.krebs.users.makefu;
@@ -21,50 +23,21 @@
       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;
-  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.allowedTCPPorts = [
   # nginx runs on 80
-                                          80
   # graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp
-                                          8080 2003
-                                        ];
+    80
+    8080 2003
+  ];
   networking.firewall.allowedUDPPorts = [ 2003 ];
+
   networking.firewall.rejectPackets = true;
   networking.firewall.allowPing = true;
 
-  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
-    ];
+  environment.systemPackages = with pkgs; [
+    jq
+  ];
 }
diff --git a/makefu/2configs/graphite-standalone.nix b/makefu/2configs/graphite-standalone.nix
index 50c623ab9..8b70c11c8 100644
--- a/makefu/2configs/graphite-standalone.nix
+++ b/makefu/2configs/graphite-standalone.nix
@@ -5,6 +5,7 @@
 with lib;
 {
   imports = [ ];
+
   services.graphite = {
     web = {
       enable = true;
diff --git a/makefu/2configs/graphite-web.nix b/makefu/2configs/graphite-web.nix
deleted file mode 100644
index daa1d49a3..000000000
--- a/makefu/2configs/graphite-web.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-{
-  imports = [ ];
-  services.graphite = {
-    web = {
-      enable = true;
-      host = "0.0.0.0";
-    };
-    carbon = {
-      enableCache = true;
-      storageSchemas = ''
-        [carbon]
-        pattern = ^carbon\.
-        retentions = 60:90d
-
-        [default]
-        pattern = .*
-        retentions = 60s:30d,300s:1y
-        '';
-    };
-  };
-}
diff --git a/makefu/2configs/tinc-basic-retiolum.nix b/makefu/2configs/tinc-basic-retiolum.nix
new file mode 100644
index 000000000..cb1991bd6
--- /dev/null
+++ b/makefu/2configs/tinc-basic-retiolum.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+  krebs.retiolum = {
+    enable = true;
+    hosts = ../../Zhosts;
+    connectTo = [
+      "gum"
+      "pigstarter"
+      "fastpoke"
+    ];
+  };
+}
diff --git a/makefu/2configs/vm-single-partition.nix b/makefu/2configs/vm-single-partition.nix
new file mode 100644
index 000000000..78a5e7175
--- /dev/null
+++ b/makefu/2configs/vm-single-partition.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+
+# vda1 ext4 (label nixos) -> only root partition
+with lib;
+{
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  boot.loader.grub.device = "/dev/vda";
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
+
+  hardware.enableAllFirmware = true;
+  nixpkgs.config.allowUnfree = true;
+  hardware.cpu.amd.updateMicrocode = true;
+
+
+}
-- 
cgit v1.2.3


From fad2a76defb18108a271633392344dbb49bb769b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 7 Aug 2015 12:53:38 +0200
Subject: begin customization of gui

---
 makefu/1systems/tsp.nix      | 19 +++----------------
 makefu/2configs/base-gui.nix |  6 +++---
 2 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 3979b70b9..da7466d75 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -9,8 +9,10 @@
     [ # Include the results of the hardware scan.
       ../2configs/base.nix
       ../2configs/base-gui.nix
-      ../2configs/tp-x200.nix
+      ../2configs/tinc-basic-retiolum.nix
       ../2configs/sda-crypto-root.nix
+      # hardware specifics are in here
+      ../2configs/tp-x200.nix
     ];
   # not working in vm
   krebs.build.host = config.krebs.hosts.tsp;
@@ -26,24 +28,9 @@
     };
   };
 
-  krebs.retiolum = {
-    enable = true;
-    hosts = ../../Zhosts;
-    connectTo = [
-      "gum"
-      "pigstarter"
-      "fastpoke"
-    ];
-  };
-
-  # hardware specifics
-
-
   networking.firewall.rejectPackets = true;
   networking.firewall.allowPing = true;
 
-
-  # $ nix-env -qaP | grep wget
   environment.systemPackages = with pkgs; [
     vim
     jq
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 7f329c6ce..c4755c217 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -15,6 +15,8 @@ in
   services.xserver = {
     enable = true;
     layout = "us";
+    xkbVariant = "altgr-intl";
+    xkbOptions = "ctrl:nocaps";
 
     windowManager = {
       awesome.enable = true;
@@ -27,10 +29,8 @@ in
     desktopManager.xterm.enable = false;
   };
 
-  security.setuidPrograms = [ "slock" ];
-
   environment.systemPackages = [
-    pkgs.slock
+    pkgs.xlockmore
     pkgs.rxvt_unicode-with-plugins
   ];
 
-- 
cgit v1.2.3


From 7bb85d74f8dbf8751344f9248b9365b4543bf20f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 7 Aug 2015 13:51:49 +0200
Subject: makefu/2configs:add hashedPasswords

---
 makefu/2configs/base.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index 792cccc71..2e18acf7c 100644
--- a/makefu/2configs/base.nix
+++ b/makefu/2configs/base.nix
@@ -2,7 +2,13 @@
 
 with lib;
 {
-  imports = [ ];
+  imports = [
+    {
+      users.extraUsers =
+        mapAttrs (_: h: { hashedPassword = h; })
+                 (import /root/src/secrets/hashedPasswords.nix);
+    }
+  ];
   krebs.enable = true;
   krebs.search-domain = "retiolum";
 
@@ -39,7 +45,7 @@ with lib;
   services.openssh.enable = true;
   nix.useChroot = true;
 
-  users.mutableUsers = true;
+  users.mutableUsers = false;
 
   boot.tmpOnTmpfs = true;
   systemd.tmpfiles.rules = [
-- 
cgit v1.2.3


From a919ddb3878c59f1306d8d22f46b603aceb90e27 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 7 Aug 2015 15:50:06 +0200
Subject: makefu:include vim.nix

---
 makefu/2configs/base.nix |   2 +
 makefu/2configs/vim.nix  | 119 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 makefu/2configs/vim.nix

(limited to 'makefu')

diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index 2e18acf7c..25d92d63d 100644
--- a/makefu/2configs/base.nix
+++ b/makefu/2configs/base.nix
@@ -8,6 +8,7 @@ with lib;
         mapAttrs (_: h: { hashedPassword = h; })
                  (import /root/src/secrets/hashedPasswords.nix);
     }
+    ./vim.nix
   ];
   krebs.enable = true;
   krebs.search-domain = "retiolum";
@@ -32,6 +33,7 @@ with lib;
 
   networking.hostName = config.krebs.build.host.name;
   nix.maxJobs = config.krebs.build.host.cores + 1;
+  #nix.maxJobs = 1;
 
   krebs.build.deps = {
     secrets = {
diff --git a/makefu/2configs/vim.nix b/makefu/2configs/vim.nix
new file mode 100644
index 000000000..b71d95148
--- /dev/null
+++ b/makefu/2configs/vim.nix
@@ -0,0 +1,119 @@
+{ config, pkgs, ... }:
+
+let
+  customPlugins.vim-better-whitespace = pkgs.vimUtils.buildVimPlugin {
+    name = "vim-better-whitespace";
+    src = pkgs.fetchFromGitHub {
+      owner = "ntpeters";
+      repo = "vim-better-whitespace";
+      rev = "984c8da518799a6bfb8214e1acdcfd10f5f1eed7";
+      sha256 = "10l01a8xaivz6n01x6hzfx7gd0igd0wcf9ril0sllqzbq7yx2bbk";
+    };
+  };
+
+in {
+
+  environment.systemPackages = [
+    pkgs.python27Full # required for youcompleteme
+    (pkgs.vim_configurable.customize {
+      name = "vim";
+
+    vimrcConfig.customRC = ''
+      set nocompatible
+      syntax on
+
+      filetype off
+      filetype plugin indent on
+
+      colorscheme darkblue
+      set background=dark
+
+      set number
+      set relativenumber
+      set mouse=a
+      set ignorecase
+      set incsearch
+      set wildignore=*.o,*.obj,*.bak,*.exe,*.os
+      set textwidth=79
+      set shiftwidth=2
+      set expandtab
+      set softtabstop=2
+      set shiftround
+      set smarttab
+      set tabstop=2
+      set et
+      set autoindent
+      set backspace=indent,eol,start
+
+
+      inoremap <F1> <ESC>
+      nnoremap <F1> <ESC>
+      vnoremap <F1> <ESC>
+
+      nnoremap <F5> :UndotreeToggle<CR>
+      set undodir  =~/.vim/undo
+      set undofile
+      "maximum number of changes that can be undone
+      set undolevels=1000000
+      "maximum number lines to save for undo on a buffer reload
+      set undoreload=10000000
+
+      nnoremap <F2> :set invpaste paste?<CR>
+      set pastetoggle=<F2>
+      set showmode
+
+      set showmatch
+      set matchtime=3
+      set hlsearch
+
+      autocmd ColorScheme * highlight ExtraWhitespace ctermbg=red guibg=red
+
+
+      " save on focus lost
+      au FocusLost * :wa
+
+      autocmd BufRead *.json set filetype=json
+      au  BufNewFile,BufRead *.mustache set syntax=mustache
+
+      cnoremap SudoWrite w !sudo tee > /dev/null %
+
+      " create Backup/tmp/undo dirs
+      set backupdir=~/.vim/backup
+      set directory=~/.vim/tmp
+
+      function! InitBackupDir()
+        let l:parent = $HOME    . '/.vim/'
+        let l:backup = l:parent . 'backup/'
+        let l:tmpdir = l:parent . 'tmp/'
+        let l:undodir= l:parent . 'undo/'
+
+
+        if !isdirectory(l:parent)
+          call mkdir(l:parent)
+        endif
+        if !isdirectory(l:backup)
+          call mkdir(l:backup)
+        endif
+        if !isdirectory(l:tmpdir)
+          call mkdir(l:tmpdir)
+        endif
+        if !isdirectory(l:undodir)
+          call mkdir(l:undodir)
+        endif
+      endfunction
+      call InitBackupDir()
+
+
+    '';
+
+      vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
+      vimrcConfig.vam.pluginDictionaries = [
+        { names = [ "undotree"
+          "YouCompleteMe"
+          "vim-better-whitespace" ]; }
+        { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
+      ];
+
+    })
+  ];
+}
-- 
cgit v1.2.3


From 4fc382180ffcbe2326ac559de158fefff6370ab5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 9 Aug 2015 14:53:24 +0200
Subject: makefu: fix tsp ip, add font in base-gui

---
 makefu/2configs/base-gui.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index c4755c217..6cfd0e50c 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -29,14 +29,28 @@ in
     desktopManager.xterm.enable = false;
   };
 
-  environment.systemPackages = [
-    pkgs.xlockmore
-    pkgs.rxvt_unicode-with-plugins
+## FONTS
+# TODO: somewhere else?
+
+  i18n.consoleFont = "Lat2-Terminus16";
+
+  fonts = {
+    enableCoreFonts = true;
+    enableFontDir = true;
+    enableGhostscriptFonts = false;
+    fonts = [ pkgs.terminus_font ];
+  };
+
+  environment.systemPackages = with pkgs;[
+    xlockmore
+    rxvt_unicode-with-plugins
+    vlc
+    firefox
+    chromium
   ];
 
   hardware.pulseaudio = {
     enable = true;
     systemWide = true;
   };
-
 }
-- 
cgit v1.2.3


From 23da0b49331d5eba92c776ebcd1864b04e3ff8cf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 9 Aug 2015 15:13:01 +0200
Subject: tsp can push stockholm in cgit

---
 makefu/2configs/cgit-retiolum.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/cgit-retiolum.nix b/makefu/2configs/cgit-retiolum.nix
index 7dfb181c5..d352f5792 100644
--- a/makefu/2configs/cgit-retiolum.nix
+++ b/makefu/2configs/cgit-retiolum.nix
@@ -52,11 +52,7 @@ let
 
   # TODO: get the list of all krebsministers
   krebsminister = with config.krebs.users; [ lass tv uriel ];
-
-  #all-makefu =  with config.krebs.users; [ makefu ];
-
-
-  all-makefu = with config.krebs.users; [ makefu makefu-omo ];
+  all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp ];
 
   priv-rules = repo: set-owners repo all-makefu;
 
@@ -69,6 +65,10 @@ in {
         name = "makefu-omo" ;
         pubkey= with builtins; readFile ../../Zpubkeys/makefu_omo.ssh.pub;
     };
+    krebs.users.makefu-tsp = {
+        name = "makefu-tsp" ;
+        pubkey= with builtins; readFile ../../Zpubkeys/makefu_tsp.ssh.pub;
+    };
   }];
   krebs.git = {
     enable = true;
-- 
cgit v1.2.3


From 8b302ea8866fb6f0703f34540f31cf5871440e53 Mon Sep 17 00:00:00 2001
From: makefu <makefu@tsp>
Date: Sun, 9 Aug 2015 13:17:37 +0000
Subject: makefu: x200 - add middle mouse scroll

---
 makefu/2configs/tp-x200.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'makefu')

diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
index 64d3f85a1..25a2537e8 100644
--- a/makefu/2configs/tp-x200.nix
+++ b/makefu/2configs/tp-x200.nix
@@ -20,4 +20,9 @@ with lib;
   hardware.trackpoint.enable = true;
   hardware.trackpoint.sensitivity = 255;
   hardware.trackpoint.speed = 255;
+  services.xserver.displayManager.sessionCommands = ''
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
+  '';
 }
-- 
cgit v1.2.3


From 450d9e71ff0afc99511b840bed77a979795a988a Mon Sep 17 00:00:00 2001
From: makefu <makefu@tsp>
Date: Mon, 10 Aug 2015 17:49:55 +0000
Subject: makefu:base-gui audio working on earplugs

---
 makefu/2configs/base-gui.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 6cfd0e50c..4e5558a1f 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -48,9 +48,10 @@ in
     firefox
     chromium
   ];
-
+  # TODO: use mainUser
+  users.extraUsers.makefu.extraGroups = [ "audio" ];
   hardware.pulseaudio = {
     enable = true;
-    systemWide = true;
+  #  systemWide = true;
   };
 }
-- 
cgit v1.2.3


From 7a378d230d4c75f77f04943b73ad4c883d6750b9 Mon Sep 17 00:00:00 2001
From: makefu <makefu@tsp>
Date: Tue, 11 Aug 2015 19:00:22 +0000
Subject: makefu: move more stuff into base.nix

---
 makefu/1systems/pnp.nix  |  7 -------
 makefu/1systems/tsp.nix  | 14 +++-----------
 makefu/2configs/base.nix |  4 ++++
 3 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index bc4c679b7..6693dc066 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -33,11 +33,4 @@
   ];
   networking.firewall.allowedUDPPorts = [ 2003 ];
 
-  networking.firewall.rejectPackets = true;
-  networking.firewall.allowPing = true;
-
-# $ nix-env -qaP | grep wget
-  environment.systemPackages = with pkgs; [
-    jq
-  ];
 }
diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index da7466d75..f19dbfea6 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -1,7 +1,6 @@
-# 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, ... }:
 
 {
@@ -28,11 +27,4 @@
     };
   };
 
-  networking.firewall.rejectPackets = true;
-  networking.firewall.allowPing = true;
-
-  environment.systemPackages = with pkgs; [
-    vim
-    jq
-  ];
 }
diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix
index 25d92d63d..906c74f7d 100644
--- a/makefu/2configs/base.nix
+++ b/makefu/2configs/base.nix
@@ -50,6 +50,10 @@ with lib;
   users.mutableUsers = false;
 
   boot.tmpOnTmpfs = true;
+
+  networking.firewall.rejectPackets = true;
+  networking.firewall.allowPing = true;
+
   systemd.tmpfiles.rules = [
     "d /tmp 1777 root root - -"
   ];
-- 
cgit v1.2.3


From 978d5cc9f07ccfcca2cc53cb45ccb5ee0c801869 Mon Sep 17 00:00:00 2001
From: makefu <makefu@tsp>
Date: Thu, 13 Aug 2015 17:15:09 +0200
Subject: makefu/tsp: add exim

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

(limited to 'makefu')

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index f19dbfea6..6e93df51e 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -18,6 +18,13 @@
   krebs.build.user = config.krebs.users.makefu;
   krebs.build.target = "root@tsp";
 
+  krebs.exim-retiolum.enable = true;
+  networking.firewall.allowedTCPPorts = [
+  # nginx runs on 80
+  # graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp
+    25
+  ];
+
   krebs.build.deps = {
     nixpkgs = {
       #url = https://github.com/NixOS/nixpkgs;
-- 
cgit v1.2.3