Merge remote-tracking branch 'origin/master'

39 files changed, 83 insertions, 57 deletions

diff --git a/makefu/6tests/data/secrets/auth.nix b/makefu/0tests/data/secrets/auth.nix
index 92d5c34a8..92d5c34a8 100644
--- a/makefu/6tests/data/secrets/auth.nix
+++ b/makefu/0tests/data/secrets/auth.nix
diff --git a/makefu/6tests/data/secrets/bepasty-secret.nix b/makefu/0tests/data/secrets/bepasty-secret.nix
index f5e704702..f5e704702 100644
--- a/makefu/6tests/data/secrets/bepasty-secret.nix
+++ b/makefu/0tests/data/secrets/bepasty-secret.nix
diff --git a/makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname b/makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname
index 2ae3807f1..2ae3807f1 100644
--- a/makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname
+++ b/makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname
diff --git a/makefu/6tests/data/secrets/daemon-pw b/makefu/0tests/data/secrets/daemon-pw
index e16c76dff..e16c76dff 100644
--- a/makefu/6tests/data/secrets/daemon-pw
+++ b/makefu/0tests/data/secrets/daemon-pw
diff --git a/makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix b/makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix
index 0967ef424..0967ef424 100644
--- a/makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix
+++ b/makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix
diff --git a/makefu/6tests/data/secrets/extra-hosts.nix b/makefu/0tests/data/secrets/extra-hosts.nix
index e16c76dff..e16c76dff 100644
--- a/makefu/6tests/data/secrets/extra-hosts.nix
+++ b/makefu/0tests/data/secrets/extra-hosts.nix
diff --git a/makefu/6tests/data/secrets/grafana_security.nix b/makefu/0tests/data/secrets/grafana_security.nix
index f9096b7cf..f9096b7cf 100644
--- a/makefu/6tests/data/secrets/grafana_security.nix
+++ b/makefu/0tests/data/secrets/grafana_security.nix
diff --git a/makefu/6tests/data/secrets/hashedPasswords.nix b/makefu/0tests/data/secrets/hashedPasswords.nix
index 0967ef424..0967ef424 100644
--- a/makefu/6tests/data/secrets/hashedPasswords.nix
+++ b/makefu/0tests/data/secrets/hashedPasswords.nix
diff --git a/makefu/6tests/data/secrets/iodinepw.nix b/makefu/0tests/data/secrets/iodinepw.nix
index f5e704702..f5e704702 100644
--- a/makefu/6tests/data/secrets/iodinepw.nix
+++ b/makefu/0tests/data/secrets/iodinepw.nix
diff --git a/makefu/6tests/data/secrets/kibana-auth.nix b/makefu/0tests/data/secrets/kibana-auth.nix
index 80e8f44c1..80e8f44c1 100644
--- a/makefu/6tests/data/secrets/kibana-auth.nix
+++ b/makefu/0tests/data/secrets/kibana-auth.nix
diff --git a/makefu/6tests/data/secrets/nsupdate-data.nix b/makefu/0tests/data/secrets/nsupdate-data.nix
index e76c0e87e..e76c0e87e 100644
--- a/makefu/6tests/data/secrets/nsupdate-data.nix
+++ b/makefu/0tests/data/secrets/nsupdate-data.nix
diff --git a/makefu/6tests/data/secrets/nsupdate-search.nix b/makefu/0tests/data/secrets/nsupdate-search.nix
index a9646aeb7..a9646aeb7 100644
--- a/makefu/6tests/data/secrets/nsupdate-search.nix
+++ b/makefu/0tests/data/secrets/nsupdate-search.nix
diff --git a/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv b/makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv
+++ b/makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv
diff --git a/makefu/6tests/data/secrets/retiolum.rsa_key.priv b/makefu/0tests/data/secrets/retiolum.rsa_key.priv
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/retiolum.rsa_key.priv
+++ b/makefu/0tests/data/secrets/retiolum.rsa_key.priv
diff --git a/makefu/6tests/data/secrets/retiolum.rsa_key.pub b/makefu/0tests/data/secrets/retiolum.rsa_key.pub
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/retiolum.rsa_key.pub
+++ b/makefu/0tests/data/secrets/retiolum.rsa_key.pub
diff --git a/makefu/6tests/data/secrets/sambacred b/makefu/0tests/data/secrets/sambacred
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/sambacred
+++ b/makefu/0tests/data/secrets/sambacred
diff --git a/makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix b/makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix
index 963e6db8b..963e6db8b 100644
--- a/makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix
+++ b/makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix
diff --git a/makefu/6tests/data/secrets/ssh.id_ed25519 b/makefu/0tests/data/secrets/ssh.id_ed25519
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/ssh.id_ed25519
+++ b/makefu/0tests/data/secrets/ssh.id_ed25519
diff --git a/makefu/6tests/data/secrets/ssh.makefu.id_rsa b/makefu/0tests/data/secrets/ssh.makefu.id_rsa
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/ssh.makefu.id_rsa
+++ b/makefu/0tests/data/secrets/ssh.makefu.id_rsa
diff --git a/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub b/makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub
+++ b/makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub
diff --git a/makefu/6tests/data/secrets/ssh_host_ed25519_key b/makefu/0tests/data/secrets/ssh_host_ed25519_key
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/ssh_host_ed25519_key
+++ b/makefu/0tests/data/secrets/ssh_host_ed25519_key
diff --git a/makefu/6tests/data/secrets/ssh_host_rsa_key b/makefu/0tests/data/secrets/ssh_host_rsa_key
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/ssh_host_rsa_key
+++ b/makefu/0tests/data/secrets/ssh_host_rsa_key
diff --git a/makefu/6tests/data/secrets/tinc.krebsco.de.crt b/makefu/0tests/data/secrets/tinc.krebsco.de.crt
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/tinc.krebsco.de.crt
+++ b/makefu/0tests/data/secrets/tinc.krebsco.de.crt
diff --git a/makefu/6tests/data/secrets/tinc.krebsco.de.key b/makefu/0tests/data/secrets/tinc.krebsco.de.key
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/tinc.krebsco.de.key
+++ b/makefu/0tests/data/secrets/tinc.krebsco.de.key
diff --git a/makefu/6tests/data/secrets/tw-pass.ini b/makefu/0tests/data/secrets/tw-pass.ini
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/tw-pass.ini
+++ b/makefu/0tests/data/secrets/tw-pass.ini
diff --git a/makefu/6tests/data/secrets/wildcard.krebsco.de.crt b/makefu/0tests/data/secrets/wildcard.krebsco.de.crt
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/wildcard.krebsco.de.crt
+++ b/makefu/0tests/data/secrets/wildcard.krebsco.de.crt
diff --git a/makefu/6tests/data/secrets/wildcard.krebsco.de.key b/makefu/0tests/data/secrets/wildcard.krebsco.de.key
index e69de29bb..e69de29bb 100644
--- a/makefu/6tests/data/secrets/wildcard.krebsco.de.key
+++ b/makefu/0tests/data/secrets/wildcard.krebsco.de.key
diff --git a/makefu/1systems/omo/source.nix b/makefu/1systems/omo/source.nix
index 94fd9cbe6..da0d87aad 100644
--- a/makefu/1systems/omo/source.nix
+++ b/makefu/1systems/omo/source.nix
@@ -1,3 +1,4 @@
 import <stockholm/makefu/source.nix> {
   name="omo";
+  torrent = true;
 }
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index 3cf3274f9..df317a016 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -29,7 +29,7 @@ in {
       # <stockholm/makefu/2configs/vncserver.nix>
 
       # Services
-      <stockholm/makefu/2configs/hydra/stockholm.nix>
+      # <stockholm/makefu/2configs/hydra/stockholm.nix>
 
       <stockholm/makefu/2configs/share/wbob.nix>
       <stockholm/makefu/2configs/bluetooth-mpd.nix>
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 93bb27efe..451689f91 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -19,6 +19,7 @@ with import <stockholm/lib>;
 
       # Debugging
       # <stockholm/makefu/2configs/disable_v6.nix>
+      # <stockholm/makefu/2configs/pyload.nix>
 
       # Testing
       # <stockholm/makefu/2configs/deployment/gitlab.nix>
@@ -67,7 +68,9 @@ with import <stockholm/lib>;
       # <stockholm/makefu/2configs/hw/rtl8812au.nix>
       <stockholm/makefu/2configs/hw/network-manager.nix>
       <stockholm/makefu/2configs/hw/stk1160.nix>
-      # <stockholm/makefu/2configs/rad1o.nix>
+      <stockholm/makefu/2configs/hw/irtoy.nix>
+      <stockholm/makefu/2configs/hw/bluetooth.nix>
+      # <stockholm/makefu/2configs/hw/rad1o.nix>
 
       # Filesystem
       <stockholm/makefu/2configs/fs/sda-crypto-root-home.nix>
@@ -103,44 +106,9 @@ with import <stockholm/lib>;
           ];
         };
       }
-      { # bluetooth+pulse config
-        # for blueman-applet
-        users.users.makefu.packages = [
-          pkgs.blueman
-        ];
-        hardware.pulseaudio = {
-          enable = true;
-          package = pkgs.pulseaudioFull;
-          # systemWide = true;
-          support32Bit = true;
-          configFile = pkgs.writeText "default.pa" ''
-            load-module module-udev-detect
-            load-module module-bluetooth-policy
-            load-module module-bluetooth-discover
-            load-module module-native-protocol-unix
-            load-module module-always-sink
-            load-module module-console-kit
-            load-module module-systemd-login
-            load-module module-intended-roles
-            load-module module-position-event-sounds
-            load-module module-filter-heuristics
-            load-module module-filter-apply
-            load-module module-switch-on-connect
-            load-module module-switch-on-port-available
-            '';
-        };
-
-        # presumably a2dp Sink
-        # Enable profile:
-        ## pacmd set-card-profile "$(pactl list cards short | egrep -o bluez_card[[:alnum:]._]+)" a2dp_sink
-        hardware.bluetooth.extraConfig = '';
-          [general]
-          Enable=Source,Sink,Media,Socket
-        '';
-
-        # connect via https://nixos.wiki/wiki/Bluetooth#Using_Bluetooth_headsets_with_PulseAudio
-        hardware.bluetooth.enable = true;
-      }
+      # {
+      #   services.zerotierone.enable = true;
+      # }
 
     ];
 
@@ -166,7 +134,6 @@ with import <stockholm/lib>;
   # hard dependency because otherwise the device will not be unlocked
   boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
 
-  nix.package = pkgs.nixUnstable;
   environment.systemPackages = [ pkgs.passwdqc-utils pkgs.nixUnstable ];
   nixpkgs.overlays = [ (import <python/overlay.nix>) ];
 
diff --git a/makefu/2configs/hw/bluetooth.nix b/makefu/2configs/hw/bluetooth.nix
new file mode 100644
index 000000000..85c3190ff
--- /dev/null
+++ b/makefu/2configs/hw/bluetooth.nix
@@ -0,0 +1,39 @@
+{ pkgs, ... }:
+{ # bluetooth+pulse config
+# for blueman-applet
+  users.users.makefu.packages = [
+    pkgs.blueman
+  ];
+  hardware.pulseaudio = {
+    enable = true;
+    package = pkgs.pulseaudioFull;
+# systemWide = true;
+    support32Bit = true;
+    configFile = pkgs.writeText "default.pa" ''
+      load-module module-udev-detect
+      load-module module-bluetooth-policy
+      load-module module-bluetooth-discover
+      load-module module-native-protocol-unix
+      load-module module-always-sink
+      load-module module-console-kit
+      load-module module-systemd-login
+      load-module module-intended-roles
+      load-module module-position-event-sounds
+      load-module module-filter-heuristics
+      load-module module-filter-apply
+      load-module module-switch-on-connect
+      load-module module-switch-on-port-available
+      '';
+  };
+
+# presumably a2dp Sink
+# Enable profile:
+## pacmd set-card-profile "$(pactl list cards short | egrep -o bluez_card[[:alnum:]._]+)" a2dp_sink
+  hardware.bluetooth.extraConfig = '';
+  [general]
+    Enable=Source,Sink,Media,Socket
+      '';
+
+# connect via https://nixos.wiki/wiki/Bluetooth#Using_Bluetooth_headsets_with_PulseAudio
+  hardware.bluetooth.enable = true;
+}
diff --git a/makefu/2configs/hw/irtoy.nix b/makefu/2configs/hw/irtoy.nix
new file mode 100644
index 000000000..688f1b2b9
--- /dev/null
+++ b/makefu/2configs/hw/irtoy.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+
+  users.users.makefu.packages = with pkgs; [
+    lirc
+  ];
+
+  users.extraUsers.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];
+
+  services.udev.extraRules = ''
+    SUBSYSTEMS=="usb", ATTRS{idProduct}=="fd08", ATTRS{idVendor}=="04d8", SYMLINK+="irtoy", MODE="0666", GROUP="dialout"
+  '';
+}
+
diff --git a/makefu/2configs/rad1o.nix b/makefu/2configs/hw/rad1o.nix
index 6eca69e0c..6eca69e0c 100644
--- a/makefu/2configs/rad1o.nix
+++ b/makefu/2configs/hw/rad1o.nix
diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index 2bb438f16..b6554e040 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -5,6 +5,7 @@
     ./core.nix
     ./core-gui.nix
     ./dev.nix
+    ./desktop.nix
     ./extra-gui.nix
     ./games.nix
     ./media.nix
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 7e9a459c3..604288904 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -24,7 +24,6 @@
 
     # io
     pv
-    sshpass
     usbutils
     p7zip
     hdparm
@@ -39,11 +38,6 @@
     wol
     iftop
 
-    mkpasswd
-    mutt
-    weechat
-    tmux
-
     # stockholm
     git
     gnumake
@@ -55,8 +49,5 @@
     rxvt_unicode.terminfo
     krebspaste
 
-    # TODO:
-    taskwarrior
-    pass
   ];
 }
diff --git a/makefu/2configs/tools/desktop.nix b/makefu/2configs/tools/desktop.nix
new file mode 100644
index 000000000..1fe03e111
--- /dev/null
+++ b/makefu/2configs/tools/desktop.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  users.users.makefu.packages = with pkgs; [
+    taskwarrior
+    pass
+    mutt
+    weechat
+    tmux
+  ];
+}
diff --git a/makefu/5pkgs/elchhub/default.nix b/makefu/5pkgs/elchhub/default.nix
index 76ba834ab..df5777135 100644
--- a/makefu/5pkgs/elchhub/default.nix
+++ b/makefu/5pkgs/elchhub/default.nix
@@ -22,13 +22,13 @@ in buildPythonPackage rec {
   ];
   doCheck = false;
   src = fetchFromGitHub {
-    owner = "krebscode";
+    owner = "krebs";
     repo = "elchhub";
     rev = "58707c6";
     sha256 = "04spbcr660dxyc4jvrai094na25zizd2cfi36jz19lahb0k66lqm";
   };
   meta = {
-    homepage = https://github.com/krebscode/elchhub;
+    homepage = https://github.com/krebs/elchhub;
     description = "elchhub";
     license = lib.licenses.wtfpl;
   };
diff --git a/makefu/5pkgs/python-firetv/default.nix b/makefu/5pkgs/python-firetv/default.nix
index 1fb772f1f..593f4e718 100644
--- a/makefu/5pkgs/python-firetv/default.nix
+++ b/makefu/5pkgs/python-firetv/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, python2Packages, ... }:
 # requires libusb1 from unstable
-with (import <nixpkgs-unstable> {}).python2Packages; let
+with python2Packages; let
 
  python-adb = buildPythonPackage rec {
     pname = "adb";
diff --git a/makefu/source.nix b/makefu/source.nix
index 40aeac8b6..56d9095b2 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -23,8 +23,9 @@ let
     ];
   };
   # TODO: automate updating of this ref + cherry-picks
-  ref = "a09afbfb8a4"; # nixos-18.03 @ 2018-04-04
-                       # + do_sqlite3 ruby: 55a952be5b5
+  ref = "60b6ab055ad"; # nixos-18.03 @ 2018-05-31
+                       # + do_sqlite3 ruby:   55a952be5b5
+                       # + exfat-nofuse bump: ee6a5296a35
 
 in
   evalSource (toString _file) [
@@ -45,7 +46,7 @@ in
         };
 
       secrets = getAttr builder {
-        buildbot.file = toString <stockholm/makefu/6tests/data/secrets>;
+        buildbot.file = toString <stockholm/makefu/0tests/data/secrets>;
         makefu.pass = {
           inherit name;
           dir = "${getEnv "HOME"}/.secrets-pass";
@@ -79,7 +80,7 @@ in
 
     (mkIf ( torrent ) {
       torrent-secrets = getAttr builder {
-        buildbot.file = toString <stockholm/makefu/6tests/data/secrets>;
+        buildbot.file = toString <stockholm/makefu/0tests/data/secrets>;
         makefu.pass = {
           name = "torrent";
           dir = "${getEnv "HOME"}/.secrets-pass";