5 files changed, 32 insertions, 26 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 9585d8599..3b084d35a 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -81,7 +81,7 @@ in {
       # ci
       # <stockholm/makefu/2configs/exim-retiolum.nix>
       <stockholm/makefu/2configs/git/cgit-retiolum.nix>
-      <stockholm/makefu/2configs/shack/events-publisher>
+      # <stockholm/makefu/2configs/shack/events-publisher>
       <stockholm/makefu/2configs/shack/gitlab-runner>
       <stockholm/makefu/2configs/remote-build/slave.nix>
       <stockholm/makefu/2configs/remote-build/aarch64-community.nix>
@@ -90,36 +90,20 @@ in {
       # services
       # <stockholm/makefu/2configs/sabnzbd.nix>
       <stockholm/makefu/2configs/mail/mail.euer.nix>
-      {
-        krebs.exim.enable = mkForce false;
-      }
+      { krebs.exim.enable = mkForce false; }
 
       # sharing
       <stockholm/makefu/2configs/share/gum.nix>
       <stockholm/makefu/2configs/torrent.nix>
-      { services.sickbeard = {
-        enable = true;
-        package = pkgs.sickgear;
-          user = "sickbeard";
-          group = "download";
-          port = 8280;
-        };
-        services.nginx.virtualHosts."sick.makefu.r" = {
-          locations."/".proxyPass = http://localhost:8280;
-          extraConfig = ''
-            if ( $server_addr = "${external-ip}" ) {
-              return 403;
-            }
-          '';
-        };
-        users.users.sickbeard.extraGroups = [ "nginx" ];
-      }
+      <stockholm/makefu/2configs/sickbeard>
+
       { nixpkgs.config.allowUnfree = true; }
       #<stockholm/makefu/2configs/retroshare.nix>
       ## <stockholm/makefu/2configs/ipfs.nix>
       #<stockholm/makefu/2configs/syncthing.nix>
       # <stockholm/makefu/2configs/opentracker.nix>
 
+
       ## network
       <stockholm/makefu/2configs/vpn/openvpn-server.nix>
       # <stockholm/makefu/2configs/vpn/vpnws/server.nix>
@@ -151,6 +135,8 @@ in {
       <stockholm/makefu/2configs/deployment/graphs.nix>
       <stockholm/makefu/2configs/deployment/owncloud.nix>
       <stockholm/makefu/2configs/deployment/boot-euer.nix>
+      <stockholm/makefu/2configs/shiori.nix>
+
       <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
       <stockholm/makefu/2configs/bgt/hidden_service.nix>
       <stockholm/makefu/2configs/bgt/backup.nix>
@@ -159,6 +145,11 @@ in {
 
       # sharing
       <stockholm/makefu/2configs/dcpp/airdcpp.nix>
+      { krebs.airdcpp.dcpp.shares = {
+          download.path = config.makefu.dl-dir + "/finished";
+          sorted.path = config.makefu.dl-dir + "/sorted";
+        };
+      }
       <stockholm/makefu/2configs/dcpp/hub.nix>
 
       ## Temporary:
diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hardware-config.nix
index e49b621e7..2d7efe9cf 100644
--- a/makefu/1systems/gum/hardware-config.nix
+++ b/makefu/1systems/gum/hardware-config.nix
@@ -69,6 +69,11 @@ in {
     fsType = "ext4";
     options = [ "nofail" ];
   };
+  fileSystems."/var/www/o.euer.krebsco.de" = {
+    device = "/dev/nixos/nextcloud";
+    fsType = "ext4";
+    options = [ "nofail" ];
+  };
   fileSystems."/var/lib/borgbackup" = {
     device = "/dev/nixos/backup";
     fsType = "ext4";
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index ac2677b7f..9b9b91a6f 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -11,6 +11,7 @@ in {
       ./hw/omo.nix
       #./hw/tsp.nix
       <stockholm/makefu>
+      { environment.systemPackages = with pkgs;[ tmux picocom ];}
       <stockholm/makefu/2configs/support-nixos.nix>
       <stockholm/makefu/2configs/zsh-user.nix>
       <stockholm/makefu/2configs/backup/state.nix>
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index ad7fc825c..7002b1002 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -47,6 +47,7 @@ in {
 
       <stockholm/makefu/2configs/bureautomation> # new hass entry point
       <stockholm/makefu/2configs/bureautomation/led-fader.nix>
+      <stockholm/makefu/2configs/bureautomation/visitor-photostore.nix>
       # <stockholm/makefu/2configs/bureautomation/mpd.nix> #mpd is only used for TTS
       <stockholm/makefu/2configs/mqtt.nix>
       (let
@@ -146,10 +147,8 @@ in {
   # 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" ];
   networking.interfaces.virbr1.ipv4.addresses = [{
     address = "10.8.8.11";
     prefixLength = 24;
@@ -161,8 +160,8 @@ in {
   hardware.cpu.intel.updateMicrocode = true;
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
 
-  boot.kernelModules = [ "kvm-intel"
-    "snd-seq" "snd-rawmidi"
+  boot.kernelModules = [
+    "kvm-intel" "snd-seq" "snd-rawmidi"
   ];
   fileSystems = {
     "/" = {
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 32a548954..ad9a3324b 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -15,6 +15,7 @@
 
       <stockholm/makefu/2configs/main-laptop.nix>
       <stockholm/makefu/2configs/extra-fonts.nix>
+      <stockholm/makefu/2configs/editor/neovim>
       <stockholm/makefu/2configs/tools/all.nix>
       { programs.adb.enable = true; }
 
@@ -58,6 +59,7 @@
       # Krebs
       <stockholm/makefu/2configs/tinc/retiolum.nix>
       # <stockholm/makefu/2configs/share/gum-client.nix>
+      # <stockholm/makefu/2configs/share/temp-share-samba.nix>
 
 
       # applications
@@ -68,7 +70,7 @@
 
       # Virtualization
       # <stockholm/makefu/2configs/virtualisation/libvirt.nix>
-      # <stockholm/makefu/2configs/virtualisation/docker.nix>
+      <stockholm/makefu/2configs/virtualisation/docker.nix>
       <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
       #{
       #  networking.firewall.allowedTCPPorts = [ 8080 ];
@@ -189,6 +191,7 @@
     "/home/makefu/.imapfilter"
     "/home/makefu/.mutt"
     "/home/makefu/docs"
+    "/home/makefu/notes"
     "/home/makefu/.password-store"
     "/home/makefu/.secrets-pass"
     "/home/makefu/.config/syncthing"
@@ -198,4 +201,11 @@
   services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/";
   # latest kernel (5.0) has issues with wifi card
   boot.kernelPackages = pkgs.linuxPackages;
+  # Bugfix for wifi card
+  powerManagement.resumeCommands = ''
+    sleep 2
+    echo 1 > /sys/bus/pci/devices/0000:03:00.0/remove
+    sleep 3
+    echo 1 > /sys/bus/pci/rescan
+  '';
 }