tabby-socket -> tabby-admin

Author: functora

nix/configuration.nix

@@ -773,6 +773,16 @@ in {
             -file ./SimpleSlots.1.1.pk7
         '';
       }
+      // fj.mkFirejailCustom {
+        pkg = "doom-siren";
+        dir = "doom";
+        exe = ''
+          ${pkgs.gzdoom}/bin/gzdoom \
+            -iwad ./freedoom-0.13.0/freedoom2.wad \
+            -file ./siren.pk3 \
+            -file ./SimpleSlots.1.1.pk7
+        '';
+      }
       // fj.mkFirejailCustom {
         pkg = "doom-ashes1";
         dir = "doom";
@@ -819,6 +829,13 @@ in {
           }
         }/bin/tabby-agent";
       }
+      // fj.mkFirejailCustom {
+        pkg = "tabby-admin";
+        dir = "tabby";
+        exe = "${
+          import ./tabby-admin.nix {sock = "./tabby.sock";}
+        }/bin/tabby-admin";
+      }
       // fj.mkFirejailCustom {
         pkg = "vi";
         exe = "${vi}/bin/vi";
@@ -865,6 +882,7 @@ in {
         niv
         zip
         unzip
+        unrar-free
         pciutils
         docker-client
         docker-compose
@@ -1238,6 +1256,5 @@ in {
     # Tabby
     #
     services.tabby-server.enable = true;
-    services.tabby-socket.enable = true;
   };
 }

nix/tabby-admin.nix

@@ -0,0 +1,24 @@
+{sock}: let
+  pkgs = import ./nixpkgs.nix;
+in
+  pkgs.writeShellApplication {
+    name = "tabby-admin";
+    text = ''
+      ${pkgs.socat}/bin/socat \
+        TCP-LISTEN:8080,fork,reuseaddr,keepalive \
+        UNIX:${sock},keepalive &
+
+      SOCAT_PID="$!"
+
+      cleanup() {
+        kill "$SOCAT_PID" 2>/dev/null
+        exit 0
+      }
+
+      trap cleanup SIGINT SIGTERM EXIT
+
+      ${pkgs.vimb}/bin/vimb http://localhost:8080
+
+      cleanup
+    '';
+  }

nix/tabby-services.nix

@@ -20,16 +20,4 @@ in [
       '';
     }
   )
-  (
-    misc.mkService {
-      srv = "tabby-socket";
-      mkExe = config: ''
-        ${pkgs.socat}/bin/socat \
-          TCP-LISTEN:8080,fork,reuseaddr,keepalive \
-          UNIX:/home/${
-          config.services.functora.userName
-        }/.firejail/tabby/tabby.sock,keepalive
-      '';
-    }
-  )
 ]