Merge branch 'master' of prism.r:stockholm

26 files changed, 264 insertions, 98 deletions

diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index 2f289d500..66f822c02 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -6,13 +6,13 @@
     [ # Include the results of the hardware scan.
       <stockholm/makefu>
 
-       <stockholm/makefu/2configs/hw/vbox-guest.nix>
-      #{ # until virtualbox-image is fixed
-      #  imports = [
-      #      <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
-      #    ];
-      #  boot.loader.grub.device = lib.mkForce "/dev/sda";
-      #}
+      # <stockholm/makefu/2configs/hw/vbox-guest.nix> # broken since 2019-04-18
+      { # until virtualbox-image is fixed
+        imports = [
+            <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+          ];
+        boot.loader.grub.device = lib.mkForce "/dev/sda";
+      }
       <stockholm/makefu/2configs/main-laptop.nix>
       # <secrets/extra-hosts.nix>
 
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index de55e9e89..3c5e50c4b 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -11,9 +11,13 @@
       <stockholm/makefu/2configs/home-manager/desktop.nix>
       <stockholm/makefu/2configs/home-manager/cli.nix>
       <stockholm/makefu/2configs/home-manager/mail.nix>
+      <stockholm/makefu/2configs/home-manager/taskwarrior.nix>
+
       <stockholm/makefu/2configs/main-laptop.nix>
       <stockholm/makefu/2configs/extra-fonts.nix>
       <stockholm/makefu/2configs/tools/all.nix>
+      { programs.adb.enable = true; }
+
       <stockholm/makefu/2configs/dict.nix>
       #<stockholm/makefu/3modules/netboot_server.nix>
       #{
@@ -23,7 +27,14 @@
       #  };
       #}
 
+      # Restore:
+      # systemctl cat borgbackup-job-state
+      # export BORG_PASSCOMMAND BORG_REPO BORG_RSH
+      # borg list "$BORG_REPO"
+      # mount newroot somewhere && cd somewhere
+      # borg extract  "$BORG_REPO::x-state-2019-04-17T01:41:51"  --progress # < extract to cwd
       <stockholm/makefu/2configs/backup/state.nix>
+
       # <stockholm/makefu/2configs/dnscrypt/client.nix>
       <stockholm/makefu/2configs/avahi.nix>
       <stockholm/makefu/2configs/support-nixos.nix>
@@ -46,19 +57,18 @@
 
       # Krebs
       <stockholm/makefu/2configs/tinc/retiolum.nix>
-      <stockholm/makefu/2configs/share/gum-client.nix>
+      # <stockholm/makefu/2configs/share/gum-client.nix>
 
 
       # applications
       <stockholm/makefu/2configs/exim-retiolum.nix>
       <stockholm/makefu/2configs/mail-client.nix>
       <stockholm/makefu/2configs/printer.nix>
-      <stockholm/makefu/2configs/task-client.nix>
       # <stockholm/makefu/2configs/syncthing.nix>
 
       # Virtualization
-      <stockholm/makefu/2configs/virtualisation/libvirt.nix>
-      <stockholm/makefu/2configs/virtualisation/docker.nix>
+      # <stockholm/makefu/2configs/virtualisation/libvirt.nix>
+      # <stockholm/makefu/2configs/virtualisation/docker.nix>
       <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
       #{
       #  networking.firewall.allowedTCPPorts = [ 8080 ];
@@ -71,35 +81,43 @@
       # Services
       <stockholm/makefu/2configs/git/brain-retiolum.nix>
       <stockholm/makefu/2configs/tor.nix>
-      <stockholm/makefu/2configs/vpn/vpngate.nix>
+      # <stockholm/makefu/2configs/vpn/vpngate.nix>
       # <stockholm/makefu/2configs/buildbot-standalone.nix>
       <stockholm/makefu/2configs/remote-build/aarch64-community.nix>
-      <stockholm/makefu/2configs/remote-build/gum.nix>
-      { nixpkgs.overlays = [ (self: super: super.prefer-remote-fetch self super) ]; }
+      # <stockholm/makefu/2configs/remote-build/gum.nix>
+      # { nixpkgs.overlays = [ (self: super: super.prefer-remote-fetch self super) ]; }
+
+      <stockholm/makefu/2configs/binary-cache/gum.nix>
+      <stockholm/makefu/2configs/binary-cache/lass.nix>
 
       # Hardware
       <stockholm/makefu/2configs/hw/tp-x230.nix>
-      <stockholm/makefu/2configs/hw/mceusb.nix>
-      <stockholm/makefu/2configs/hw/malduino_elite.nix>
+      # <stockholm/makefu/2configs/hw/mceusb.nix>
       # <stockholm/makefu/2configs/hw/tpm.nix>
       # <stockholm/makefu/2configs/hw/rtl8812au.nix>
       <stockholm/makefu/2configs/hw/network-manager.nix>
-      <stockholm/makefu/2configs/hw/stk1160.nix>
-      <stockholm/makefu/2configs/hw/irtoy.nix>
+      # <stockholm/makefu/2configs/hw/stk1160.nix>
+      # <stockholm/makefu/2configs/hw/irtoy.nix>
+      # <stockholm/makefu/2configs/hw/malduino_elite.nix>
       <stockholm/makefu/2configs/hw/switch.nix>
       <stockholm/makefu/2configs/hw/bluetooth.nix>
       # <stockholm/makefu/2configs/hw/rad1o.nix>
       <stockholm/makefu/2configs/hw/smartcard.nix>
 
+      {
+        services.upower.enable = true;
+        users.users.makefu.packages = [ pkgs.gnome3.gnome-power-manager ];
+      }
+
       # Filesystem
       <stockholm/makefu/2configs/fs/sda-crypto-root-home.nix>
 
       # Security
       <stockholm/makefu/2configs/sshd-totp.nix>
-      { programs.adb.enable = true; }
+
       # temporary
-      { services.redis.enable = true; }
-      <stockholm/makefu/2configs/pyload.nix>
+      # { services.redis.enable = true; }
+      # <stockholm/makefu/2configs/pyload.nix>
       # <stockholm/makefu/2configs/dcpp/airdcpp.nix>
       # <stockholm/makefu/2configs/nginx/rompr.nix>
       # <stockholm/makefu/2configs/lanparty/lancache.nix>
@@ -136,6 +154,9 @@
   makefu.server.primary-itf = "wlp3s0";
 
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.oraclejdk.accept_license = true;
+
+
 
   # configure pulseAudio to provide a HDMI sink as well
   networking.firewall.enable = true;
@@ -163,7 +184,6 @@
     "/home/makefu/.ssh/"
     "/home/makefu/.zsh_history"
     "/home/makefu/.bash_history"
-    "/home/makefu/.zshrc"
     "/home/makefu/bin"
     "/home/makefu/.gnupg"
     "/home/makefu/.imapfilter"
@@ -171,6 +191,7 @@
     "/home/makefu/docs"
     "/home/makefu/.password-store"
     "/home/makefu/.secrets-pass"
+    "/home/makefu/.config/syncthing"
   ];
 
   services.syncthing.user = lib.mkForce "makefu";
diff --git a/makefu/2configs/binary-cache/gum.nix b/makefu/2configs/binary-cache/gum.nix
new file mode 100644
index 000000000..fc54bd917
--- /dev/null
+++ b/makefu/2configs/binary-cache/gum.nix
@@ -0,0 +1,13 @@
+
+{ config, ... }:
+
+{
+  nix = {
+    binaryCaches = [
+      "https://cache.euer.krebsco.de/"
+    ];
+    binaryCachePublicKeys = [
+      "gum:iIXIFlCAotib+MgI3V/i3HMlFXiVYOT/jfP0y54Zuvg="
+    ];
+  };
+}
diff --git a/makefu/2configs/binary-cache/server.nix b/makefu/2configs/binary-cache/server.nix
index ad6256830..c8f68c84d 100644
--- a/makefu/2configs/binary-cache/server.nix
+++ b/makefu/2configs/binary-cache/server.nix
@@ -19,9 +19,10 @@
   };
   services.nginx = {
     enable = true;
-    virtualHosts.nix-serve = {
-      serverAliases = [ "cache.gum.r"
-                        "cache.euer.krebsco.de"
+    virtualHosts."cache.euer.krebsco.de" = {
+      forceSSL = true;
+      enableACME = true;
+      serverAliases = [ # "cache.gum.r"
                         "cache.gum.krebsco.de"
                       ];
       locations."/".proxyPass= "http://localhost:${toString config.services.nix-serve.port}";
diff --git a/makefu/2configs/bureautomation/automation/bureau-shutdown.nix b/makefu/2configs/bureautomation/automation/bureau-shutdown.nix
index c632a9e69..d54d9762a 100644
--- a/makefu/2configs/bureautomation/automation/bureau-shutdown.nix
+++ b/makefu/2configs/bureautomation/automation/bureau-shutdown.nix
@@ -5,14 +5,40 @@
       entity_id = "group.team";
       from = "not_home";
       to = "home";
+      for.seconds = 30;
     };
-    action = {
-      service = "homeassistant.turn_on";
-      entity_id =  [
-        "switch.fernseher"
-        "switch.feuer"
-      ];
-    };
+    action = [
+      {
+        service = "homeassistant.turn_on";
+        entity_id =  [
+          "switch.fernseher"
+          "switch.feuer"
+        ];
+      }
+      {
+        service = "media_player.kodi_call_method";
+        data = {
+          entity_id = "media_player.kodi";
+          method = "Player.Open";
+          item.partymode = "music";
+        };
+      }
+      {
+        service = "tts.google_say";
+        entity_id =  "media_player.kodi";
+        data = {
+          message = "Willkommen in deinem Lieblingsbüro";
+          language = "de";
+        };
+      }
+      {
+        service = "notify.telegrambot";
+        data = {
+          title = "Bureau Startup";
+          message = "Willkommen {{ trigger.platform }}";
+        };
+      }
+    ];
   }
   { alias = "Turn off Fernseher after last in group left";
     trigger = [
@@ -42,7 +68,7 @@
         service = "notify.telegrambot";
         data = {
           title = "Bureau Shutdown";
-          message = "All devices are turned off due to {{ trigger.platform }} - {{ trigger }}";
+          message = "All devices are turned off due to {{ trigger.platform }}";
         };
       }
     ];
diff --git a/makefu/2configs/bureautomation/automation/hass-restart.nix b/makefu/2configs/bureautomation/automation/hass-restart.nix
new file mode 100644
index 000000000..be16f6966
--- /dev/null
+++ b/makefu/2configs/bureautomation/automation/hass-restart.nix
@@ -0,0 +1,31 @@
+[
+  { alias = "State on HA start-up";
+  trigger = {
+      platform = "homeassistant";
+      event = "start";
+    };
+    action = [
+      # Startup State
+      { service = "mqtt.publish";
+        data = {
+          topic = "/bam/sonoffs/cmnd/state";
+          payload = "";
+        };
+      }
+      # Firmware Version
+      { service = "mqtt.publish";
+        data = {
+          topic = "/bam/sonoffs/cmnd/status";
+          payload = "2";
+        };
+      }
+      # Will trigger restart of all devices!
+      #{ service = "mqtt.publish";
+      #  data = {
+      #    topic = "sonoffs/cmnd/SetOption59"; # configure sending state on power change
+      #    payload = "1";
+      #  };
+      #}
+    ];
+  }
+]
diff --git a/makefu/2configs/bureautomation/automation/nachtlicht.nix b/makefu/2configs/bureautomation/automation/nachtlicht.nix
index 2becd4a39..ec6fa20c7 100644
--- a/makefu/2configs/bureautomation/automation/nachtlicht.nix
+++ b/makefu/2configs/bureautomation/automation/nachtlicht.nix
@@ -1,43 +1,35 @@
 [
-        {
-          alias = "Turn off Nachtlicht on sunrise";
-          trigger =
-          {
-            platform = "sun";
-            event = "sunrise";
-          };
-          action =
-          {
-            service = "homeassistant.turn_off";
-            entity_id =  [ "group.nachtlicht" ];
-          };
-        }
+  # TODO: trigger if it is before dusk and somebody arives but nachtlichter are
+  # off from last day
+  # TODO: do not have nachtlicht turned on at night
+  {
+    alias = "Turn on Nachtlicht at dusk"; # when it gets dim
+    trigger =
+    { platform = "numeric_state";
+      entity_id = "sun.sun";
+      value_template = "{{ state.attributes.elevation }}";
+      below = 10;
 
-        {
-          alias = "Turn on Nachtlicht on motion and dusk";
-          trigger =
-          {
-            platform = "state";
-            entity_id = "binary_sensor.motion";
-            to = "on";
-          };
-          condition = # 'when dark'
-          {
-            condition = "or";
-            conditions = [
-              { condition = "sun";
-                after = "sunset";
-                after_offset = "-00:45:00"; # on dusk
-              }
-              { condition = "sun";
-                before = "sunrise";
-              }
-            ];
-          };
-          action =
-          {
-            service = "homeassistant.turn_on";
-            entity_id =  [ "group.nachtlicht" ];
-          };
-        }
+    };
+    action =
+    { service = "homeassistant.turn_on";
+      entity_id =  [ "group.nachtlicht" ];
+    };
+  }
+  {
+    alias = "Turn off Nachtlicht at dawn";
+    trigger =
+    { platform = "sun";
+      event = "sunrise";
+      offset = "01:30:00"; # on dawn
+    };
+    # TODO: when somebody is still in the buero
+    # condition = 
+    #{
+    #};
+    action =
+    { service = "homeassistant.turn_off";
+      entity_id =  [ "group.nachtlicht" ];
+    };
+  }
 ]
diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix
index 917044d63..1782becd8 100644
--- a/makefu/2configs/bureautomation/default.nix
+++ b/makefu/2configs/bureautomation/default.nix
@@ -20,6 +20,9 @@ let
     mosquitto_pub -t /bam/$topic/cmnd/POWER -m OFF
   '';
 in {
+  imports = [
+    ./ota.nix
+  ];
   services.logstash = {
     package = pkgs.logstash5;
     enable = true;
diff --git a/makefu/2configs/bureautomation/hass.nix b/makefu/2configs/bureautomation/hass.nix
index 4e5fe7b63..02465520c 100644
--- a/makefu/2configs/bureautomation/hass.nix
+++ b/makefu/2configs/bureautomation/hass.nix
@@ -6,6 +6,7 @@ in {
   state = [ "/var/lib/hass/known_devices.yaml" ];
   services.home-assistant = {
     enable = true;
+    package = pkgs.home-assistant.override { python3 = pkgs.python36; };
     config = {
       homeassistant = {
         name = "Bureautomation";
@@ -13,8 +14,14 @@ in {
         latitude = "48.8265";
         longitude = "9.0676";
         elevation = 303;
+        auth_providers = [
+          { type = "homeassistant";}
+          { type = "legacy_api_password";}
+          { type = "trusted_networks";
+            # allow_bypass_login = true;
+          }
+        ];
       };
-
       mqtt = {
         broker = "localhost";
         port = 1883;
@@ -79,7 +86,8 @@ in {
       sensor =
         (import ./sensor/espeasy.nix) ++
         ((import ./sensor/outside.nix) {inherit lib;}) ++
-        (import ./sensor/influxdb.nix);
+        (import ./sensor/influxdb.nix) ++
+        (import ./sensor/tasmota_firmware.nix);
 
       camera =
         (import ./camera/verkehrskamera.nix);
@@ -89,12 +97,22 @@ in {
       #  (import ./person/team.nix );
 
       frontend = { };
-      http = { };
+      http = {
+        # TODO: https://github.com/home-assistant/home-assistant/issues/16149
+        api_password = "sistemas";
+        trusted_networks = [
+          "127.0.0.1/32"
+          "192.168.8.0/24"
+          "::1/128"
+          "fd00::/8"
+        ];
+      };
       conversation = {};
       history = {};
       logbook = {};
       tts = [ { platform = "google";} ];
       recorder = {};
+      sun = {};
       telegram_bot = [
         (builtins.fromJSON
           (builtins.readFile <secrets/hass/telegram-bot.json>))
@@ -156,8 +174,10 @@ in {
         outside = [
           # "sensor.ditzingen_pm10"
           # "sensor.ditzingen_pm25"
+          "sensor.dark_sky_icon"
           "sensor.dark_sky_temperature"
           "sensor.dark_sky_humidity"
+          "sensor.dark_sky_uv_index"
           # "sensor.dark_sky_pressure"
           "sensor.dark_sky_hourly_summary"
           "device_tracker.router"
@@ -169,6 +189,7 @@ in {
       # home-assistant
       automation = (import ./automation/bureau-shutdown.nix) ++
                    (import ./automation/nachtlicht.nix) ++
+                   (import ./automation/hass-restart.nix) ++
                    (import ./automation/10h_timer.nix);
       device_tracker = (import ./device_tracker/openwrt.nix );
     };
diff --git a/makefu/2configs/bureautomation/light/statuslight.nix b/makefu/2configs/bureautomation/light/statuslight.nix
index 0acab7281..31f52f492 100644
--- a/makefu/2configs/bureautomation/light/statuslight.nix
+++ b/makefu/2configs/bureautomation/light/statuslight.nix
@@ -20,7 +20,7 @@ let
     payload_not_available= "Offline";
     # brightness
     brightness_state_topic = "/bam/${topic}/tele/STATE";
-    brightness_value_template = "{{value_json.Dimmer}}";
+    brightness_value_template = "{{value_json.Dimmer|default(100)}}";
     brightness_command_topic = "/bam/${topic}/cmnd/Dimmer";
     brightness_scale = 100;
     # color
@@ -30,9 +30,8 @@ let
     rgb_command_template = "{{ '%02x%02x%02x' | format(red, green, blue)}}";
     # effects
     effect_state_topic = "/bam/${topic}/tele/STATE";
-    effects_value_template = "{{value_json.Scheme}}";
+    effects_value_template = "{{value_json.Scheme|default(0)}}";
     effect_command_topic = "/bam/${topic}/cmnd/Scheme";
-    effect_value_template = "{{ value_json.Scheme }}";
     effect_list = [
       0  # single color for LED light
       1  # start wake up sequence (same as Wakeup)
diff --git a/makefu/2configs/bureautomation/ota.nix b/makefu/2configs/bureautomation/ota.nix
new file mode 100644
index 000000000..f2f931d21
--- /dev/null
+++ b/makefu/2configs/bureautomation/ota.nix
@@ -0,0 +1,15 @@
+{
+  # mosquitto_pub -t /bam/sonoffs/cmnd/OtaUrl -m "http://192.168.8.11/sonoff.bin"
+  # mosquitto_pub -t /bam/sonoffs/cmnd/upgrade -m "6.5.0"
+  # wget https://github.com/arendst/Sonoff-Tasmota/releases/download/v6.5.0/sonoff.bin
+  # wget https://github.com/arendst/Sonoff-Tasmota/releases/download/v6.5.0/sonoff-minimal.bin
+  services.nginx = {
+    enable = true;
+    virtualHosts."192.168.8.11" = {
+      root = "/var/www/tasmota";
+      extraConfig = ''
+          autoindex on;
+      '';
+    };
+  };
+}
diff --git a/makefu/2configs/bureautomation/sensor/tasmota_firmware.nix b/makefu/2configs/bureautomation/sensor/tasmota_firmware.nix
new file mode 100644
index 000000000..1a4738e12
--- /dev/null
+++ b/makefu/2configs/bureautomation/sensor/tasmota_firmware.nix
@@ -0,0 +1,16 @@
+let
+  tasmota_firmware = topic:
+  { platform = "mqtt";
+  name = "${topic} Firmware";
+  state_topic = "/bam/${topic}/stat/STATUS2";
+  availability_topic = "/bam/${topic}/tele/LWT";
+  value_template = "v{{value_json.StatusFWR.Version}}";
+  payload_available= "Online";
+  payload_not_available= "Offline";
+  };
+in
+  map tasmota_firmware [
+    "plug" "plug2" "plug3" "plug4" "plug5"
+    "status1" "status2" "buslicht"
+    "rfbridge"
+  ]
diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index d7c082662..6f073fd4c 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -23,9 +23,9 @@ let
     in {
       system.activationScripts."prepare-nextcloud-${domain}" = ''
         if test ! -e ${root} ;then
-          echo "copying latest ${pkgs.owncloud.name} release to ${root}"
+          echo "copying latest ${pkgs.nextcloud.name} release to ${root}"
           mkdir -p $(dirname "${root}")
-          cp -r  ${pkgs.owncloud} "${root}"
+          cp -r  ${pkgs.nextcloud} "${root}"
           chown -R nginx:nginx "${root}"
           chmod 770 "${root}"
         fi
diff --git a/makefu/2configs/home-manager/default.nix b/makefu/2configs/home-manager/default.nix
index 2a4574cc8..f68b1092f 100644
--- a/makefu/2configs/home-manager/default.nix
+++ b/makefu/2configs/home-manager/default.nix
@@ -2,7 +2,9 @@
   imports = [
     <home-manager/nixos>
   ];
+  home-manager.useUserPackages = true;
   home-manager.users.makefu = {
+    home.stateVersion = "19.03";
   };
   environment.variables = {
     GTK_DATA_PREFIX = "/run/current-system/sw";
diff --git a/makefu/2configs/home-manager/desktop.nix b/makefu/2configs/home-manager/desktop.nix
index 63a5cdbef..406f7f0d1 100644
--- a/makefu/2configs/home-manager/desktop.nix
+++ b/makefu/2configs/home-manager/desktop.nix
@@ -5,7 +5,10 @@
   home-manager.users.makefu = {
     systemd.user.services.network-manager-applet.Service.Environment = ''XDG_DATA_DIRS=/run/current-system/sw/share:${pkgs.networkmanagerapplet}/share GDK_PIXBUF_MODULE_FILE=${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'';
     programs.browserpass = { browsers = [ "firefox" ] ; enable = true; };
-    programs.firefox.enable = true;
+    programs.firefox = {
+      enable = true;
+      enableIcedTea = true;
+    };
     programs.obs-studio.enable = true;
     xdg.enable = true;
     services.network-manager-applet.enable = true;
@@ -20,7 +23,6 @@
       filenamePattern=%F_%T_shot
     '';
 
-    systemd.user.services.pasystray.Service.Environment = "PATH=" + (lib.makeBinPath (with pkgs;[ pavucontrol paprefs /* pavumeter  */  /* paman */ ]) );
     programs.chromium = {
       enable = true;
       extensions = [
diff --git a/makefu/2configs/home-manager/recording.nix b/makefu/2configs/home-manager/recording.nix
new file mode 100644
index 000000000..31ca77b2b
--- /dev/null
+++ b/makefu/2configs/home-manager/recording.nix
@@ -0,0 +1,4 @@
+{pkgs, ... }:
+{
+    home-manager.users.makefu.programs.obs-studio.enable = true;
+}
diff --git a/makefu/2configs/home-manager/taskwarrior.nix b/makefu/2configs/home-manager/taskwarrior.nix
index 8ad16dcf2..57ba1a08d 100644
--- a/makefu/2configs/home-manager/taskwarrior.nix
+++ b/makefu/2configs/home-manager/taskwarrior.nix
@@ -3,6 +3,12 @@ let
   loc = "/home/makefu/.task";
 in {
   state = [ "${loc}/keys" ];
+  environment.shellAliases = {
+    tshack = "task tags:shack";
+    tkrebs = "task tags:krebs";
+    thome = "task tags:home";
+    t = "task project: ";
+  };
   home-manager.users.makefu.programs.taskwarrior = {
     enable = true;
     dataLocation = loc;
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 6c7b632e1..267a2e878 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -67,6 +67,7 @@
       home-manager.users.makefu.programs.zsh.shellAliases = {
         cat = "bat";
         catn = "${pkgs.coreutils}/bin/cat";
+        ncat = "${pkgs.coreutils}/bin/cat";
       };
     }
   ];
diff --git a/makefu/2configs/homeautomation/default.nix b/makefu/2configs/homeautomation/default.nix
index 4e9ac0ee3..c4fef1bfc 100644
--- a/makefu/2configs/homeautomation/default.nix
+++ b/makefu/2configs/homeautomation/default.nix
@@ -108,6 +108,7 @@ in {
   ];
 
   services.home-assistant = {
+    package = pkgs.home-assistant.override { python3 = pkgs.python36; };
     config = {
       homeassistant = {
         name = "Home"; time_zone = "Europe/Berlin";
diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix
index 42ae309d0..b4b2562fe 100644
--- a/makefu/2configs/hw/tp-x2x0.nix
+++ b/makefu/2configs/hw/tp-x2x0.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
 {
   imports = [
     ./tpm.nix
@@ -19,7 +18,6 @@ with import <stockholm/lib>;
   hardware.cpu.intel.updateMicrocode = true;
 
   zramSwap.enable = true;
-  zramSwap.numDevices = 2;
 
   # enable synaptics so we can easily disable the touchpad
   #   enable the touchpad with `synclient TouchpadOff=0`
diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix
index 05560db90..036f6e6fe 100644
--- a/makefu/2configs/tools/android-pentest.nix
+++ b/makefu/2configs/tools/android-pentest.nix
@@ -3,7 +3,7 @@
 {
   nixpkgs.config.android_sdk.accept_license = true;
   users.users.makefu.packages = with pkgs; [
-    mitmproxy
+    # mitmproxy
     nmap
     msf
     drozer
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 41bfef270..ee4f05980 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -10,7 +10,8 @@
     keepassx
     pcmanfm
     evince
-    mirage
+    # replacement for mirage:
+    sxiv
     tightvnc
     gnome3.dconf
     xdotool
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index 88a7c6882..3f2cf3096 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -7,7 +7,7 @@
     vlc
     mumble
     mplayer
-    quodlibet # exfalso
+    # quodlibet # exfalso
 
     plowshare
     streamripper
diff --git a/makefu/5pkgs/nixpkgs-pytools/default.nix b/makefu/5pkgs/nixpkgs-pytools/default.nix
new file mode 100644
index 000000000..35146d155
--- /dev/null
+++ b/makefu/5pkgs/nixpkgs-pytools/default.nix
@@ -0,0 +1,17 @@
+{pkgs, fetchFromGitHub}:
+with pkgs.python3.pkgs;
+
+buildPythonPackage rec {
+  pname = "nixpkgs-pytools";
+  version = "1.0.0-dev";
+  src = fetchFromGitHub {
+    owner = "nix-community";
+    repo = pname;
+    rev = "593443b5689333cad3b6fa5b42e96587df68b0f8";
+    sha256 = "1cjpngr1rn5q59a1krgmpq2qm96wbiirc8yf1xmm21p3mskb2db4";
+  };
+  propagatedBuildInputs = [
+    jinja2 setuptools
+  ];
+  checkInputs = [ black ];
+}
diff --git a/makefu/5pkgs/prison-break/default.nix b/makefu/5pkgs/prison-break/default.nix
index f86ac3762..051a46184 100644
--- a/makefu/5pkgs/prison-break/default.nix
+++ b/makefu/5pkgs/prison-break/default.nix
@@ -3,12 +3,12 @@ with pkgs.python3.pkgs;
 
 buildPythonPackage rec {
   pname = "prison-break";
-  version = "0.1.0";
+  version = "1.0.0";
   src = fetchFromGitHub {
     owner = "makefu";
     repo = pname;
-    rev = "5eed6371e151e716faafa054e005bd98d77b4b5d";
-    sha256 = "170zs9grbgkx83ghg6pm13v7vhi604y44j550ypp2x26nidaw63j";
+    rev = "1.0.0";
+    sha256 = "0ab42z6qr42vz4fc077irn9ykrrylagx1dzlw8dqcanf49dxd961";
   };
   propagatedBuildInputs = [
     docopt