line breaks for term readability

simexec/simexec.c

@@ -1,6 +1,5 @@
 #include <stdio.h> /* fprintf(3), NULL */
 #include <unistd.h> /* execv(3), */
-
 #if !defined EX_USAGE
 #	include <sysexits.h> /* EX_USAGE */
 #endif
@@ -16,5 +15,5 @@ int main(int argc, char *argv[]){
 		return EX_USAGE;
 	}
 
-	return execv(argv[1], argv+2);
+	return execv(argv[1], &argv[2]);
 }

trinitystuff/2020-09-26.md

@@ -1,2 +1,5 @@
 ![screenshot of my desktop](https://web.archive.org/web/20200926155417if_/https://i.redd.it/jwhsmokcfcp51.png)
-For this configuration, [posted on r/unixporn on 2020-09-25](https://www.reddit.com/r/unixporn/comments/izpvwp/i3gaps_basic_but_it_works/), refer to the [state of the repository around 2020-09-26](https://git.sr.ht/~trinity/src/tree/86abade1455cfda2f06aff6bc66c6493453512ef/item/dotfiles-old/README.md) or so.
+For this configuration,
+[posted on r/unixporn on 2020-09-25](https://www.reddit.com/r/unixporn/comments/izpvwp/i3gaps_basic_but_it_works/),
+refer to the
+[state of the repository around 2020-09-26](https://git.sr.ht/~trinity/src/tree/86abade1455cfda2f06aff6bc66c6493453512ef/item/dotfiles-old/README.md) or so.

trinitystuff/Makefile

@@ -6,11 +6,9 @@ all: $(TARGETS)
 
 TARGETS = \
 	$(HOME)/.aliases \
-	$(HOME)/.config/bspwm/bspwmrc \
-	$(HOME)/.config/nvim/init.vim \
-	$(HOME)/.config/sxhkd/sxhkdrc \
-	$(HOME)/.config/sxmo/profile \
-	$(HOME)/.ctwmrc \
+	$(HOME)/.config/helix/config.toml \
+	$(HOME)/.config/helix/themes/trinity.toml \
+	$(HOME)/.config/sway/config \
 	$(HOME)/.env \
 	$(HOME)/.gitconfig \
 	$(HOME)/.nethackrc \
@@ -21,57 +19,69 @@ TARGETS = \
 	$(HOME)/.config/youtube-dl/youtube-dl.conf
 
 $(HOME)/.aliases: sh/aliases
-	cp sh/aliases $(HOME)/.aliases
+	ln -s sh/aliases $@
 
 $(HOME)/.config/bspwm/bspwmrc: bspwm/bspwmrc
 	mkdir -p $(HOME)/.config/bspwm/
-	cp bspwm/bspwmrc $(HOME)/.config/bspwm/bspwmrc
+	cp bspwm/bspwmrc $@
 
 $(HOME)/.config/i3/config: i3/config
 	mkdir -p $(HOME)/.config/i3/
-	cp i3/config $(HOME)/.config/i3/config
+	cp i3/config $@
 
 $(HOME)/.config/i3status/config: i3status/config
 	mkdir -p $(HOME)/.config/i3status/
-	cp i3status/config $(HOME)/.config/i3status/config
+	cp i3status/config $@
+
+$(HOME)/.config/helix/config.toml: helix/config.toml
+	mkdir -p $(HOME)/.config/helix
+	ln -s helix/config.toml $@
+
+$(HOME)/.config/helix/themes/trinity.toml: helix/trinity.toml
+	mkdir -p $(HOME)/.config/helix/themes
+	ln -s helix/trinity.toml $@
 
 $(HOME)/.config/nvim/init.vim: nvim/init.vim
 	mkdir -p $(HOME)/.config/nvim/
-	cp nvim/init.vim $(HOME)/.config/nvim/init.vim
+	ln -s nvim/init.vim $@
 
 $(HOME)/.config/sxhkd/sxhkdrc: sxhkd/sxhkdrc
 	mkdir -p $(HOME)/.config/sxhkd/
-	cp sxhkd/sxhkdrc $(HOME)/.config/sxhkd/sxhkdrc
+	cp sxhkd/sxhkdrc $@
+
+$(HOME)/.config/sway/config: sway/config
+	mkdir -p $(HOME)/.config/sway/
+	ln -s sway/config $@
 
 # cannot be a symlink
 $(HOME)/.config/sxmo/profile: sxmo/profile
 	mkdir -p $(HOME)/.config/sxmo/
-	cp sxmo/profile $(HOME)/.config/sxmo/profile
+	cp sxmo/profile $@
 
 $(HOME)/.ctwmrc: ctwm/ctwmrc
-	cp ctwm/ctwmrc $(HOME)/.ctwmrc
+	cp ctwm/ctwmrc $@
 
 $(HOME)/.env: sh/env
-	cp sh/env $(HOME)/.env
+	ln -s sh/env $@
 
 $(HOME)/.gitconfig: git/gitconfig
-	cp git/gitconfig $(HOME)/.gitconfig
+	cp git/gitconfig $@
 
 $(HOME)/.nethackrc: nethack/nethackrc
-	cp nethack/nethackrc $(HOME)/.nethackrc
+	ln -s nethack/nethackrc $@
 
 $(HOME)/.profile: sh/profile
-	cp sh/profile $(HOME)/.profile
+	ln -s sh/profile $@
 
 $(HOME)/.vimrc: vim/vimrc
-	cp vim/vimrc $(HOME)/.vimrc
+	ln -s vim/vimrc $@
 
 $(HOME)/.xinitrc: xinit/xinitrc
-	cp xinit/xinitrc $(HOME)/.xinitrc
+	ln -s xinit/xinitrc $@
 
 $(HOME)/.Xresources: X/Xresources
-	cp X/Xresources $(HOME)/.Xresources
+	ln -s X/Xresources $@
 
 $(HOME)/.config/youtube-dl/youtube-dl.conf: youtube-dl/youtube-dl.conf
 	mkdir -p $(HOME)/.config/youtube-dl
-	cp youtube-dl/youtube-dl.conf $(HOME)/.config/youtube-dl/youtube-dl.conf
+	cp youtube-dl/youtube-dl.conf $@

trinitystuff/X/Xresources

@@ -9,12 +9,16 @@
 ! unscii font
 *faceName:	unscii:antialias=false
 *faceSize:	12
+*font:	xft:unscii:style=Regular:size=12
 
 *cursorColor:	FOREGROUND
+*foreground:	FOREGROUND
 *Foreground:	FOREGROUND
+*background:	BACKGROUND
 *Background:	BACKGROUND
 
-! xterm specific stuff
+urxvt.scrollBar:	false
+
 xterm*loginshell:	true
 xterm*locale:	        UTF-8
 xterm*titleModes:	16

trinitystuff/helix/config.toml

@@ -0,0 +1,26 @@
+theme = "trinity"
+
+[editor]
+gutters = [
+  "diagnostics",
+  "spacer",
+  "diff",
+  "line-numbers",
+  "spacer"
+]
+mouse = false
+rulers = [80, 100, 120]
+scrolloff = 5
+
+[editor.file-picker]
+hidden = false
+
+[editor.statusline]
+mode.insert = "--- INSERT ---"
+mode.normal = "--- NORMAL ---"
+mode.select = "--- VISUAL ---"
+
+[keys.normal]
+"$" = "goto_line_end"
+C-s = ":w"
+A-x = ":wq"

trinitystuff/helix/trinity.toml

@@ -0,0 +1,6 @@
+inherits = "base16_transparent"
+
+"comment" = { fg = "white" }
+"ui.cursor.match" = { modifiers = ["reversed"] }
+"ui.selection" = { bg = "white", fg = "black" }
+"ui.virtual.ruler" = { bg = "red", fg = "white" }

trinitystuff/sh/aliases

@@ -1,47 +1,22 @@
 #!/bin/sh
 
-# audio drive
-#alias audio="sudo mount -L 'AUDIO' /mnt/audio"
-
-alias awk="nawk"
-alias b="$BROWSER"
-alias cls="clear"
-alias cp="cp -iv"
+#alias awk=nawk # not packaged for chimera
+alias cls=clear
+alias cp='cp -iv'
 alias doas="$SUDO"
-alias dots="\
-cp -f ~/src/trinitystuff/sxhkd/sxhkdrc ~/.config/sxhkd/sxhkdrc && \
-pkill -USR1 -x sxhkd && \
-cp -f ~/src/trinitystuff/bspwm/bspwmrc ~/.config/bspwm/bspwmrc"
 alias e="$EDITOR"
-alias ipconfig="ifconfig"
-#alias ls="9 ls"
-#alias ls="ls -1A"
-alias ls="lsd -1A --icon-theme unicode --long"
-alias mpv="LIBGL_ALWAYS_SOFTWARE=1 mpv --vo=x11"
+alias ls='lsd -1A --long --icon never'
+# shim for NetBSD X200 Tablet, Raspberry Pi 4B+
+alias mpv='LIBGL_ALWAYS_SOFTWARE=1 mpv --vo=x11' 
 alias mullvad="curl https://am.i.mullvad.net/connected"
-alias mv="mv -iv"
-alias p="ping 1.1.1.1"
-
-# media hard drive
-alias partone="sudo mount -L 'PARTONE' /mnt/partone"
-alias prat="$HOME/src/packrat/prat"
-
-pyenv() {
-	eq $# 0 \
-		&& .  ./bin/activate \
-		|| . $1/bin/activate
-}
-
-alias sensors="watch sensors"
+alias mv='mv -iv'
+alias p='ping 1.1.1.1'
+alias sensors='watch sensors'
 alias sudo="$SUDO"
-alias try="PREFIX=/home/trinity/src/trilsd/ /home/trinity/src/trilsd/dist/try"
-alias units="units --history /dev/null"
+alias units='units --history /dev/null'
 alias v="$VISUAL"
-alias weather="curl wttr.in/lewiston+maine?m"
-
-webm() {
-	ffmpeg -i $1 -c:v libvpx -b:v 1M -c:a libvorbis "$(printf "%b" "$1" | awk -F '.' '{print $1}')".webm
-}
-
-alias y=youtube-dl
-alias yay="paru"
+# BEWARE -- injectable
+# (though unauthorized $EDITOR $VISUAL modification is a problem on its own)
+alias vidir="doas env EDITOR='$EDITOR' VISUAL='$VISUAL' vidir"
+alias youtube-dl=yt-dlp
+alias yay=paru

trinitystuff/sh/profile

@@ -1,4 +1,4 @@
-BROWSER=firefox; export BROWSER
+BROWSER=netsurf-gtk; export BROWSER
 test -f /usr/lib/plan9 && PLAN9=/usr/lib/plan9
 test -f /usr/local/plan9 && PLAN9=/usr/local/plan9
 export PLAN9
@@ -16,14 +16,21 @@ PATH="\
 /usr/pkg/qt5/bin:\
 /usr/X11R7/bin:\
 $HOME/bin/:\
+$HOME/.local/bin:\
 $HOME/src/dist:\
 $PLAN9/bin:\
 $PATH"; export PATH
-PAGER="less"; export PAGER
+PAGER=less; export PAGER
 TERMINAL=urxvt; export TERMINAL
 UNITS_SYSTEM=si; export UNITS_SYSTEM
-VISUAL=vi; export VISUAL
+if	command -v hx >/dev/null
+	then	VISUAL=hx
+elif	command -v vi >/dev/null
+	then	VISUAL=vi
+fi
+export VISUAL
 WALLPAPER="$HOME/Pictures/Wallpapers/ghibli_wars.jpg"; export WALLPAPER
+XDG_RUNTIME_DIR="/tmp/$(id -u)-runtime-dir"; export XDG_RUNTIME_DIR
 
 # lowest to highest priority
 command -v sudo >/dev/null 2>&1 && SUDO="sudo" && export SUDO

trinitystuff/sway/config

@@ -0,0 +1,71 @@
+# man 5 sway
+
+# Alt
+set $mod Mod1
+floating_modifier $mod normal
+
+# sway-bar(5)
+bar {
+    colors {
+        statusline #ffdbdb
+        background #000000
+        inactive_workspace #000000 #000000 #5c5c5c
+    }
+    font Unscii:size=12
+    position top
+    status_command while date +'%Y-%m-%dT%H:%M:%S'; do sleep 1; done
+}
+
+bindsym $mod+1 workspace number 1
+bindsym $mod+Shift+1 move container to workspace number 1
+bindsym $mod+2 workspace number 2
+bindsym $mod+Shift+2 move container to workspace number 2
+bindsym $mod+3 workspace number 3
+bindsym $mod+Shift+3 move container to workspace number 3
+bindsym $mod+4 workspace number 4
+bindsym $mod+Shift+4 move container to workspace number 4
+
+bindsym $mod+q kill
+bindsym $mod+Shift+e exec swaymsg exit
+bindsym $mod+r mode "resize"
+mode "resize" {
+    bindsym Escape mode "default"
+    bindsym h resize shrink width 10px
+    bindsym j resize grow height 10px
+    bindsym k resize shrink height 10px
+    bindsym l resize grow width 10px
+    bindsym Return mode "default"
+}
+bindsym $mod+Shift+r reload
+
+bindsym $mod+d exec followtrail | wofi --show dmenu | xargs swaymsg exec --
+bindsym $mod+f fullscreen
+bindsym $mod+h focus left
+bindsym $mod+Shift+h move left
+bindsym $mod+j focus down
+bindsym $mod+Shift+j move down
+bindsym $mod+k focus up
+bindsym $mod+Shift+k move up
+bindsym $mod+l focus right
+bindsym $mod+Shift+l move right
+bindsym $mod+Return exec foot
+
+bindsym $mod+b splith
+bindsym $mod+Shift+b exec $BROWSER
+bindsym $mod+v splitv
+
+bindsym $mod+space focus mode_toggle
+bindsym $mod+Shift+space floating toggle
+
+client.focused ffdbdb ffdbdb 000000
+client.unfocused 000000 000000 ffffff
+
+default_border pixel
+default_floating_border normal
+
+input "type:keyboard" {
+    xkb_layout us
+    xkb_options ctrl:nocaps
+}
+
+include /etc/sway/config.d/*

trinitystuff/sxhkd/sxhkdrc

@@ -26,14 +26,14 @@ mod1 + {_,shift +}{1-4}
 alt + {_,shift +}{1-4}
 	bspc {desktop -f,node -d} '^{1-4}' --follow
 
-mod1 + equal
-	light -A 5
-mod1 + shift + equal
-	light -A 1
-mod1 + minus
-	light -U 5
-mod1 + shift + minus
-	light -U 1
+#mod1 + equal
+#	light -A 5
+#mod1 + shift + equal
+#	light -A 1
+#mod1 + minus
+#	light -U 5
+#mod1 + shift + minus
+#	light -U 1
 
 super + shift + q
 	bspc quit
@@ -51,6 +51,8 @@ super + shift + r
 alt + t
 	urxvt
 
+alt + s
+	scrot
 alt + d
 	rofi -show drun
 mod1 + d