From 81084e0b27d87ff2279a5136e5317f2413f73e32 Mon Sep 17 00:00:00 2001 From: DTB Date: Mon, 6 May 2024 00:27:56 -0600 Subject: [PATCH] some changes to dots --- trinitystuff/Makefile | 26 +++++++++++----- trinitystuff/X/Xresources | 6 +++- trinitystuff/helix/config.toml | 26 ++++++++++++++++ trinitystuff/helix/trinity.toml | 6 ++++ trinitystuff/sh/aliases | 55 +++++++++------------------------ trinitystuff/sh/profile | 13 ++++++-- trinitystuff/sxhkd/sxhkdrc | 18 ++++++----- 7 files changed, 90 insertions(+), 60 deletions(-) create mode 100644 trinitystuff/helix/config.toml create mode 100644 trinitystuff/helix/trinity.toml diff --git a/trinitystuff/Makefile b/trinitystuff/Makefile index 73f8be7..9caa50d 100644 --- a/trinitystuff/Makefile +++ b/trinitystuff/Makefile @@ -7,6 +7,8 @@ all: $(TARGETS) TARGETS = \ $(HOME)/.aliases \ $(HOME)/.config/bspwm/bspwmrc \ + $(HOME)/.config/helix/config.toml \ + $(HOME)/.config/helix/themes/trinity.toml \ $(HOME)/.config/nvim/init.vim \ $(HOME)/.config/sxhkd/sxhkdrc \ $(HOME)/.config/sxmo/profile \ @@ -21,7 +23,7 @@ TARGETS = \ $(HOME)/.config/youtube-dl/youtube-dl.conf $(HOME)/.aliases: sh/aliases - cp sh/aliases $(HOME)/.aliases + ln -s sh/aliases $(HOME)/.aliases $(HOME)/.config/bspwm/bspwmrc: bspwm/bspwmrc mkdir -p $(HOME)/.config/bspwm/ @@ -35,9 +37,17 @@ $(HOME)/.config/i3status/config: i3status/config mkdir -p $(HOME)/.config/i3status/ cp i3status/config $(HOME)/.config/i3status/config +$(HOME)/.config/helix/config.toml: helix/config.toml + mkdir -p $(HOME)/.config/helix + ln -s helix/config.toml $(HOME)/.config/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/helix/themes/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/nvim/init.vim $(HOME)/.config/sxhkd/sxhkdrc: sxhkd/sxhkdrc mkdir -p $(HOME)/.config/sxhkd/ @@ -52,25 +62,25 @@ $(HOME)/.ctwmrc: ctwm/ctwmrc cp ctwm/ctwmrc $(HOME)/.ctwmrc $(HOME)/.env: sh/env - cp sh/env $(HOME)/.env + ln -s sh/env $(HOME)/.env $(HOME)/.gitconfig: git/gitconfig cp git/gitconfig $(HOME)/.gitconfig $(HOME)/.nethackrc: nethack/nethackrc - cp nethack/nethackrc $(HOME)/.nethackrc + ln -s nethack/nethackrc $(HOME)/.nethackrc $(HOME)/.profile: sh/profile - cp sh/profile $(HOME)/.profile + ln -s sh/profile $(HOME)/.profile $(HOME)/.vimrc: vim/vimrc - cp vim/vimrc $(HOME)/.vimrc + ln -s vim/vimrc $(HOME)/.vimrc $(HOME)/.xinitrc: xinit/xinitrc - cp xinit/xinitrc $(HOME)/.xinitrc + ln -s xinit/xinitrc $(HOME)/.xinitrc $(HOME)/.Xresources: X/Xresources - cp X/Xresources $(HOME)/.Xresources + ln -s X/Xresources $(HOME)/.Xresources $(HOME)/.config/youtube-dl/youtube-dl.conf: youtube-dl/youtube-dl.conf mkdir -p $(HOME)/.config/youtube-dl diff --git a/trinitystuff/X/Xresources b/trinitystuff/X/Xresources index 7eab4dd..5ce1ccf 100644 --- a/trinitystuff/X/Xresources +++ b/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 diff --git a/trinitystuff/helix/config.toml b/trinitystuff/helix/config.toml new file mode 100644 index 0000000..2374c34 --- /dev/null +++ b/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" diff --git a/trinitystuff/helix/trinity.toml b/trinitystuff/helix/trinity.toml new file mode 100644 index 0000000..823d5bd --- /dev/null +++ b/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" } diff --git a/trinitystuff/sh/aliases b/trinitystuff/sh/aliases index 61478c9..98d142a 100644 --- a/trinitystuff/sh/aliases +++ b/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 diff --git a/trinitystuff/sh/profile b/trinitystuff/sh/profile index 4a29d0e..1f52720 100644 --- a/trinitystuff/sh/profile +++ b/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 diff --git a/trinitystuff/sxhkd/sxhkdrc b/trinitystuff/sxhkd/sxhkdrc index 1cea657..c3f2fbd 100755 --- a/trinitystuff/sxhkd/sxhkdrc +++ b/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