From 0f43f0c1089ee9a814e49097e216c14ef083cfb7 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 12 Sep 2023 10:07:00 +0200
Subject: [PATCH] Commit config

---
 config/beeps.pr                   | 32 ++++++++-----------
 config/configdirs.pr              |  2 +-
 config/daemons/acme.pr            |  2 +-
 config/daemons/libnotify_actor.pr | 40 +++++++++++++++--------
 config/daemons/mpv.pr             | 10 +++---
 config/daemons/net_mapper.pr      | 35 +++++++++++++-------
 config/daemons/nix_actor.pr       |  4 ---
 config/daemons/syndev.pr          | 17 ++++++++--
 config/daemons/waybar.pr          |  8 ++---
 config/daemons/yggdrasilctl.pr    |  4 +--
 config/dataspaces/nix.pr          |  3 +-
 config/dataspaces/swaybarspace.pr |  4 ---
 config/dataspaces/unix_socket.pr  |  2 --
 config/handlers-example.pr        | 10 +++++-
 config/net.pr                     |  5 ---
 config/nix.pr                     | 53 ++++++++++++++++---------------
 config/notifications.pr           | 12 +++++++
 config/simplex.pr                 |  8 +++++
 config/status.pr                  |  4 +--
 19 files changed, 148 insertions(+), 107 deletions(-)
 delete mode 100644 config/dataspaces/swaybarspace.pr
 delete mode 100644 config/net.pr

diff --git a/config/beeps.pr b/config/beeps.pr
index 6a339c6..09f31f0 100644
--- a/config/beeps.pr
+++ b/config/beeps.pr
@@ -1,36 +1,30 @@
-? <mpv ?mpv> $mpv [
+? <mpv ?mpvSpace> [
 
-  $config ? <socketspace ?beepSpace> [
+  $config ? <socketspace ?beepSpace> $beepSpace [
 
     $beepSpace ?? <beep 0> [
-      $mpv ! <play-file "/home/emery/lib/syndicate/lcars-0.mp3"> ]
+      $mpvSpace ! <play-file "/home/emery/star-trek-audio/elite-force/button1.flac"> ]
 
     $beepSpace ?? <beep 1> [
-      $mpv ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/consolewarning.mp3"> ]
+      $mpvSpace ! <play-file "/home/emery/star-trek-audio/elite-force/button5.flac"> ]
 
     $beepSpace ?? <beep private-message> [
-      $mpv ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/computerbeep_19.mp3"> ]
+      $mpvSpace ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/computerbeep_19.mp3"> ]
 
     $beepSpace ?? <beep highlight> [
-      $mpv ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/computerbeep_9.mp3"> ]
+      $mpvSpace ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/computerbeep_9.mp3"> ]
 
-  ]
 
-  $config ? <machine-dataspace ?ds> $ds [
-    ?? <acpi_event "button/power" _ _ _> [
-      $mpv ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/toscomputer/tos_computerthinking1_ep.mp3">
+  $config ? <machine-dataspace ?machine> $machine [
+    ?? <uevent "power_supply" _ change {POWER_SUPPLY_ONLINE: 1} _> [
+      $mpvSpace ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/computerbeep_1.mp3">
     ]
-
-    ?? <event "power_supply" _ change {POWER_SUPPLY_ONLINE: 1} _> [
-      $mpv ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/computerbeep_1.mp3">
+    ?? <uevent "power_supply" _ change {POWER_SUPPLY_ONLINE: 0} _> [
+      $mpvSpace ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/alert24.mp3">
     ]
-
-    ?? <event "power_supply" _ change {POWER_SUPPLY_ONLINE: 0} _> [
-      $mpv ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/alert24.mp3">
+    ?? <power-supply-capacity-level "Low"> [$mpvSpace ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/alert24.mp3"> ]
+    ?? <power-supply-capacity-level "Critical"> [$mpvSpace ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/alert24.mp3"> ]
     ]
   ]
 
-  $config ? <built _ _ ?hash> [
-    $mpv ! <play-file "/home/emery/star-trek-audio/www.trekcore.com/audio/computer/computerbeep_26.mp3">
-  ]
 ]
diff --git a/config/configdirs.pr b/config/configdirs.pr
index d73435c..5505605 100644
--- a/config/configdirs.pr
+++ b/config/configdirs.pr
@@ -1 +1 @@
-<require-service <config-watcher "/run/user/emery/syndicate" $.>>
+<require-service <config-watcher "/run/user/1000/syndicate" $.>>
diff --git a/config/daemons/acme.pr b/config/daemons/acme.pr
index c354e28..25a85e4 100644
--- a/config/daemons/acme.pr
+++ b/config/daemons/acme.pr
@@ -10,7 +10,7 @@
   argv: ["/etc/profiles/per-user/emery/bin/9" "acme" "-f" "/mnt/font/FiraSans-Regular/12a/font" "-F" "/mnt/font/FiraCode-Light/10a/font" ]
   protocol: none}>
 
-<daemon fontsrv {
+<_gui fontsrv {
   argv: "/etc/profiles/per-user/emery/bin/9 fontsrv"
   protocol: none}>
 
diff --git a/config/daemons/libnotify_actor.pr b/config/daemons/libnotify_actor.pr
index 8ac58c3..045dec9 100644
--- a/config/daemons/libnotify_actor.pr
+++ b/config/daemons/libnotify_actor.pr
@@ -1,17 +1,29 @@
-<require-service <daemon libnotify_actor>>
 ? <built libnotify_actor ?path ?sum> [
-  <daemon libnotify_actor {
-    argv: [$path]
-    protocol: application/syndicate
-    env: {
-      ; SYNDICATE_DEBUG: "1"
-      BUILD_SUM: $sum
-    }
-  }>
-]
-
-? <notifications ?notifyspace> [
-  ? <service-object <daemon libnotify_actor> ?cap> [
-    $cap { dataspace: $notifyspace }
+  ? { argv: ["sway-env-magic-cookie"]
+       env: {
+        "DBUS_SESSION_BUS_ADDRESS" : ?DBUS_SESSION_BUS_ADDRESS
+        "DESKTOP_STARTUP_ID" : ?DESKTOP_STARTUP_ID
+        "DISPLAY": ?DISPLAY
+        "SWAYSOCK" : ?SWAYSOCK
+        "WAYLAND_DISPLAY" : ?WAYLAND_DISPLAY
+        "XDG_SEAT" : ?XDG_SEAT
+        "XDG_SESSION_TYPE" : ?XDG_SESSION_TYPE
+      }
+  }
+  [
+    <daemon libnotify_actor {
+      argv: ["dbus-launch" $path]
+      protocol: application/syndicate
+      env: {
+        "BUILD_SUM": $sum
+        "DBUS_SESSION_BUS_ADDRESS" : $DBUS_SESSION_BUS_ADDRESS
+        "DESKTOP_STARTUP_ID": $DESKTOP_STARTUP_ID
+        "DISPLAY": $DISPLAY
+        "SWAYSOCK" : $SWAYSOCK
+        "WAYLAND_DISPLAY" : $WAYLAND_DISPLAY
+        "XDG_SEAT" : $XDG_SEAT
+        "XDG_SESSION_TYPE" : $XDG_SESSION_TYPE
+      }
+    }>
   ]
 ]
diff --git a/config/daemons/mpv.pr b/config/daemons/mpv.pr
index f82cbef..85d192c 100644
--- a/config/daemons/mpv.pr
+++ b/config/daemons/mpv.pr
@@ -1,7 +1,9 @@
 let ?socketPath = "/run/user/1000/mpv.sock"
 
 let ?mpvSpace = dataspace
+<bind <ref { oid: "mpv" key: #x"" }> $mpvSpace #f>
 $mpvSpace [
+
   ; announce the dataspace when the translator is connected
   ? <connected $socketPath> [
     $config <mpv $mpvSpace>
@@ -9,15 +11,15 @@ $mpvSpace [
 
   ; translate <play-file …> to an MPV command
   ?? <play-file ?file> [
-    ! <send-json { "command": ["loadfile" $file "append-play"] }>
+    ! <send { "command": ["loadfile" $file "append-play"] }>
   ]
 
   ; log anything that comes back from MPV
-  ; ?? <recv-json ?js> [ $log ! <log "-" { mpv: $js }> ]
+  ; ?? <recv ?js> [ $log ! <log "-" { mpv: $js }> ]
 
   ; clear the playlist on idle so it doesn't grow indefinitely
-  ?? <recv-json {"event": "idle"}> [
-    ! <send-json { "command": ["playlist-clear"] }>
+  ?? <recv {"event": "idle"}> [
+    ! <send { "command": ["playlist-clear"] }>
   ]
 ]
 
diff --git a/config/daemons/net_mapper.pr b/config/daemons/net_mapper.pr
index 2a94ab8..6c4ec1b 100644
--- a/config/daemons/net_mapper.pr
+++ b/config/daemons/net_mapper.pr
@@ -1,16 +1,27 @@
 ? <machine-dataspace ?machine> [
-    ; <require-service <daemon net_mapper>>
-    ? <built net_mapper ?path ?sum> [
-      <daemon net_mapper {
-        argv: [$path]
-        protocol: application/syndicate
-        env: {
-          BUILD_SUM: $sum
-        }
-      }>
-    ]
-    ? <service-object <daemon net_mapper> ?cap> [
+  $machine ? <Observe <rec rtt _>_> [
+    $config <require-service <daemon net_mapper>>
+    $config ? <service-object <daemon net_mapper> ?cap> [
       $cap { dataspace: $machine }
     ]
-
+  ]
+]
+
+? <socketspace ?socketspace> [
+  $socketspace ? <Observe <rec rtt _>_> [
+    $config <require-service <daemon net_mapper>>
+    $config ? <service-object <daemon net_mapper> ?cap> [
+      $cap { dataspace: $socketspace }
+    ]
+  ]
+]
+
+? <built net_mapper ?path ?sum> [
+  <daemon net_mapper {
+    argv: ["/home/emery/src/bin/net_mapper"]
+    protocol: application/syndicate
+    env: {
+      BUILD_SUM: $sum
+    }
+  }>
 ]
diff --git a/config/daemons/nix_actor.pr b/config/daemons/nix_actor.pr
index a497a4b..5a17482 100644
--- a/config/daemons/nix_actor.pr
+++ b/config/daemons/nix_actor.pr
@@ -7,7 +7,3 @@
     }
   }>
 ]
-
-? <nixspace ?nixspace> [
-  <require-service <daemon nix_actor>>
-]
diff --git a/config/daemons/syndev.pr b/config/daemons/syndev.pr
index 6c31328..c8a2785 100644
--- a/config/daemons/syndev.pr
+++ b/config/daemons/syndev.pr
@@ -1,20 +1,31 @@
 ? <machine-dataspace ?machine> [
 
   <require-service <daemon syndev>>
+  <require-service <daemon power_monitor>>
+  <depends-on <daemon power_monitor> <service-state <daemon syndev> ready>>
 
   ? <built syndev ?path ?sum> [
     <daemon syndev {
       argv: [$path]
       protocol: application/syndicate
-      env: {
-        BUILD_SUM: $sum
-      }
+      env: { BUILD_SUM: $sum }
+    }>
+  ]
+
+  ? <built power_monitor ?path ?sum> [
+    <daemon power_monitor {
+      argv: [$path]
+      protocol: application/syndicate
+      env: { BUILD_SUM: $sum }
     }>
   ]
 
   ? <service-object <daemon syndev> ?cap> [
     $cap { machine: $machine }
   ]
+  ? <service-object <daemon power_monitor> ?cap> [
+    $cap { machine: $machine }
+  ]
 
   $machine ?? ?x [
     $log ! <log "-" { machine-message: $x }>
diff --git a/config/daemons/waybar.pr b/config/daemons/waybar.pr
index a1cecd6..f4f1e7f 100644
--- a/config/daemons/waybar.pr
+++ b/config/daemons/waybar.pr
@@ -1,6 +1,4 @@
 ; <require-service <daemon waybar>>
-;<gui waybar {
-;  argv: "/run/current-system/sw/bin/waybar"
-;}>
-[]
-
+<gui waybar {
+  argv: "/run/current-system/sw/bin/waybar"
+}>
diff --git a/config/daemons/yggdrasilctl.pr b/config/daemons/yggdrasilctl.pr
index aed1b6c..8046081 100644
--- a/config/daemons/yggdrasilctl.pr
+++ b/config/daemons/yggdrasilctl.pr
@@ -1,8 +1,8 @@
-<require-service <daemon yggdrasilctl>>
+; <require-service <daemon yggdrasilctl>>
 
 let ?ds = dataspace
 $ds [
-  ?? <recv-json ?js> [ $log ! <log "-" { yggdrasilctl: $js }> ]
+  ?? <recv ?js> [ $log ! <log "-" { yggdrasilctl: $js }> ]
 ]
 
 ? <built json_socket_translator ?path ?sum> [
diff --git a/config/dataspaces/nix.pr b/config/dataspaces/nix.pr
index 471d907..82a4ce2 100644
--- a/config/dataspaces/nix.pr
+++ b/config/dataspaces/nix.pr
@@ -1,2 +1,3 @@
 let ?nixspace = dataspace
-; <nixspace $nixspace>
+<nixspace $nixspace>
+<bind <ref {oid: "nix" key: #x""}> $nixspace #f>
diff --git a/config/dataspaces/swaybarspace.pr b/config/dataspaces/swaybarspace.pr
deleted file mode 100644
index 52dfbab..0000000
--- a/config/dataspaces/swaybarspace.pr
+++ /dev/null
@@ -1,4 +0,0 @@
-let ?swaybarspace = dataspace
-<swaybarspace $swaybarspace>
-<bind <ref { oid: "syndicate" key: #x"" }> $swaybarspace #f>
-<require-service <relay-listener <unix "/run/user/emery/swaybarspace"> $gatekeeper>>
diff --git a/config/dataspaces/unix_socket.pr b/config/dataspaces/unix_socket.pr
index c814767..7180de1 100644
--- a/config/dataspaces/unix_socket.pr
+++ b/config/dataspaces/unix_socket.pr
@@ -1,7 +1,5 @@
 let ?socketspace = dataspace
-<require-service <relay-listener <tcp "127.0.0.1" 9001> $gatekeeper>>
 <require-service <relay-listener <unix "/run/user/1000/dataspace"> $gatekeeper>>
-<require-service <relay-listener <unix "/run/user/emery/dataspace"> $gatekeeper>>
 
 <bind <ref { oid: "syndicate" key: #x"" }> $socketspace #f>
 
diff --git a/config/handlers-example.pr b/config/handlers-example.pr
index 72180bc..50bf99d 100644
--- a/config/handlers-example.pr
+++ b/config/handlers-example.pr
@@ -1,3 +1,5 @@
+<require-service <daemon uri_runner>>
+
 ; the <exec-space #!…> dataspace starts programs when it receives exec messages
 ? <exec-space ?execspace> [
 
@@ -30,11 +32,17 @@
 
   <action-handler "file://(.*\\.eris)" $execspace
     <exec ["/home/emery/src/bin/erisopen" "$#"]>>
+
+  <action-handler "(.*mp4)" $execspace
+    <exec ["/run/current-system/sw/bin/mpv" "$#"]>>
+
+  <action-handler "(.*mkv)" $execspace
+    <exec ["/run/current-system/sw/bin/mpv" "$#"]>>
+
 ]
 
 ; when mpv is available send it commands directly
 ? <mpv ?mpv> [
-  <action-handler "(.*mp4)" $mpv <play-file "$1">>
   <action-handler "(.*mp3)" $mpv <play-file "$1">>
   <action-handler "(.*wav)" $mpv <play-file "$1">>
 ]
diff --git a/config/net.pr b/config/net.pr
deleted file mode 100644
index ed1c3bf..0000000
--- a/config/net.pr
+++ /dev/null
@@ -1,5 +0,0 @@
-? <machine-dataspace ?machine> $machine [
-  ? <rtt "10.0.33.136" ?min ?avg ?max> [
-    $log ! <log "-" { ping: { min: $min avg: $avg max: $max } }>
-  ]
-]
diff --git a/config/nix.pr b/config/nix.pr
index 2747a6c..8fca1d1 100644
--- a/config/nix.pr
+++ b/config/nix.pr
@@ -1,38 +1,39 @@
 ? <nixspace ?nixspace> $nixspace [
 
+  ? <Observe <rec nixVersion _> _> [
+    $config <require-service <daemon nix_actor>>
+  ]
+
+  ? <Observe <rec eval _> _> [
+    $config <require-service <daemon nix_actor>>
+  ]
+
+  ? <Observe <rec eval _> _> [
+    $config <require-service <daemon nix_actor>>
+  ]
+
+  ? <Observe <rec instantiate _> _> [
+    $config <require-service <daemon nix_actor>>
+  ]
+
+  ? <Observe <rec realise _> _> [
+    $config <require-service <daemon nix_actor>>
+  ]
+
+  ;? <eval  "let pkgs = import /nix/var/nix/profiles/per-user/root/channels/nixos/pkgs/top-level/impure.nix {}; in pkgs.hello.meta" {} ?result> [
+  ;  $log ! <log "-" { hello-meta: $result }>
+  ;]
+
   ; ? <instantiate "let pkgs = import <nixpkgs> {}; in pkgs.hello" { } ?drv> [
   ;   ? <realise $drv ?outputs> [
   ;     $log ! <log "-" { "hello": $outputs }>
   ;   ]
   ; ]
 
-  ? <eval_ "let pkgs = import /nix/var/nix/profiles/per-user/root/channels/nixos/pkgs/top-level/impure.nix {}; in pkgs.hello.meta" {} ?result> [
-    $log ! <log "-" { hello-meta: $result }>
-  ]
+  ;? <eval  "let pkgs = import /nix/var/nix/profiles/per-user/root/channels/nixos/pkgs/top-level/impure.nix {}; in pkgs.hello.meta" {} ?result> [
+  ;  $log ! <log "-" { hello-meta: $result }>
+  ;]
 
-  ? <eval "<nixpkgs>" {} ?result> [
-    $log ! <log "-" { nixpkgs: $result }>
-  ]
-
-  ? <eval "__currentSystem" {} ?result> [
-    $log ! <log "-" { __currentSystem: $result }>
-  ]
-
-  ? <eval "__currentTime" {} ?result> [
-    $log ! <log "-" { __currentTime: $result }>
-  ]
-
-  ? <eval "__langVersion" {} ?result> [
-    $log ! <log "-" { __langVersion: $result }>
-  ]
-
-  ? <eval "__nixPath" {} ?result> [
-    $log ! <log "-" { __nixPath: $result }>
-  ]
-
-  ? <nixVersion ?version> [
-    $log ! <log "-" { nixVersion: $version }>
-  ]
 
 ;  ? <missing ["/nix/store/p7fnjrbvmpwl192ir8p2ixfym68j7sgv-invidious-unstable-2023-05-08"] _ ?subs _ ?dlSize ?narSize> [
 ;    $log ! <log "-" { invidious-unstable-2023-05-08: {
diff --git a/config/notifications.pr b/config/notifications.pr
index 55353b1..c0e69a5 100644
--- a/config/notifications.pr
+++ b/config/notifications.pr
@@ -1,8 +1,20 @@
+<require-service <daemon libnotify_actor>>
+
 ? <notifications ?notifyspace> [
+  $config ? <service-object <daemon libnotify_actor> ?cap> [
+    $cap { dataspace: $notifyspace }
+  ]
+
   ? <built _ ?path _> [
     $notifyspace ! <notify $path {} >
   ]
 
+  ? <socketspace ?socketspace> [
+    $socketspace ?? <msg ?summary> [
+      $notifyspace ! <notify $summary {} >
+    ]
+  ]
+
   ? <nixspace ?nixspace> [
     $nixspace ? <nix-build _ ?output> [
       $notifyspace ! <notify $output {} >
diff --git a/config/simplex.pr b/config/simplex.pr
index f3ee370..7728576 100644
--- a/config/simplex.pr
+++ b/config/simplex.pr
@@ -25,4 +25,12 @@
 			database: "/home/emery/.simplex/simplex_v1_chat.db"
 		}
 	]
+
+	? <socketspace ?socketspace> [
+		$config <require-service <daemon simplex_bot_actor>>
+		$config ? <service-object <daemon simplex_bot_actor> ?cap> [
+			$cap { dataspace: $socketspace url: "ws://127.0.0.1:5225/" }
+		]
+	]
+
 ]
diff --git a/config/status.pr b/config/status.pr
index 5b1c406..ac78ac0 100644
--- a/config/status.pr
+++ b/config/status.pr
@@ -7,12 +7,12 @@
     ]
   ]
 
-  $swaybarspace <swaybar-status { "full_text": "hello world" }>
   $config ? { argv: ["sway-env-magic-cookie"]
        env: {
         "DESKTOP_STARTUP_ID": ?DESKTOP_STARTUP_ID
         "XDG_ACTIVATION_TOKEN": ?XDG_ACTIVATION_TOKEN
       } } [
+
     $swaybarspace <swaybar-status {
                 "full_text": "Thu 30 May 2019 02:09:15",
                 "short_text": "02:09",
@@ -32,7 +32,5 @@
                 "separator_block_width": 5,
                 "markup": "none"
       }>
-    ]
   ]
 ]
-