From 28ea7e3745540c432b03d387ad2193a134a1eed4 Mon Sep 17 00:00:00 2001
From: makefu <makefu@nixos.dev>
Date: Wed, 10 Feb 2016 15:34:41 +0100
Subject: ma 1 vbob: deployable again

---
 makefu/1systems/vbob.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index f4a22d720..b1e5ef8b5 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -18,8 +18,8 @@
     tinc = pkgs.tinc_pre;
   };
 
-  krebs.build.source.nixpkgs = {
-    # url = https://github.com/nixos/nixpkgs;
+  krebs.build.source.upstream-nixpkgs = {
+    url = https://github.com/makefu/nixpkgs;
     # HTTP Everywhere + libredir
     rev = "8239ac6";
   };
@@ -39,7 +39,6 @@
     buildbot
     buildbot-slave
     get
-    genid
     logstash
   ];
 
-- 
cgit v1.2.3


From 908837089ce22e83eae2df6518ad499090d0e1ae Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 11 Feb 2016 17:05:00 +0100
Subject: ma 1 wbob: cleanup, add awesomerc todo

---
 makefu/1systems/wbob.nix | 65 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 53 insertions(+), 12 deletions(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/wbob.nix b/makefu/1systems/wbob.nix
index d6916f006..8917e4339 100644
--- a/makefu/1systems/wbob.nix
+++ b/makefu/1systems/wbob.nix
@@ -4,16 +4,57 @@
     [ # Include the results of the hardware scan.
       ../2configs/main-laptop.nix
     ];
-    krebs = {
-        enable = true;
-        retiolum.enable = true;
-        build.host = config.krebs.hosts.wbob;
-    };
-    boot.loader.grub.device = "/dev/sda";
-    boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" ];
-    boot.kernelModules = [ "kvm-intel" ];
-    fileSystems."/" = {
-        device = "/dev/sda1";
-        fsType = "ext4";
-    };
+  krebs = {
+      enable = true;
+      retiolum.enable = true;
+      build.host = config.krebs.hosts.wbob;
+  };
+
+  # rt2870.bin wifi card, part of linux-unfree
+  hardware.enableAllFirmware = true;
+  nixpkgs.config.allowUnfree = true;
+  networking.wireless.enable = true;
+  # rt2870 with nonfree creates wlp2s0 from wlp0s20u2
+  # not explicitly setting the interface results in wpa_supplicant to crash
+  networking.wireless.interfaces = [ "wlp2s0" ];
+
+
+  # nuc hardware
+  boot.loader.grub.device = "/dev/sda";
+  hardware.cpu.intel.updateMicrocode = true;
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  fileSystems."/" = {
+      device = "/dev/sda1";
+      fsType = "ext4";
+  };
+
+  # DualHead on NUC
+  services.xserver = {
+      # xrandrHeads = [ "HDMI1" "HDMI2" ];
+      # prevent screen from turning off, disable dpms
+      displayManager.sessionCommands = ''
+        xset s off -dpms
+        xrandr --output HDMI2 --right-of HDMI1
+      '';
+  };
+  ## TODO Awesomecfg + autostart chrome
+  #
+  #local current_screen = 1
+  #awful.rules.rules = {
+  #  { rule = { class = "chromium-browser" },
+  #    callback = function()
+  #      awful.client.movetotag(tags[current_screen][1],c)
+  #      if (current_screen == 1) then
+  #        current_screen = current_screen+1
+  #      else
+  #        current_screen = current_screen-1
+  #      end
+  #    end
+  #  },
+  #}
+  #awful.util.spawn_with_shell("chromium --new-window --kiosk http://wolf:3000/dashboard/db/soc-critical-values")
+  # prevent Race Condition
+  #awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://wolf:3000/dashboard/db/aralast")
+
 }
-- 
cgit v1.2.3


From ab52655e941f49be7f2b479bac264c030dda061d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 11 Feb 2016 17:06:50 +0100
Subject: ma: refactoring

---
 makefu/1systems/pornocauster.nix | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

(limited to 'makefu/1systems')

diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index d7fa8edc5..d8ccc5846 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -18,7 +18,6 @@
       ../2configs/exim-retiolum.nix
       ../2configs/mail-client.nix
       ../2configs/printer.nix
-      #../2configs/virtualization.nix
       ../2configs/virtualization.nix
       ../2configs/virtualization-virtualbox.nix
       ../2configs/wwan.nix
@@ -35,33 +34,13 @@
       # ../2configs/mediawiki.nix
       #../2configs/wordpress.nix
     ];
-  hardware.sane.enable = true;
-  hardware.sane.extraBackends = [ pkgs.samsungUnifiedLinuxDriver ];
+
   nixpkgs.config.packageOverrides = pkgs: {
     tinc = pkgs.tinc_pre;
   };
 
-  krebs.Reaktor = {
-    enable = false;
-    nickname = "makefu|r";
-    plugins = with pkgs.ReaktorPlugins; [ nixos-version random-emoji ];
-  };
-
-  # nix.binaryCaches = [ "http://acng.shack/nixos" "https://cache.nixos.org" ];
-
-  environment.systemPackages = with pkgs;[
-    get
-    virtmanager
-    gnome3.dconf
-    krebspaste
-    ];
-
-  services.logind.extraConfig = "HandleLidSwitch=ignore";
   # configure pulseAudio to provide a HDMI sink as well
-  hardware.pulseaudio.configFile = pkgs.writeText "pulse-default-pa" ''
-    ${builtins.readFile "${config.hardware.pulseaudio.package}/etc/pulse/default.pa"}
-    load-module module-alsa-sink device=hw:0,3 sink_properties=device.description="HDMIOutput" sink_name="HDMI"'';
-  networking.firewall.enable = false;
+  networking.firewall.enable = true;
   networking.firewall.allowedTCPPorts = [
     25
   ];
-- 
cgit v1.2.3