summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-11 23:59:07 +0100
committertv <tv@krebsco.de>2016-02-11 23:59:07 +0100
commit2b6a54c31c47667495187f9ff8f9a6009a2652ab (patch)
treeab00bc10716b73443dbe58d1279ce367e6cc71fc /makefu/1systems
parent8c87356aee561fd8bc50dc2b7029ab30118f0d2c (diff)
parente8a0058f8cd654247eb0b08326dd34c3ac9cff6a (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/pornocauster.nix25
-rw-r--r--makefu/1systems/vbob.nix5
-rw-r--r--makefu/1systems/wbob.nix65
3 files changed, 57 insertions, 38 deletions
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
];
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 20301795f..2dee83728 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -17,8 +17,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";
};
@@ -38,7 +38,6 @@
buildbot
buildbot-slave
get
- genid
logstash
];
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")
+
}