eufon

commit 07ccbe113154bec327b12ee89e4922d33d1baa1a
parent 119f9f2427a755713b1eb0a76d5e09c45154f338
Author: Daniel Barlow <dan@telent.net>
Date:   Wed, 27 Apr 2022 13:26:54 +0100

add Just Browsing

Diffstat:
M
default.nix
 | 
7
+++++++
M
just/just.fnl
 | 
7
+++----
M
just/viewplex.fnl
 | 
4
++--
M
just/webview.fnl
 | 
2
+-
M
rc.fnl
 | 
1
+

5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/default.nix b/default.nix
@@ -3,7 +3,9 @@
 , fetchFromGitHub
 
 , fennel
+, glib-networking
 , gobject-introspection
+, webkitgtk
 , gtk3
 , gtk-layer-shell
 , lua5_3
@@ -15,6 +17,7 @@ let
     inherit (lua.pkgs) lgi buildLuaPackage;
     inherit lua;
   };
+  glib_networking_gio  = "${glib-networking}/lib/gio/modules";
   inifile = lua.pkgs.buildLuaPackage rec {
     pname  = "inifile";
     name = "${pname}-${version}";
@@ -43,16 +46,20 @@ let
 
   ]);
   kiwmi = callPackage ./kiwmi.nix { lua = lua5_3; };
+  GIO_EXTRA_MODULES = "${glib-networking}/lib/gio/modules";
 in
 stdenv.mkDerivation {
   pname = "eufon";
   version = "0.1";
+  inherit GIO_EXTRA_MODULES;
   buildInputs = [
     luaWithPackages
     kiwmi
+    glib-networking
     gobject-introspection.dev
     gtk-layer-shell
     gtk3
+    webkitgtk
   ];
 
   src = ./.;
diff --git a/just/just.fnl b/just/just.fnl
@@ -1,14 +1,13 @@
 (local lgi (require :lgi))
-(local inspect (require :inspect))
 
 (local { : Gtk : Gdk : WebKit2 : cairo } lgi)
 
 (if (os.getenv "JUST_HACKING")
     (local {: view} (require :fennel)))
 
-(local Listeners (require :listeners))
-(local Webview (require :webview))
-(local Viewplex (require :viewplex))
+(local Listeners (require :just.listeners))
+(local Webview (require :just.webview))
+(local Viewplex (require :just.viewplex))
 
 (local cache-dir (.. (os.getenv "HOME") "/.cache/just"))
 
diff --git a/just/viewplex.fnl b/just/viewplex.fnl
@@ -1,7 +1,7 @@
 (local { : Gtk : Gdk : WebKit2 : cairo } (require :lgi))
-(local Webview (require :webview))
 
-(local Listeners (require :listeners))
+(local Webview (require :just.webview))
+(local Listeners (require :just.listeners))
 
 (local thumbnail-width 300)
 (local thumbnail-height 200)
diff --git a/just/webview.fnl b/just/webview.fnl
@@ -1,7 +1,7 @@
 (local { : Gtk : Gdk : WebKit2 : cairo  : GLib : GObject } (require :lgi))
 (local posix (require :posix))
 
-(local Listeners (require :listeners))
+(local Listeners (require :just.listeners))
 
 ;; this is a hack, should find out what XDG says
 (local downloads-directory (.. (os.getenv "HOME") "/" "Downloads"))
diff --git a/rc.fnl b/rc.fnl
@@ -14,4 +14,5 @@
 (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 "foot")