Merge branch 'main' of gti.telent.net:dan/eufon

crier/init.fnl

@@ -8,7 +8,7 @@
 (local Gtk lgi.Gtk)
 
 (fn relpath [filename]
-  (.. "crier/" filename))
+  (.. (os.getenv "EUFON_PATH") "/crier/" filename))
 
 (local dbus-service-attrs
        {

default.nix

@@ -79,9 +79,12 @@ stdenv.mkDerivation {
     substitute bin/eufonctl.sh $out/bin/eufonctl \
       --replace SOCAT=socat SOCAT=${socat}/bin/socat
     makeWrapper ${kiwmi}/bin/kiwmi $out/bin/eufon \
-      --set LUA_PATH ".;$out/?.fnl;$LUA_PATH" \
-      --set LUA_CPATH ".;$out/?.so;$LUA_CPATH" \
-      --prefix PATH : ${kiwmi}/bin \
+      --set LUA_PATH "$out/?.lua;$LUA_PATH" \
+      --set LUA_CPATH "$LUA_CPATH" \
+      --prefix PATH : ${kiwmi}/bin:${luaWithPackages}/bin \
+      --set EUFON_PATH "$out" \
+      --set GIO_EXTRA_MODULES "${glib-networking}/lib/gio/modules" \
+      --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
       --add-flags "-c $out/init.lua"
 
     chmod +x $out/bin/eufon

eufon.fnl

@@ -34,6 +34,9 @@
   (print "WHOOSH")
   true)
 
+(fn eufon-path [f]
+  (.. (os.getenv "EUFON_PATH") "/" f))
+
 (fn show-overview []
   (let [facets 64
         angle (/ (* 2 math.pi) facets)
@@ -135,9 +138,9 @@
    (resize-wayland-backend output)
    (let [(width height) (output:size)
          r (output:renderer)
-         kill (texture.from-file r "close-window.png")
-         launch (texture.from-file r "launcher.png")
-         overview (texture.from-file r "carousel.png")]
+         kill (texture.from-file r (eufon-path "close-window.png"))
+         launch (texture.from-file r (eufon-path "launcher.png"))
+         overview (texture.from-file r (eufon-path "carousel.png"))]
      (output:on "render"
                 (fn [{: output : renderer}]
                   (let [buttons (placements output)]
@@ -185,12 +188,11 @@
             (view:on "request_move" #(view:imove))
             (view:on "request_resize" (fn [ev] (view:iresize ev.edges)))))
 
-
-;(kiwmi:spawn "swaybg -c '#ff00ff'")
-(kiwmi:spawn "lua -l fennelrun modeline.fnl")
-(kiwmi:spawn "lua -l fennelrun saturn/main.fnl")
-(kiwmi:spawn "lua -l fennelrun crier/crier.fnl")
-(kiwmi:spawn "lua -l fennelrun just/just.fnl")
+(kiwmi:spawn "swaybg -c '#ff00ff'")
+(kiwmi:spawn "lua -l fennelrun modeline")
+;(kiwmi:spawn "lua -l fennelrun saturn")
+(kiwmi:spawn "lua -l fennelrun crier")
+(kiwmi:spawn "lua -l fennelrun just https://brvt.telent.net")
 ;(kiwmi:spawn "foot")
 
 ;; Local Variables:

fennelrun.lua

@@ -1,4 +1,6 @@
 local fennel = require("fennel")
 table.insert(package.loaders or package.searchers, fennel.searcher)
--- print(fennel.view(arg))
-fennel.dofile(arg[0], { correlate = true })
+fennel.path = os.getenv("EUFON_PATH")  .. "/?.fnl;" ..
+   os.getenv("EUFON_PATH")  .. "/?/init.fnl;"
+
+require(arg[0])

init.lua

@@ -3,4 +3,5 @@ print(os.getenv("LUA_CPATH"))
 
 local fennel = require("fennel")
 table.insert(package.loaders or package.searchers, fennel.searcher)
-fennel.dofile("rc.fnl")
+fennel.path = fennel.path .. ";" .. os.getenv("EUFON_PATH") .. "/?.fnl"
+require("eufon")

modeline.fnl

@@ -9,7 +9,7 @@
 ;(local battery (require :blinkenlicht.metric.battery))
 (local cpustat (require :blinkenlicht.metric.cpustat))
 
-(stylesheet "modeline.css")
+(stylesheet (.. (os.getenv "EUFON_PATH")  "/modeline.css"))
 
 (fn battery-icon-codepoint [status percent]
   (if (= status "Charging") 0xf0e7