Merge remote-tracking branch 'gum/master'

8 files changed, 79 insertions, 7 deletions

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 80655f998..fee4145b9 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -130,7 +130,7 @@
       # Virtualization
       # <stockholm/makefu/2configs/virtualisation/libvirt.nix>
       <stockholm/makefu/2configs/virtualisation/docker.nix>
-      # <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
+      <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
       #{
       #  networking.firewall.allowedTCPPorts = [ 8080 ];
       #  networking.nat = {
diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix
index ac601845a..f0d663ee9 100644
--- a/makefu/1systems/x/x13/default.nix
+++ b/makefu/1systems/x/x13/default.nix
@@ -32,5 +32,9 @@
 
   users.groups.video = {};
   users.users.makefu.extraGroups = [ "video" ];
+
+  boot.extraModprobeConfig = ''
+    options thinkpad_acpi fan_control=1
+  '';
 }
 
diff --git a/makefu/2configs/bgt/social-to-irc.nix b/makefu/2configs/bgt/social-to-irc.nix
index 8e81f9b50..d02e60695 100644
--- a/makefu/2configs/bgt/social-to-irc.nix
+++ b/makefu/2configs/bgt/social-to-irc.nix
@@ -13,7 +13,7 @@
       channel = "#binaergewitter";
       notifyErrors = false;
       irc = {
-        host = "irc.freenode.net";
+        host = "irc.libera.chat";
         port = 6667;
       };
       #controller = {
diff --git a/makefu/2configs/deployment/dirctator.nix b/makefu/2configs/deployment/dirctator.nix
index 4f2f8818d..7303bb414 100644
--- a/makefu/2configs/deployment/dirctator.nix
+++ b/makefu/2configs/deployment/dirctator.nix
@@ -15,7 +15,7 @@ in {
     inputConfig = ''
       irc {
         channels => [ "#krebs", "#afra" ]
-        host => "irc.freenode.net"
+        host => "irc.hackint.org"
         nick => "dirctator"
       }
     '';
diff --git a/makefu/2configs/elchos/irc-token.nix b/makefu/2configs/elchos/irc-token.nix
index a91223b28..4844bf29f 100644
--- a/makefu/2configs/elchos/irc-token.nix
+++ b/makefu/2configs/elchos/irc-token.nix
@@ -17,7 +17,7 @@ in {
       echo "$message"
       LOGNAME=sec-announcer
       HOSTNAME=$(${pkgs.systemd}/bin/hostnamectl --transient)
-      IRC_SERVER=irc.freenode.net
+      IRC_SERVER=irc.hackint.org
       IRC_PORT=6667
       IRC_NICK=$HOSTNAME-$$
       IRC_CHANNEL='#eloop'
diff --git a/makefu/2configs/home/ham/automation/fenster_auf.nix b/makefu/2configs/home/ham/automation/fenster_auf.nix
index 871f248b9..0c57fc760 100644
--- a/makefu/2configs/home/ham/automation/fenster_auf.nix
+++ b/makefu/2configs/home/ham/automation/fenster_auf.nix
@@ -36,6 +36,7 @@ let
             platform = "state";
             entity_id = entity;
             to = "off";
+            for.seconds = 10;
           }
         ];
       condition = [
@@ -61,12 +62,13 @@ let
 in {
   services.home-assistant.config = {
     input_boolean = {
-      badezimmerfinester_lang_offen.name = "Badezimmer lange offen";
+      badezimmerfenster_lang_offen.name = "Badezimmer lange offen";
       duschfenster_lang_offen.name = "Duschfenster lange offen";
     };
     automation = [
       (fenster_geschlossen_lang "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
-      (fenster_geschlossen_lang "Duschfenster" "binary_sensor.badezimmer_fenster_contact")
+      (fenster_geschlossen_lang "Duschfenster" "binary_sensor.dusche_fenster_contact")
+
       (fenster_offen "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
       (fenster_offen "Duschfenster" "binary_sensor.dusche_fenster_contact")
     ];
diff --git a/makefu/2configs/systemdultras/ircbot.nix b/makefu/2configs/systemdultras/ircbot.nix
index 006cafec0..20cdf7ba7 100644
--- a/makefu/2configs/systemdultras/ircbot.nix
+++ b/makefu/2configs/systemdultras/ircbot.nix
@@ -11,7 +11,7 @@
     config = {
       channel = "#systemdultras";
       irc = {
-        host = "irc.freenode.net";
+        host = "irc.hackint.org";
         port = 6667;
       };
       notifyErrors = false;
diff --git a/makefu/5pkgs/chitubox/default.nix b/makefu/5pkgs/chitubox/default.nix
new file mode 100644
index 000000000..2e01949bb
--- /dev/null
+++ b/makefu/5pkgs/chitubox/default.nix
@@ -0,0 +1,66 @@
+{ stdenv, autoPatchelfHook, libglvnd
+, libgcrypt,zlib,glib,fontconfig,freetype,libdrm
+, libxkbcommon
+, libpulseaudio
+, xlibs
+, gst_all_1
+, kerberos
+, alsaLib
+}:
+# via https://raw.githubusercontent.com/simon-the-sourcerer-ab/chitubox/main/default.nix
+stdenv.mkDerivation rec {
+  pname = "chitubox";
+
+  version = "1.8.1";
+
+  src = builtins.fetchTarball {
+    url = "https://sac.chitubox.com/software/download.do?softwareId=17839&softwareVersionId=v${version}&fileName=CHITUBOX_V${version}.tar.gz";
+    sha256 = "08fh8w7s5qvlx6bhdg24g81a7zprq7n8m27w2vdv0cd8j0wixbsx";
+  };
+  nativeBuildInputs = [ autoPatchelfHook ];
+
+  buildInputs = with xlibs; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm 
+  libxkbcommon libpulseaudio kerberos alsaLib
+  xcbutilwm xcbutilimage xcbutilrenderutil xcbutilkeysyms
+  gst_all_1.gst-plugins-base gst_all_1.gstreamer
+];
+
+  buildPhase = ''
+    mkdir -p bin
+    mv CHITUBOX bin/chitubox
+
+    # Remove unused stuff
+    rm AppRun
+
+    # Place resources where ChiTuBox can expect to find them
+    mkdir ChiTuBox
+    mv resource ChiTuBox/
+
+    # Configure Qt paths
+    cat << EOF > bin/qt.conf
+      [Paths]
+      Prefix = $out
+      Plugins = plugins
+      Imports = qml
+      Qml2Imports = qml
+    EOF
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    mv * $out/
+  '';
+
+  autoPatchelfIgnoreMissingDeps=true;
+
+  meta = {
+    description = "A Revolutionary Tool to Change 3D Printing Processes within One Click";
+    homepage = "https://www.chitubox.com";
+    license = {
+      fullName = "ChiTuBox EULA";
+      shortName = "ChiTuBox";
+      url = "https://www.chitubox.com";
+    };
+  };
+}
+