ma wbob.r: add Brother QL-800 + ui

6 files changed, 39 insertions, 6 deletions

diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index ffc64587e..77f0f0337 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -22,7 +22,7 @@ in {
       # <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
       <stockholm/makefu/2configs/tinc/retiolum.nix>
       <stockholm/makefu/2configs/gui/wbob-kiosk.nix>
-      { environment.systemPackages = [  pkgs.nano ]; }
+      { environment.systemPackages = [ pkgs.brother_ql_web pkgs.nano ]; }
 
       # <stockholm/makefu/2configs/gui/studio-virtual.nix>
       # <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
diff --git a/makefu/2configs/bureautomation/brother-ql-web.nix b/makefu/2configs/bureautomation/brother-ql-web.nix
new file mode 100644
index 000000000..26887db03
--- /dev/null
+++ b/makefu/2configs/bureautomation/brother-ql-web.nix
@@ -0,0 +1,23 @@
+ {pkgs, ... }:
+ let
+   pkg = pkgs.brother_ql_web;
+ in { 
+  systemd.services.brother-ql-web = {
+    after = [ "network.target" ];
+    description = "Brother QL Web Interface";
+    wantedBy = [ "multi-user.target" ];
+    environment = {
+      FLASK_PRINTER = "usb://0x04f9:0x209b/000F1Z401759";
+      FLASK_MODEL = "QL-800";
+      #FLASK_SERVER_PORT = "8013";
+      #FLASK_LABEL_DEFAULT_SIZE = "d24";
+      #FLASK_LABEL_DEFAULT_QR_SIZE = "7";
+    };
+    serviceConfig = {
+        ExecStart = "${pkg}/bin/brother_ql_web";
+        DynamicUser = true;
+        SupplementaryGroups = "lp";
+        Restart = "always";
+    };
+  };
+}
diff --git a/makefu/2configs/bureautomation/printer.nix b/makefu/2configs/bureautomation/printer.nix
index f0cf495ef..86d5a4069 100644
--- a/makefu/2configs/bureautomation/printer.nix
+++ b/makefu/2configs/bureautomation/printer.nix
@@ -2,6 +2,9 @@
 let
   mainUser = config.krebs.build.user.name;
 in {
+  imports = [
+    ./brother-ql-web.nix
+  ];
   services.printing = {
     enable = true;
     drivers = with pkgs;[
diff --git a/makefu/2configs/gui/pipewire.nix b/makefu/2configs/gui/pipewire.nix
index eb94f75b7..d52681551 100644
--- a/makefu/2configs/gui/pipewire.nix
+++ b/makefu/2configs/gui/pipewire.nix
@@ -12,10 +12,9 @@
 
   services.pipewire = {
     enable = true;
-    systemWide = true;
+    # systemWide = true;
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    jack.enable = true;
   };
 }
diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index c67aa7cfb..3a21bf213 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -5,11 +5,11 @@
       ./base.nix
   ];
   users.users.kiosk = {
-    packages = [ pkgs.chromium pkgs.vscode ];
+    packages = with pkgs;[ chromium vscode spotify tartube-yt-dlp ];
     group = "kiosk";
     isNormalUser = true;
     uid = 1003;
-    extraGroups = [ "wheel" "audio" "pulse" ];
+    extraGroups = [ "wheel" "audio" "pulse" "pipewire" ];
   };
   users.groups.kiosk.gid = 989 ;
   services.xserver = {
@@ -31,7 +31,10 @@
   };
 
 
-  environment.systemPackages = [ pkgs.gnomeExtensions.appindicator ];
+  environment.systemPackages = [
+    pkgs.gnomeExtensions.appindicator pkgs.pavucontrol pkgs.jellyfin-media-player pkgs.chromium pkgs.firefox pkgs.kodi 
+    pkgs.pavucontrol
+];
   services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.gnome-settings-daemon ];
 
   systemd.services.xset-off = {
@@ -45,5 +48,9 @@
       Restart = "on-failure";
     };
   };
+  services.pipewire.systemWide = lib.mkForce false;
+  services.pipewire.config.pipewire-pulse = {
+    "pulse.properties"."server.address" = [ "unix:native" "tcp:4713" ];
+  };
 
 }
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 66a8d99d1..c057d1470 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -44,6 +44,7 @@ in {
     alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};
     alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";};
     alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";};
+    brother_ql_web = (builtins.getFlake "github:makefu/brother_ql_web?rev=a3f8625f48111da8cd6f8e562c966cdca445b82d").packages.x86_64-linux.default;
     qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { };
     inherit (callPackage ./devpi {}) devpi-web ;
     jellyfin = unstable.jellyfin;