Compare commits

...

3 Commits

Author SHA1 Message Date
Ehmry - 64e8e4308a Update submodules 2023-09-12 10:09:28 +02:00
Ehmry - 0f43f0c108 Commit config 2023-09-12 10:07:00 +02:00
Ehmry - 5e71c18063 Add well_of_text submodule 2023-09-12 10:06:00 +02:00
28 changed files with 165 additions and 112 deletions

9
.gitmodules vendored
View File

@ -190,3 +190,12 @@
[submodule "icalendar_actor"]
path = icalendar_actor
url = https://git.syndicate-lang.org/ehmry/icalendar_actor.git
[submodule "nimble/nim-sys"]
path = nimble/nim-sys
url = https://github.com/alaviss/nim-sys.git
[submodule "immutulator"]
path = immutulator
url = https://git.syndicate-lang.org/ehmry/video_immutulator.git
[submodule "well_of_text"]
path = well_of_text
url = https://git.sr.ht/~ehmry/well_of_text

2
cbor

@ -1 +1 @@
Subproject commit a4a1affd45ba90bea24e08733ae2bd02fe058166
Subproject commit 05198e72c16df559ceb6af7e891219ef092ea875

View File

@ -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">
]
]

View File

@ -1 +1 @@
<require-service <config-watcher "/run/user/emery/syndicate" $.>>
<require-service <config-watcher "/run/user/1000/syndicate" $.>>

View File

@ -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}>

View File

@ -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
}
}>
]
]

View File

@ -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"] }>
]
]

View File

@ -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
}
}>
]

View File

@ -7,7 +7,3 @@
}
}>
]
? <nixspace ?nixspace> [
<require-service <daemon nix_actor>>
]

View File

@ -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 }>

View File

@ -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"
}>

View File

@ -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> [

View File

@ -1,2 +1,3 @@
let ?nixspace = dataspace
; <nixspace $nixspace>
<nixspace $nixspace>
<bind <ref {oid: "nix" key: #x""}> $nixspace #f>

View File

@ -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>>

View File

@ -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>

View File

@ -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">>
]

View File

@ -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 } }>
]
]

View File

@ -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: {

View File

@ -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 {} >

View File

@ -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/" }
]
]
]

View File

@ -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"
}>
]
]
]

@ -1 +1 @@
Subproject commit d090cc2a1f50ead751538cab4eb850b686f3f87f
Subproject commit 71e5a5daafe9b5084f7e805f4270486742496f46

@ -1 +1 @@
Subproject commit 35aa0756c4e75ea4ec60812e8f345d5d8273ddff
Subproject commit d955d58b3cd3ebce37ea69c01ec5371344b7a1a9

1
immutulator Submodule

@ -0,0 +1 @@
Subproject commit ca3500cdad2085fa5dba1a0568b4e8f4cf089f95

1
nimble/nim-sys Submodule

@ -0,0 +1 @@
Subproject commit c632f88b3bb8b5225bc57048399911bb74567cec

@ -1 +1 @@
Subproject commit 8e06628d2113116e86635e97ebceae08edc2ed6c
Subproject commit 6b6187f508595ce4a8351f8cb56ccc987326e13a

@ -1 +1 @@
Subproject commit 3e5f791d70050f41816ee4e77efbbd307b7f92e9
Subproject commit d7dd513c9795e0331cec8c3b8cf6ad20a318f68c

1
well_of_text Submodule

@ -0,0 +1 @@
Subproject commit 7d910a0ce51f9e73954ed3f09d7290cb4c90e4bd