diff --git a/roll/Makefile b/roll/Makefile index 372d2a0..e9443e1 100644 --- a/roll/Makefile +++ b/roll/Makefile @@ -1,14 +1,5 @@ -TARGETS = roll - -all: $(TARGETS) - +CFLAGS += -g +roll: roll.c +.PHONY: clean clean: - rm -f $(TARGETS) - -sane: roll.c ../include/sysexits.h - $(CC) -DDONT_USE_SYSTEM_SYSEXITS -o roll roll.c - -roll: %.c - $(CC) -o $@ $@.c - -.PHONY: all clean sane + rm roll.c diff --git a/rot/rot13 b/rot/rot13 deleted file mode 100755 index 2f84052..0000000 --- a/rot/rot13 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec rot 13 diff --git a/trinitystuff/Makefile b/trinitystuff/Makefile index 1fcb0cf..c50a0cd 100644 --- a/trinitystuff/Makefile +++ b/trinitystuff/Makefile @@ -11,6 +11,7 @@ TARGETS = \ $(HOME)/.config/sway/config \ $(HOME)/.env \ $(HOME)/.gitconfig \ + $(HOME)/.ircrc \ $(HOME)/.nethackrc \ $(HOME)/.profile \ $(HOME)/.vimrc \ @@ -37,6 +38,10 @@ $(HOME)/.config/helix/config.toml: helix/config.toml mkdir -p $(HOME)/.config/helix ln -s helix/config.toml $@ +$(HOME)/.config/helix/languages.toml: helix/languages.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 $@ @@ -67,6 +72,9 @@ $(HOME)/.env: sh/env $(HOME)/.gitconfig: git/gitconfig cp git/gitconfig $@ +$(HOME)/.ircrc: ircII/ircrc + ln -s ircII/ircrc $@ + $(HOME)/.nethackrc: nethack/nethackrc ln -s nethack/nethackrc $@ diff --git a/.helix/languages.toml b/trinitystuff/helix/languages.toml similarity index 82% rename from .helix/languages.toml rename to trinitystuff/helix/languages.toml index 5b3442d..c8ac9df 100644 --- a/.helix/languages.toml +++ b/trinitystuff/helix/languages.toml @@ -1,9 +1,9 @@ [[language]] file-types = ["c"] indent.unit = "\t" -indent.tab-width = 8 -language-id = "C" -name = "C" +indent.tab-width = 4 +language-id = "c" +name = "c" roots = ["Makefile"] scope = "source.c" diff --git a/trinitystuff/ircII/ircrc b/trinitystuff/ircII/ircrc new file mode 100644 index 0000000..194ade0 --- /dev/null +++ b/trinitystuff/ircII/ircrc @@ -0,0 +1 @@ +channel #subgeneral,#media diff --git a/trinitystuff/sh/aliases b/trinitystuff/sh/aliases index 98d142a..7913cba 100644 --- a/trinitystuff/sh/aliases +++ b/trinitystuff/sh/aliases @@ -1,22 +1,59 @@ #!/bin/sh +ls3(){ + ls -1hlA --color=auto "$@"; +} #alias awk=nawk # not packaged for chimera alias cls=clear alias cp='cp -iv' alias doas="$SUDO" alias e="$EDITOR" -alias ls='lsd -1A --long --icon never' +if command -v lsd >/dev/null +then alias ls='lsd -1A --long --icon never' +else alias ls=ls3 +fi # shim for NetBSD X200 Tablet, Raspberry Pi 4B+ -alias mpv='LIBGL_ALWAYS_SOFTWARE=1 mpv --vo=x11' +alias mpv='mpv --vo=x11' alias mullvad="curl https://am.i.mullvad.net/connected" alias mv='mv -iv' +# workaround for Arch Linux ARM 2025-03 +alias nicotine="PYTHONPATH=/usr/lib/python3.11/site-packages/ nicotine" +alias obsd1='doas virsh net-start --network default' +alias obsd-1='doas virsh net-destroy --network default' +alias obsd2='\ +doas qemu-system-aarch64 \ + -enable-kvm -M virt -cpu host -m 1.5G \ + -bios "$HOME"/Machines/QEMU_EFI.fd \ + -device virtio-rng-device \ + -device virtio-net,netdev=n0 \ + -netdev bridge,id=n0,br=virbr0 \ + -nographic \ + -drive file="$HOME"/Machines/obsd.qcow2,media=disk,if=virtio \ +' +alias obsd3='ssh 192.168.122.76' +# -nic user,model=virtio-net-pci \ alias p='ping 1.1.1.1' +alias secret="$SUDO mount /secret" +alias usecret="$SUDO umount /secret" alias sensors='watch sensors' alias sudo="$SUDO" +# please use responsibly +alias torrent="TORSOCKS_ALLOW_INBOUND=1 torsocks -d aria2c --disable-ipv6 --enable-dht=false" alias units='units --history /dev/null' alias v="$VISUAL" # BEWARE -- injectable # (though unauthorized $EDITOR $VISUAL modification is a problem on its own) -alias vidir="doas env EDITOR='$EDITOR' VISUAL='$VISUAL' vidir" +alias vidir="doas env VISUAL='$VISUAL' vidir" +alias winxp=' +weisu qemu-system-x86_64 \ + -M pc -cpu qemu64 -m 1G \ + -rtc base=localtime \ + -device VGA,vgamem_mb=64 \ + -device rtl8139,netdev=n0 \ + -netdev bridge,id=n0,br=virbr0 \ + -usb -device usb-tablet \ + -monitor stdio \ + -hda "$HOME"/Machines/winxp.qcow2 \ +' alias youtube-dl=yt-dlp alias yay=paru diff --git a/trinitystuff/sh/profile b/trinitystuff/sh/profile index 1f52720..88fc09a 100644 --- a/trinitystuff/sh/profile +++ b/trinitystuff/sh/profile @@ -1,40 +1,61 @@ +#!/bin/sh + BROWSER=netsurf-gtk; export BROWSER +CARGO_MOMMYS_LITTLE=cat/catgirl/girl/kitten/kitty/lass/lassie; export CARGO_MOMMYS_LITTLE test -f /usr/lib/plan9 && PLAN9=/usr/lib/plan9 test -f /usr/local/plan9 && PLAN9=/usr/local/plan9 export PLAN9 EDITOR="$PLAN9/bin/sam -d"; export EDITOR +IRCNAME=dtb; export IRCNAME +IRCSERVER=feeling.murderu.us; export IRCSERVER +LIBGL_ALWAYS_SOFTWARE=1; export LIBGL_ALWAYS_SOFTWARE # Raspberry Pi shim +MANPATH="$MANPATH:/usr/pkg/man" +MOZ_ENABLE_WAYLAND=1; export MOZ_ENABLE_WAYLAND +if command -v bat >/dev/null + then PAGER=bat +elif command -v less >/dev/null + then PAGER=less +else + PAGER=more +fi +export PAGER PATH="\ /bin:\ /sbin:\ /usr/bin:\ /usr/games:\ /usr/sbin:\ -/usr/local/bin:\ -/usr/local/sbin:\ +/usr/X11R7/bin:\ /usr/pkg/bin:\ /usr/pkg/sbin:\ /usr/pkg/qt5/bin:\ -/usr/X11R7/bin:\ +/usr/local/bin:\ +/usr/local/sbin:\ $HOME/bin/:\ $HOME/.local/bin:\ $HOME/src/dist:\ $PLAN9/bin:\ -$PATH"; export PATH -PAGER=less; export PAGER -TERMINAL=urxvt; export TERMINAL +"; export PATH +TERMINAL=foot; export TERMINAL UNITS_SYSTEM=si; export UNITS_SYSTEM -if command -v hx >/dev/null +if command -v nvim >/dev/null + then VISUAL=nvim +elif command -v vim >/dev/null + then VISUAL=vim +elif command -v hx >/dev/null then VISUAL=hx -elif command -v vi >/dev/null - then VISUAL=vi +elif command -v kak >/dev/null + then VISUAL=kak +else + 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 -command -v doas >/dev/null 2>&1 && SUDO="doas" && export SUDO +command -v sudo >/dev/null 2>&1 && SUDO=sudo && export SUDO +command -v doas >/dev/null 2>&1 && SUDO=doas && export SUDO -ENV=$HOME/.env; export ENV -. $ENV +ENV="$HOME"/.env; export ENV +. "$ENV" diff --git a/trinitystuff/sway/config b/trinitystuff/sway/config index db7d4c2..06e8dc5 100644 --- a/trinitystuff/sway/config +++ b/trinitystuff/sway/config @@ -13,9 +13,13 @@ bar { } font Unscii:size=12 position top - status_command while date +'%Y-%m-%dT%H:%M:%S'; do sleep 1; done + status_command bar } +#bindsym Print exec grim +#bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ +#bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ + bindsym $mod+1 workspace number 1 bindsym $mod+Shift+1 move container to workspace number 1 bindsym $mod+2 workspace number 2 @@ -37,8 +41,12 @@ mode "resize" { bindsym Return mode "default" } bindsym $mod+Shift+r reload +bindsym $mod+Shift+i exec rpi-backlight on +bindsym $mod+Shift+o exec rpi-backlight off -bindsym $mod+d exec followtrail | wofi --show dmenu | xargs swaymsg exec -- +#bindsym $mod+d exec followtrail | wofi --show dmenu | xargs swaymsg exec -- +#bindsym $mod+d exec dmenu-wl_run -i +bindsym $mod+d exec rofi -show drun bindsym $mod+f fullscreen bindsym $mod+h focus left bindsym $mod+Shift+h move left @@ -53,6 +61,8 @@ bindsym $mod+Return exec foot bindsym $mod+b splith bindsym $mod+Shift+b exec $BROWSER bindsym $mod+v splitv +bindsym XF86MonBrightnessDown exec rpi-backlight down +bindsym XF86MonBrightnessUp exec rpi-backlight up bindsym $mod+space focus mode_toggle bindsym $mod+Shift+space floating toggle @@ -68,4 +78,11 @@ input "type:keyboard" { xkb_options ctrl:nocaps } +# ClockworkPi uConsole +output DSI-1 transform 90 +# output DSI-1 disable +# output HDMI-A-1 + include /etc/sway/config.d/* + +exec mako