chore(rename): libn -> base

51 files changed, 65 insertions, 65 deletions

diff --git a/bin/status b/bin/status
index 9dfce79..bca791a 100755
--- a/bin/status
+++ b/bin/status
@@ -70,8 +70,8 @@ ipaddr() {
 }
 
 dostatus() {
-    xsetroot -name "$VOL│$MEM│$IP│$CPU│$NML│$WTR│$TIM" 
-    # xsetroot -name "$VOL│$BAT│$MEM│$IP│$CPU│$NML│$WTR│$TIM" 
+    # xsetroot -name "$VOL│$MEM│$IP│$CPU│$NML│$WTR│$TIM" 
+    xsetroot -name "$VOL│$BAT│$MEM│$IP│$CPU│$NML│$WTR│$TIM" 
     # echo "$VOL│$BAT│$MEM│$IP│$CPU│$NML│$WTR│$TIM" 
 }
 
diff --git a/bin/tmux-send b/bin/tmux-send
index a1911f3..040ea7a 100755
--- a/bin/tmux-send
+++ b/bin/tmux-send
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 dir=$1
-tty=$(tmux list-panes -F "#{pane_active}#{pane_tty}" | grep '^1' | cut -c2-)
-vim=$(ps -o stat=,command= -t $tty | awk 'BEGIN{flag=0} {if($1 ~ /S[a-z]*+/ && $2 ~ /nvim/){flag +=1}}; END {print flag}')
+vim=$(tmux display-message -p '#{pane_current_command} #{pane_title}' | grep -iq vim && echo 1)
 
 if [ $vim -gt 0 ]; then
     case $dir in
diff --git a/include/libn.h b/include/base.h
index 699786f..699786f 100644
--- a/include/libn.h
+++ b/include/base.h
diff --git a/include/libn/macro/map.h b/include/base/macro/map.h
index 7c2f7ae..7c2f7ae 100644
--- a/include/libn/macro/map.h
+++ b/include/base/macro/map.h
diff --git a/include/libn/macro/qsort.h b/include/base/macro/qsort.h
index 6d0acaa..6d0acaa 100644
--- a/include/libn/macro/qsort.h
+++ b/include/base/macro/qsort.h
diff --git a/rules.mk b/rules.mk
index e40960f..23ae5b7 100644
--- a/rules.mk
+++ b/rules.mk
@@ -31,8 +31,8 @@ GENS :=
 DIR := sys
 include $(DIR)/rules.mk
 
-DIR := src
-include $(DIR)/rules.mk
+# DIR := src
+# include $(DIR)/rules.mk
 
 # Generic rules
 %.a: %.o
diff --git a/sys/libn/.generated/utf8.c b/sys/base/.generated/utf8.c
index e101e1a..e101e1a 100644
--- a/sys/libn/.generated/utf8.c
+++ b/sys/base/.generated/utf8.c
diff --git a/sys/libn/arg.c b/sys/base/arg.c
index 64e4dd6..64e4dd6 100644
--- a/sys/libn/arg.c
+++ b/sys/base/arg.c
diff --git a/sys/libn/bufio.c b/sys/base/bufio.c
index aaced0e..7ebee68 100644
--- a/sys/libn/bufio.c
+++ b/sys/base/bufio.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 // -----------------------------------------------------------------------
 // reader
diff --git a/sys/libn/coro.c b/sys/base/coro.c
index 923bb7e..953dee0 100644
--- a/sys/libn/coro.c
+++ b/sys/base/coro.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 // -----------------------------------------------------------------------
 // Assembly routines
diff --git a/sys/libn/coro_unix_x64.s b/sys/base/coro_unix_x64.s
index d7de2a2..d7de2a2 100644
--- a/sys/libn/coro_unix_x64.s
+++ b/sys/base/coro_unix_x64.s
diff --git a/sys/libn/error.c b/sys/base/error.c
index 508136c..dc6421d 100644
--- a/sys/libn/error.c
+++ b/sys/base/error.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 void
 exits(char *s)
diff --git a/sys/libn/flate.c b/sys/base/flate.c
index c886693..5930fd1 100644
--- a/sys/libn/flate.c
+++ b/sys/base/flate.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 #include <zlib.h>
 
diff --git a/sys/libn/fs.c b/sys/base/fs.c
index e89ef07..6d5ee0f 100644
--- a/sys/libn/fs.c
+++ b/sys/base/fs.c
@@ -1,6 +1,6 @@
 #include <u.h>
-#include <libn.h>
-#include <libn/macro/map.h>
+#include <base.h>
+#include <base/macro/map.h>
 #include <dirent.h>
 
 /*
diff --git a/sys/libn/genutf8.py b/sys/base/genutf8.py
index 9ce9975..9ce9975 100755
--- a/sys/libn/genutf8.py
+++ b/sys/base/genutf8.py
diff --git a/sys/libn/gz.c b/sys/base/gz.c
index 040d25a..d84397f 100644
--- a/sys/libn/gz.c
+++ b/sys/base/gz.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 #include <zlib.h>
 
diff --git a/sys/libn/io.c b/sys/base/io.c
index ff4fe67..f34a10f 100644
--- a/sys/libn/io.c
+++ b/sys/base/io.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 // -----------------------------------------------------------------------
 // interface implementations
diff --git a/sys/libn/memory.c b/sys/base/memory.c
index a749e4c..a1a47c5 100644
--- a/sys/libn/memory.c
+++ b/sys/base/memory.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 static
 void
diff --git a/sys/libn/mmap.c b/sys/base/mmap.c
index b2c436c..6edfe28 100644
--- a/sys/libn/mmap.c
+++ b/sys/base/mmap.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 #include <sys/mman.h>
 
diff --git a/sys/libn/os.c b/sys/base/os.c
index 75688e9..d5277b5 100644
--- a/sys/libn/os.c
+++ b/sys/base/os.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 int
 os·exists(byte *path, int flag)
diff --git a/sys/libn/random.c b/sys/base/random.c
index 9e80b34..16a8737 100644
--- a/sys/libn/random.c
+++ b/sys/base/random.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 // ----------------------------------------------------------------------------
 // Internal structure
diff --git a/sys/libn/rules.mk b/sys/base/rules.mk
index 452587e..1300f4c 100644
--- a/sys/libn/rules.mk
+++ b/sys/base/rules.mk
@@ -23,8 +23,8 @@ SRCS_$(d) := \
 TSTS_$(d) := \
 	$(d)/test.c
 
-LIBS_$(d) := $(d)/libn.a
-BINS_$(d) := 
+LIBS_$(d) := $(d)/base.a
+BINS_$(d) :=
 
 include share/paths.mk
 
diff --git a/sys/libn/sort.c b/sys/base/sort.c
index bba3294..1143494 100644
--- a/sys/libn/sort.c
+++ b/sys/base/sort.c
@@ -1,6 +1,6 @@
 #include <u.h>
-#include <libn.h>
-#include <libn/macro/qsort.h>
+#include <base.h>
+#include <base/macro/qsort.h>
 
 // -----------------------------------------------------------------------
 // ints
diff --git a/sys/libn/string.c b/sys/base/string.c
index 22a3359..8973a4e 100644
--- a/sys/libn/string.c
+++ b/sys/base/string.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 #define MAX_STRING_ALLOC 1024 * 1024
 
diff --git a/sys/libn/test.c b/sys/base/test.c
index 66c3c7f..972f25a 100644
--- a/sys/libn/test.c
+++ b/sys/base/test.c
@@ -1,6 +1,6 @@
 #include <u.h>
-#include <libn.h>
-#include <libn/macro/map.h>
+#include <base.h>
+#include <base/macro/map.h>
 
 #include <time.h>
 
diff --git a/sys/cmd/dwm/dwm.h b/sys/cmd/dwm/dwm.h
index a934287..269f373 100644
--- a/sys/cmd/dwm/dwm.h
+++ b/sys/cmd/dwm/dwm.h
@@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 #pragma once
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 #include <errno.h>
 #include <locale.h>
diff --git a/sys/cmd/dwm/rules.mk b/sys/cmd/dwm/rules.mk
index 617657e..a87c3f6 100644
--- a/sys/cmd/dwm/rules.mk
+++ b/sys/cmd/dwm/rules.mk
@@ -21,7 +21,7 @@ $(BINS_$(d)): TCLIBS = \
 	`$(PKG) --libs fontconfig` \
     `$(PKG) --libs freetype2`  \
 	-lX11 -lXinerama -lXft -lX11-xcb -lxcb -lxcb-res
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/filter/filter.c b/sys/cmd/filter/filter.c
index 271c544..abc9a88 100644
--- a/sys/cmd/filter/filter.c
+++ b/sys/cmd/filter/filter.c
@@ -1,6 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 #include <dirent.h>
 #include <sys/stat.h>
diff --git a/sys/cmd/filter/rules.mk b/sys/cmd/filter/rules.mk
index 21f6d31..31bb257 100644
--- a/sys/cmd/filter/rules.mk
+++ b/sys/cmd/filter/rules.mk
@@ -7,7 +7,7 @@ BINS_$(d) := $(d)/filter
 include share/paths.mk
 
 # Local rules
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/menu/menu.h b/sys/cmd/menu/menu.h
index f558339..eaea274 100644
--- a/sys/cmd/menu/menu.h
+++ b/sys/cmd/menu/menu.h
@@ -1,6 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 #include <time.h>
 #include <locale.h>
 
diff --git a/sys/cmd/menu/rules.mk b/sys/cmd/menu/rules.mk
index d040f5e..1ee3ab0 100644
--- a/sys/cmd/menu/rules.mk
+++ b/sys/cmd/menu/rules.mk
@@ -19,7 +19,7 @@ $(BINS_$(d)): TCINCS = \
 	`$(PKG) --cflags fontconfig` \
 	`$(PKG) --cflags freetype2`
 	
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/rc/rc.h b/sys/cmd/rc/rc.h
index 11af508..3090002 100644
--- a/sys/cmd/rc/rc.h
+++ b/sys/cmd/rc/rc.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 // -----------------------------------------------------------------------
 // types
diff --git a/sys/cmd/rc/rules.mk b/sys/cmd/rc/rules.mk
index dcddcce..991fb2e 100644
--- a/sys/cmd/rc/rules.mk
+++ b/sys/cmd/rc/rules.mk
@@ -25,7 +25,7 @@ $(d)/parse.h $(d)/parse.c: $(d)/syntax.y
 	yacc --header=$(<D)/parse.h --output=$(<D)/parse.c $(<)
 
 # Local rules
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a $(d)/parse.h
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a $(d)/parse.h
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/rules.mk b/sys/cmd/rules.mk
index 2302c49..0b54f68 100644
--- a/sys/cmd/rules.mk
+++ b/sys/cmd/rules.mk
@@ -2,11 +2,14 @@ include share/push.mk
 
 # Iterate through subdirectory tree
 
+# DIR := $(d)/cc
+# include $(DIR)/rules.mk
+
 DIR := $(d)/rc
 include $(DIR)/rules.mk
 
-# DIR := $(d)/cc
-# include $(DIR)/rules.mk
+DIR := $(d)/wm
+include $(DIR)/rules.mk
 
 DIR := $(d)/dwm
 include $(DIR)/rules.mk
@@ -14,9 +17,6 @@ include $(DIR)/rules.mk
 # DIR := $(d)/tinywl
 # include $(DIR)/rules.mk
 
-# DIR := $(d)/wm
-# include $(DIR)/rules.mk
-
 # DIR := $(d)/test
 # include $(DIR)/rules.mk
 
diff --git a/sys/cmd/term/rules.mk b/sys/cmd/term/rules.mk
index ef340b3..a882e70 100644
--- a/sys/cmd/term/rules.mk
+++ b/sys/cmd/term/rules.mk
@@ -18,7 +18,7 @@ $(BINS_$(d)): TCLIBS = \
     `$(PKG) --libs freetype2`  \
 	-lm -lrt -lX11 -lutil -lXft -lXrender -lharfbuzz
 
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/term/term.h b/sys/cmd/term/term.h
index fd7b68c..b328db7 100644
--- a/sys/cmd/term/term.h
+++ b/sys/cmd/term/term.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 #include <signal.h>
 #include <sys/ioctl.h>
diff --git a/sys/cmd/walk/rules.mk b/sys/cmd/walk/rules.mk
index f863d87..5b9192d 100644
--- a/sys/cmd/walk/rules.mk
+++ b/sys/cmd/walk/rules.mk
@@ -7,7 +7,7 @@ BINS_$(d) := $(d)/walk
 include share/paths.mk
 
 # Local rules
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/walk/walk.c b/sys/cmd/walk/walk.c
index 853369c..c68d6e0 100644
--- a/sys/cmd/walk/walk.c
+++ b/sys/cmd/walk/walk.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 
 static char buf[4*1024], *c = buf; /* should be greater or equal to PATH_MAX */
 
diff --git a/sys/cmd/wm/render.c b/sys/cmd/wm/render.c
index ff4a514..1f51804 100644
--- a/sys/cmd/wm/render.c
+++ b/sys/cmd/wm/render.c
@@ -8,7 +8,6 @@ struct Payload
     int x, y;
 };
 
-
 static
 void
 render(struct wlr_surface *surface, int sx, int sy, void *data)
@@ -20,6 +19,7 @@ render(struct wlr_surface *surface, int sx, int sy, void *data)
     struct wlr_box box;
     struct wlr_output *output;
     struct wlr_texture *texture;
+
     enum wl_output_transform transform;
 
     payload = data;
diff --git a/sys/cmd/wm/rules.mk b/sys/cmd/wm/rules.mk
index bf9aabc..5a36b6f 100644
--- a/sys/cmd/wm/rules.mk
+++ b/sys/cmd/wm/rules.mk
@@ -55,7 +55,7 @@ $(BINS_$(d)): TCLIBS = \
 	`$(PKG) --libs wayland-server` \
 	`$(PKG) --libs xkbcommon` \
 
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/wm/wm.h b/sys/cmd/wm/wm.h
index d9124f4..a263804 100644
--- a/sys/cmd/wm/wm.h
+++ b/sys/cmd/wm/wm.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 #include <wayland-server-core.h>
 #include <linux/input-event-codes.h>
 
diff --git a/sys/libbio/fasta.c b/sys/libbio/fasta.c
index 2feb0a4..3788544 100644
--- a/sys/libbio/fasta.c
+++ b/sys/libbio/fasta.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 #include <libbio.h>
 
 #define INIT_NM_SIZE 128
diff --git a/sys/libbio/newick.c b/sys/libbio/newick.c
index 631596f..5e6d30a 100644
--- a/sys/libbio/newick.c
+++ b/sys/libbio/newick.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 #include <libbio.h>
 
 // -----------------------------------------------------------------------
diff --git a/sys/libbio/phylo.c b/sys/libbio/phylo.c
index cb5c75c..d50934f 100644
--- a/sys/libbio/phylo.c
+++ b/sys/libbio/phylo.c
@@ -1,6 +1,6 @@
 #include <u.h>
-#include <libn.h>
-#include <libn/macro/qsort.h>
+#include <base.h>
+#include <base/macro/qsort.h>
 #include <libbio.h>
 
 // -----------------------------------------------------------------------
diff --git a/sys/libmath/basic.c b/sys/libmath/basic.c
index 50a4ec2..1341f7b 100644
--- a/sys/libmath/basic.c
+++ b/sys/libmath/basic.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 #include <libmath.h>
 
 #include <math.h>
diff --git a/sys/libmath/blas.c b/sys/libmath/blas.c
index 4c9e67b..18f9760 100644
--- a/sys/libmath/blas.c
+++ b/sys/libmath/blas.c
@@ -1,10 +1,10 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 #include <libmath.h>
 #include <libmath/blas.h>
 #include <time.h>
 
-#include <vendor/blas/cblas.h>
+/* #include <vendor/blas/cblas.h> */
 
 #define NCOL 2*512
 #define NROW 2*512
diff --git a/sys/libmath/blas3.c b/sys/libmath/blas3.c
index d821e6e..b048c95 100644
--- a/sys/libmath/blas3.c
+++ b/sys/libmath/blas3.c
@@ -1,5 +1,5 @@
 #include <u.h>
-#include <libn.h>
+#include <base.h>
 #include <libmath.h>
 
 #define INT   int
diff --git a/sys/libmath/rules.mk b/sys/libmath/rules.mk
index 42af0da..83945d7 100644
--- a/sys/libmath/rules.mk
+++ b/sys/libmath/rules.mk
@@ -9,9 +9,7 @@ SRCS_$(d) := \
 	$(d)/blas2.c \
 	$(d)/blas3.c
 LIBS_$(d) := $(d)/libmath.a
-TSTS_$(d) := \
-	$(d)/blas.c \
-	$(d)/test.c
+TSTS_$(d) :=
 
 include share/paths.mk
 
diff --git a/sys/libmath/test.c b/sys/libmath/test.c
index 485d549..66700f8 100644
--- a/sys/libmath/test.c
+++ b/sys/libmath/test.c
@@ -1,6 +1,6 @@
 #include <u.h>
-#include <libn.h>
-#include <vendor/blas/cblas.h>
+#include <base.h>
+/* #include <vendor/blas/cblas.h> */
 
 #include <x86intrin.h>
 
diff --git a/sys/rules.mk b/sys/rules.mk
index 5d31ec8..c8c3dd3 100644
--- a/sys/rules.mk
+++ b/sys/rules.mk
@@ -5,10 +5,10 @@ include share/push.mk
 DIR := $(d)/cmd
 include $(DIR)/rules.mk
 
-# DIR := $(d)/libc
-# include $(DIR)/rules.mk
+DIR := $(d)/base
+include $(DIR)/rules.mk
 
-DIR := $(d)/libn
+DIR := $(d)/libunicode
 include $(DIR)/rules.mk
 
 DIR := $(d)/libmath
@@ -17,6 +17,9 @@ include $(DIR)/rules.mk
 DIR := $(d)/libbio
 include $(DIR)/rules.mk
 
+# DIR := $(d)/libc
+# include $(DIR)/rules.mk
+
 # DIR := $(d)/libdraw
 # include $(DIR)/rules.mk
 
diff --git a/vendor/sync b/vendor/sync
index 380448a..44d751e 100755
--- a/vendor/sync
+++ b/vendor/sync
@@ -200,9 +200,9 @@ update()
 # ------------------------------------------------------------------------
 # main point of entry
 
-update nlopt $NLOPT_TAG
-update musl $MUSL_TAG
-update blas $BLAS_TAG
-update zlib $ZLIB_TAG
+# update nlopt $NLOPT_TAG
+# update blas $BLAS_TAG
 
+update musl    $MUSL_TAG
+update zlib    $ZLIB_TAG
 update wlroots $WLROOTS_TAG