tabby services wip

Author: functora

nix/configuration.nix

@@ -945,12 +945,12 @@ in {
             show_volume_when_muted = true;
             icons_format = "";
           }
-          # {
-          #   block = "time";
-          #   format = " $timestamp.datetime(f:'%a %Y-%m-%d %R') ";
-          #   interval = 60;
-          #   icons_format = "";
-          # }
+          {
+            block = "time";
+            format = " $timestamp.datetime(f:'%a %Y-%m-%d %R') ";
+            interval = 60;
+            icons_format = "";
+          }
         ];
       };
       services.udiskie.enable = true;
@@ -1172,7 +1172,7 @@ in {
     #
     # Tabby
     #
-    services.tabby-socat.enable = true;
-    services.socat-tabby.enable = true;
+    services.tabby-server.enable = true;
+    services.tabby-socket.enable = true;
   };
 }

nix/firejail.nix

@@ -10,20 +10,22 @@ in rec {
   };
   mkFirejailCustom = {
     pkg,
-    exe,
-    dir,
+    dir ? null,
     net ? false,
+    grp ? null,
     cfg ? "",
+    exe,
   }: {
     "${pkg}" = {
       executable = exe;
-      profile = mkFirejailProfile {inherit pkg dir net cfg;};
+      profile = mkFirejailProfile {inherit pkg dir net grp cfg;};
     };
   };
   mkFirejailProfile = {
     pkg,
     dir,
     net,
+    grp,
     cfg,
   }:
     pkgs.writeText "${pkg}.local" (
@@ -64,7 +66,11 @@ in rec {
         shell none
 
         disable-mnt
-        private ''${HOME}/.firejail/${dir}
+        private ${
+          if dir == null
+          then ""
+          else ''''${HOME}/.firejail/${dir}''
+        }
         private-bin none
         private-cache
         private-cwd
@@ -94,13 +100,14 @@ in rec {
     );
   mkFirejailWrapper = {
     pkg,
-    exe,
-    dir,
+    dir ? null,
     net ? false,
+    grp ? null,
     cfg ? "",
     desktop ? null,
-    profile ? mkFirejailProfile {inherit pkg dir net cfg;},
+    profile ? mkFirejailProfile {inherit pkg dir net grp cfg;},
     extraArgs ? [],
+    exe,
   }:
     pkgs.runCommand "firejail-wrap"
     {
@@ -112,6 +119,11 @@ in rec {
       let
         firejailArgs = pkgs.lib.concatStringsSep " " (
           extraArgs
+          ++ (
+            if grp == null
+            then []
+            else ["--join-or-start=${grp}"]
+          )
           ++ (
             pkgs.lib.optional (profile != null) "--profile=${toString profile}"
           )
@@ -134,14 +146,15 @@ in rec {
     );
   mkFirejailService = {
     pkg,
-    exe,
-    dir,
+    dir ? null,
     net ? false,
+    grp ? null,
     cfg ? "",
     desktop ? null,
-    profile ? mkFirejailProfile {inherit pkg dir net cfg;},
+    profile ? mkFirejailProfile {inherit pkg dir net grp cfg;},
     extraArgs ? [],
     srv ? pkg,
+    exe,
   }: let
     drv = mkFirejailWrapper {
       inherit

nix/tabby-services.nix

@@ -5,7 +5,7 @@ let
 in [
   (
     fj.mkFirejailService {
-      pkg = "tabby-socat";
+      pkg = "tabby-server";
       dir = "tabby";
       cfg = ''
         env SWC_DEBUG=1
@@ -20,7 +20,7 @@ in [
   )
   (
     misc.mkService {
-      srv = "socat-tabby";
+      srv = "tabby-socket";
       mkExe = config: ''
         ${pkgs.socat}/bin/socat \
         TCP-LISTEN:8080,fork,reuseaddr,keepalive \