Compare commits

..

No commits in common. "c485e59c3a6fbc9efb5cf06f5a20da2eb0446868" and "32e78a24dbdaf25e2afe470d2ba246df0785d480" have entirely different histories.

4 changed files with 21 additions and 20 deletions

View File

@ -21,24 +21,23 @@ repo is basically in an advanced state of brokenness_
## Running the shell/apps locally ## Running the shell/apps locally
$ nix-shell Eufon is intendfed for phones, but you may prefer to develop on a
nix-shell$ kiwmi -c init.lua desktop device of some kind, especially if you're changing C code and
have that edit/compile run cycle to go round. You can start the shell
locally with
This works on desktop or on mobile - Kiwmi is built on wlroots, which $ nix-shell --run "kiwmi -c init.lua"
will open a window on your existing Wayland or X11 desktop if you're
running one.
If you're connected over ssh and want to run Kiwmi on the console, `shell.nix` sets `LUA_PATH` and `LUA_CPATH` settings appropriately -
further contortions are required as you don't have the permissions if you want to write a real derivation (I'll get to it eventually)
by default: run this before attempting to start Kiwmi you'll need to sort that out yourself. Nix generates a wrapper script
for the Lua interpreter itself, but it doesn't do the same for kiwmi.
nix-shell -p seatd --run "sudo -b seatd -u $USER"
## Connecting to the repl ## Connecting to the repl
By default Eufon opens a Unix socket to which you can connect to If you are using the example rc.fnl, it opens a Unix socket to which
interact with a Fennel REPL. The `eufonctl` script is a wrapper around you can connect to interact with a Fennel REPL. The `eufonctl`
[socat](http://www.dest-unreach.org/socat/) script is a wrapper around [socat](http://www.dest-unreach.org/socat/)
$ eufonctl $WAYLAND_DISPLAY $ eufonctl $WAYLAND_DISPLAY

View File

@ -72,10 +72,7 @@ stdenv.mkDerivation {
export LUA_PATH="`lua -e 'print(package.path)'`" export LUA_PATH="`lua -e 'print(package.path)'`"
export LUA_CPATH="`lua -e 'print(package.cpath)'`" export LUA_CPATH="`lua -e 'print(package.cpath)'`"
mkdir -p $out/bin mkdir -p $out/bin
find . -name kiwmi -prune \ find . -name kiwmi -prune -o -type l -prune -o -print0 | cpio -0 -v --pass-through $out
-o -type l -prune \
-o -name git -prune \
-o -print0 | cpio -0 -v --pass-through $out
substitute bin/eufonctl.sh $out/bin/eufonctl \ substitute bin/eufonctl.sh $out/bin/eufonctl \
--replace SOCAT=socat SOCAT=${socat}/bin/socat --replace SOCAT=socat SOCAT=${socat}/bin/socat
makeWrapper ${kiwmi}/bin/kiwmi $out/bin/eufon \ makeWrapper ${kiwmi}/bin/kiwmi $out/bin/eufon \

View File

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let eufon = pkgs.callPackage ./default.nix {}; in let eufon = pkgs.callPckage ./default.nix; in
{ {
systemd.services."eufon" = { systemd.services."eufon" = {
wants = [ wants = [
@ -52,7 +52,7 @@ let eufon = pkgs.callPackage ./default.nix {}; in
}; };
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git eufon git
]; ];
boot.postBootCommands = lib.mkOrder (-1) '' boot.postBootCommands = lib.mkOrder (-1) ''

View File

@ -5,6 +5,11 @@ in (p.overrideAttrs (o:{
shellHook = '' shellHook = ''
export LUA_PATH=`lua -e 'print(package.path)'` export LUA_PATH=`lua -e 'print(package.path)'`
export LUA_CPATH=`lua -e 'print(package.cpath)'` export LUA_CPATH=`lua -e 'print(package.cpath)'`
export EUFON_PATH=`pwd` # this is a shell function mostly so that I can comment it out
# to experiment with starting sway or tinywl or something else
# to see how they behave if kiwmi is being weird
start_eufon(){
kiwmi -V -V -c init.lua;
}
''; '';
})).override { debug = true; } })).override { debug = true; }