djcev.com

//

Git Repos / dotfiles / commit 9215da4

Commit: 9215da4414fb9ac4d27ed1802a01ff8630ef3355
Parent: a00c81a4644129d0335ca0565f4639957a8fa4e2
Author: Cameron Vanderzanden, 2024-01-02 05:12
Committer: Cameron Vanderzanden, 2024-01-02 05:12

Commit Message

Change from FreeBSD to Linux, other minor changes

In the time since this repo was last updated I changed window managers
(from herbstluftwm to WindowMaker for a while) and then changed
operating systems (from FreeBSD to Linux). I'm currently running the
MATE desktop environment on Debian with the herbstluftwm WM (back
to herbs after maybe a year).

There isn't as much textfile configuration to do under MATE as there
was with my previous setup so I slacked on maintaining these dotfiles.
Having said that I've modified the FreeBSD.mk makefile into a new
Linux / GNU makefile (Linux.mk), and I"ve updated some paths in my
shell scripts and also updated my herbstluftwm autostart.

There's more to clean up here still, but I want to get this in for
revision tracking purposes.

Change List

Diff FreeBSD.mk

diff --git a/FreeBSD.mk b/FreeBSD.mk
index 27c93c2..a04ce1d 100644
--- a/FreeBSD.mk
+++ b/FreeBSD.mk
@@ -1,3 +1,5 @@
+### For use with FreeBSD; last checked in 2023
+
# install locations, permissions, ownership.
COLORFIX= ./fixcolors.sh
COLOREXT= fix

Return to the top of this page or return to the overview of this repo.

Diff Linux.mk

diff --git a/Linux.mk b/Linux.mk
new file mode 100644
index 0000000..897099e
--- /dev/null
+++ b/Linux.mk
@@ -0,0 +1,86 @@
+### For use with Linux; last checked in 2024
+
+# install locations, permissions, ownership.
+COLORFIX=./fixcolors.sh
+COLOREXT=fix
+INSTALL?=/usr/bin/install
+DESTDIR?=/tmp
+INSTALLDIR?=$(HOME)
+INTODIR=$(DESTDIR)$(INSTALLDIR)
+LOCALDIR=$(INTODIR)/.local
+CONFDIR=$(INTODIR)/.config
+CONFSUBDIRS!=find config -type d -print | sort | cut -d'/' -f 2-
+BINM=740
+REGM=640
+# GROUP!=stat -f '%Sg' $(INSTALLDIR)
+# files that need to be processed by COLORFIX
+HEXFILES= config/Xdefaults \
+ config/alacritty/alacritty.yml \
+ config/dunst/dunstrc \
+ config/herbstluftwm/autostart \
+ config/jgmenu/jgmenurc \
+ config/mpv/config \
+ config/qt5ct/colors/termlike.conf \
+ config/tint2/tint2full.rc \
+ config/tint2/tint2systray.rc \
+ tmux.conf
+HEXNOPOUND= config/irssi/cev.theme
+RGBFILES= config/qtcurve/kdeglobals \
+ config/qterminal.org/color-schemes/autogen.colorscheme
+# static files
+BINFILES!= find bin -type f -print
+ROOTFILES= tmux.conf
+
+all: fix-colors
+
+$(HEXFILES):
+ $(COLORFIX) $(@).$(COLOREXT) $(@)
+
+$(HEXNOPOUND):
+ $(COLORFIX) -X $(@).$(COLOREXT) $(@)
+
+$(RGBFILES):
+ $(COLORFIX) -d $(@).$(COLOREXT) $(@)
+
+clean:
+ for f in $(HEXFILES) $(HEXNOPOUND) $(RGBFILES) ; do \
+ rm $$f ; \
+ done
+
+# Be careful not to name this the same as the shell script "fixcolors.sh".
+fix-colors: $(HEXFILES) $(HEXNOPOUND) $(RGBFILES)
+
+install: fix-colors install-confdirs install-static install-config
+
+install-static: install-bin install-q3a install-root
+
+install-confdirs:
+ for d in $(CONFSUBDIRS) ; do \
+ $(INSTALL) -d $(CONFDIR)/$$d ; \
+ done
+
+install-bin:
+ $(INSTALL) -d $(LOCALDIR)/bin
+ for f in $(BINFILES) ; do \
+ $(INSTALL) -c -m $(BINM) $$f $(LOCALDIR)/$$f ; \
+ done
+
+install-q3a:
+ $(INSTALL) -d $(INTODIR)/.q3a
+ $(INSTALL) -c -m $(REGM) q3a/cev.cfg $(INTODIR)/.q3a/
+ $(INSTALL) -c -m $(REGM) q3a/cvanderz_hud.cfg $(INTODIR)/.q3a/
+
+install-root: tmux.conf
+ for f in $(ROOTFILES) ; do \
+ $(INSTALL) -c -m $(REGM) $$f $(INTODIR)/.$$f ; \
+ done
+
+install-config:
+ # use the shell to do this part.
+ for f in $$(find config -type f \! -name '*.$(COLOREXT)' | sort); do \
+ $(INSTALL) -c -m $(REGM) $$f $(INTODIR)/.$$f; \
+ done
+ chmod $(BINM) $(INTODIR)/.config/herbstluftwm/autostart
+ chmod $(BINM) $(INTODIR)/.config/redshift/hooks/background.sh
+
+.PHONY: all clean

Return to the top of this page or return to the overview of this repo.

Diff README.md

diff --git a/README.md b/README.md
index 46d7f2e..ee2bd73 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
## Dotfiles

My local scripts & configuration files. Installation and management
-is done through the makefile FreeBSD.mk. Files that end with the
-(unfortunately ambiguous) ".fix" suffix contain strings like "xDK0h"
-that are defined in colordef\*.sh and are replaced/processed using
-sed by way of fixcolor.sh.
+is done through the makefile FreeBSD.mk or Linux.mk. Files that end
+with the (unfortunately ambiguous) ".fix" suffix contain strings like
+"xDK0h" that are defined in colordef\*.sh and are replaced/processed
+using sed by way of fixcolor.sh.

-My Quake 3 config is also included here, though there's probably
-something wrong with it.
+My Quake 1 and Quake 3 configs are also included here, though there's
+probably something wrong with them.

All files (unless explicitly stated otherwise) are made available under
the 2-clause simplified BSD license; see LICENSE for the full text.
@@ -15,8 +15,8 @@ the 2-clause simplified BSD license; see LICENSE for the full text.
### Environment & Software Choices

My system is, generally speaking, a modern amd64 PC running X windows
-on FreeBSD. 1080p (1920x1080) resolution, true color support (even in
-the terminal), et cetera. A pretty normal set of hardware in 2021 but
+on Linux. 1080p (1920x1080) resolution, true color support (even in
+the terminal), et cetera. A pretty normal set of hardware in 2024 but
worth calling out. These config files are written for that setup.

I use the X windows programs alacritty, conky, dunst, herbstluftwm,
@@ -54,16 +54,10 @@ a great big case statement. Only tested on FreeBSD. Please don't alias or
otherwise call it as ls, it's a very bad idea.

config/redshift/hooks/background.sh is an automated background selector &
-setter launched by redshift (http://jonls.dk/redshift/) when the redshift
+setter launched by redshift (<http://jonls.dk/redshift/>) when the redshift
period (day, transition, night) changes. I use sets of background art from
visual novels that depict scenes at different times of day. The conky
config at config/conky/conky.conf also hooks into this to draw a character
image with appropriate (day, transition, night) tinting and an expression
based on system load average.

-### Missing Dependencies
-
-Some of these config files, notably config/cmus/rc, require or reference
-scripts I've written that aren't in this repository. I intend to publish
-those missing scripts soon either in their own repo or in this one.
-

Return to the top of this page or return to the overview of this repo.

Diff bin/aliases.sh

diff --git a/bin/aliases.sh b/bin/aliases.sh
index d03ff6e..a0caa58 100644
--- a/bin/aliases.sh
+++ b/bin/aliases.sh
@@ -1,29 +1,30 @@
#!/bin/sh
-#- aliases.sh 2015/00/00, last updated 2021/12/04 cev
+#- aliases.sh 2015/00/00, last updated 2023/08/15 cev

-alias bpm="python3 $HOME/bin/taptempo.py"
+alias bpm="python3 $HOME/.local/bin/taptempo.py"
alias cd_info="isoinfo -RpJl -i"
-alias cr="cmus-remote"
+# alias cmus="~/.local/bin/cmus"
+# alias cr="cmus-remote"
alias d0="du -xhcd 0 * | sort -h"
# see https://gist.github.com/thebouv/8657674
alias ducks="du -hcs * | sort -hr | head -11"
-alias fetch="fetch -R"
-alias fetchmail="fetchmail -f $HOME/.config/fetchmailrc"
+# alias fetch="fetch -R"
+# alias fetchmail="fetchmail -f $HOME/.config/fetchmailrc"
alias grep="grep --color=auto -n"
alias g="grep -ri"
alias h="history"
-alias hc="herbstclient"
+# alias hc="herbstclient"
alias hd="hexdump -C"
alias hg="history 500 | grep"
-alias history="fc -l"
-alias irssi="/usr/local/bin/irssi --home=$HOME/.config/irssi"
+# alias history="fc -l"
+alias irssi="/usr/bin/irssi --home=$HOME/.config/irssi"
alias j="jobs"
-alias ls="ls -G" # colorize output
-alias ll="ls -G -l" # long display
+# alias ls="ls -G" # colorize output
+# alias ll="ls -G -l" # long display
alias m="$PAGER"
-alias mutt="mutt -F $HOME/.config/mutt/muttrc"
+# alias mutt="mutt -F $HOME/.config/mutt/muttrc"
alias p="$PAGER"
-alias print="vimcat"
+# alias print="vimcat"
alias pt2="pt2-clone"
alias py="python3"
alias python="python3"
@@ -33,52 +34,53 @@ alias shlvl="echo $SHLVL" # bash (and ksh?) only.
alias vi="vim"
alias z_df="df -h /storage2 /z/*"
#
-alias back="$HOME/bin/back.sh"
+alias back="$HOME/.local/bin/back.sh"
redshift_back="$HOME/.config/redshift/hooks/background.sh"
alias back_day="$redshift_back period-changed noop daytime"
alias back_interval="$redshift_back period-changed noop transition"
alias back_night="$redshift_back period-changed noop night"
unset redshift_back
-alias cd_audio="$HOME/bin/cd_audio.sh"
-alias cd_crypt="$HOME/bin/cd_crypt.sh"
-alias cdc="$HOME/bin/cd_crypt.sh"
-alias flac_bpm="$HOME/bin/tag_bpm.sh -f"
-alias flac_cover="$HOME/bin/tag_cover.sh -f"
-alias flac_key="$HOME/bin/tag_key.sh -f"
-alias flac_reencode="$HOME/bin/flac_reencode.sh"
-alias flac_rg="$HOME/bin/tag_rg.sh -f"
+alias cd_audio="$HOME/.local/bin/cd_audio.sh"
+alias cd_crypt="$HOME/.local/bin/cd_crypt.sh"
+alias cdc="$HOME/.local/bin/cd_crypt.sh"
+alias flac_bpm="$HOME/.local/bin/tag_bpm.sh -f"
+alias flac_cover="$HOME/.local/bin/tag_cover.sh -f"
+alias flac_key="$HOME/.local/bin/tag_key.sh -f"
+alias flac_reencode="$HOME/.local/bin/flac_reencode.sh"
+alias flac_rg="$HOME/.local/bin/tag_rg.sh -f"
alias flac_sides='for i in a*flac; do flac_cover -c "00 side a.jpg" "$i"; done && for i in b*flac; do flac_cover -c "00 side b.jpg" "$i"; done'
-alias flac_to_cbr320="$HOME/bin/audio_to_cbr320.sh -f"
-alias l1="$HOME/bin/lc.sh -1" # colorized ls-like, single column
-alias lc="$HOME/bin/lc.sh" # colorized ls-like
-alias mp3_bpm="$HOME/bin/tag_bpm.sh -3"
-alias mp3_cover="$HOME/bin/tag_cover.sh -3"
-alias mp3_key="$HOME/bin/tag_key.sh -3"
-alias mp3_rg="$HOME/bin/tag_rg.sh -3"
-alias mp3_to_cbr320="$HOME/bin/audio_to_cbr320.sh -3"
+alias flac_to_cbr320="$HOME/.local/bin/audio_to_cbr320.sh -f"
+alias l1="$HOME/.local/bin/lc.sh -1" # colorized ls-like, single column
+alias lc="$HOME/.local/bin/lc.sh" # colorized ls-like
+alias mp3_bpm="$HOME/.local/bin/tag_bpm.sh -3"
+alias mp3_cover="$HOME/.local/bin/tag_cover.sh -3"
+alias mp3_key="$HOME/.local/bin/tag_key.sh -3"
+alias mp3_rg="$HOME/.local/bin/tag_rg.sh -3"
+alias mp3_to_cbr320="$HOME/.local/bin/audio_to_cbr320.sh -3"
alias mp="mpv --quiet"
alias mp43="mpv --panscan=1.0 --quiet"
alias mph="mpv --af=lavfi=[highpass=f=100] --quiet"
+alias mpb="mpv --af=lavfi=[equalizer=f=50:t=h:width=200:g=-10] --quiet"
alias mpr="mpv --no-use-filedir-conf --quiet"
alias mplayer="mpv --quiet"
-alias mpt="$HOME/bin/mpt_single.sh"
-alias scs="$HOME/bin/scs4tool.sh"
-alias sss="$HOME/bin/sox_spectrogram.sh"
-alias tag_audio="$HOME/bin/tag_audio.sh"
-alias tag_bpm="$HOME/bin/tag_bpm.sh"
-alias tag_cover="$HOME/bin/tag_cover.sh"
-alias tag_key="$HOME/bin/tag_key.sh"
-alias tag_rg="$HOME/bin/tag_rg.sh"
-alias toggle="$HOME/bin/toggle.sh"
-alias tv="$HOME/bin/run_tv.sh"
-alias words="$HOME/bin/words.sh"
-alias youtube="$HOME/bin/youtube.sh"
+alias mpt="$HOME/.local/bin/mpt_single.sh"
+alias scs="$HOME/.local/bin/scs4tool.sh"
+alias sss="$HOME/.local/bin/sox_spectrogram.sh"
+alias tag_audio="$HOME/.local/bin/tag_audio.sh"
+alias tag_bpm="$HOME/.local/bin/tag_bpm.sh"
+alias tag_cover="$HOME/.local/bin/tag_cover.sh"
+alias tag_key="$HOME/.local/bin/tag_key.sh"
+alias tag_rg="$HOME/.local/bin/tag_rg.sh"
+alias toggle="$HOME/.local/bin/toggle.sh"
+alias tv="$HOME/.local/bin/run_tv.sh"
+alias words="$HOME/.local/bin/words.sh"
+alias youtube="$HOME/.local/bin/youtube.sh"

mp3_bug() {
file --mime-type -N "$@" | /usr/bin/grep "application/octet-stream"
}

blogrep() {
- grep -s "$@" /z/work/cev/w/_posts/*/*
+ grep -s "$@" /z/work/cvanderz/w/_posts/*/*
}

Return to the top of this page or return to the overview of this repo.

Diff bin/audio_to_cbr320.sh

diff --git a/bin/audio_to_cbr320.sh b/bin/audio_to_cbr320.sh
index b8ef78b..f9134a0 100755
--- a/bin/audio_to_cbr320.sh
+++ b/bin/audio_to_cbr320.sh
@@ -19,7 +19,7 @@
#
# TODO: This needs better error checking.

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
mode=""

Return to the top of this page or return to the overview of this repo.

Diff bin/back.sh

diff --git a/bin/back.sh b/bin/back.sh
index cf3987b..7745ec7 100755
--- a/bin/back.sh
+++ b/bin/back.sh
@@ -28,12 +28,12 @@
# http://www.linuxforums.org/forum/programming-scripting/ \
# 121380-random-file-folder-sub-folders.html

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
action='aspect'
-bgdir="/z/gfx/wallpapers/"
-method="wmsetbg"
+bgdir="$HOME/Pictures/Wallpapers"
+method="dconf-mate"

cleanup() {
if [ "$tfile" -a -r "$tfile" ]; then rm "$tfile"; fi
@@ -89,12 +89,24 @@ setbg() {
# https://github.com/awesomeWM/awesome/blob/ \
# 2853d58f52cfbc4515fad7f45875d5cd31b1085e/utils/awsetbg
case $method in
+ dconf-mate)
+ setter="$(which dconf) write "
+ setter="$setter /org/mate/desktop/background/picture-filename"
+ aspect=""
+ center=""
+ full=""
+ tile=""
+ namepre="'"
+ namepost="'"
+ ;;
hsetroot)
setter="$(which hsetroot)"
aspect="-full"
center="-center"
full="-fill"
tile="-tile"
+ namepre=""
+ namepost=""
;;
pcmanfm)
setter="$(which pcmanfm-qt) --set-wallpaper"
@@ -102,6 +114,8 @@ setbg() {
center=""
full=""
tile=""
+ namepre=""
+ namepost=""
;;
wmsetbg)
setter="$(which wmsetbg)"
@@ -109,20 +123,25 @@ setbg() {
center="-b black -e"
full="-s -S"
tile="-t"
+ namepre=""
+ namepost=""
;;
*) die_invalid_method "$method" ;;
esac

if [ "$verbose" ]; then
- $setter $(eval echo \$${action}) "$@"
+ print_self
+ printf "wallpaper name %s\n" "$@"
+ $setter $(eval echo \$${action}) "$namepre""$@""$namepost"
else
- $setter $(eval echo \$${action}) "$@" 1>/dev/null 2>&1
+ $setter $(eval echo \$${action}) \
+ "$namepre""$@""$namepost" 1>/dev/null 2>&1
fi
}

[ -z "$DISPLAY" ] && die_no_x

-while getopts "acd:fhm:tV?" option; do
+while getopts "acd:fhm:tvV?" option; do
case $option in
a) action='aspect' ;;
c) action='center' ;;

Return to the top of this page or return to the overview of this repo.

Diff bin/cd_audio.sh

diff --git a/bin/cd_audio.sh b/bin/cd_audio.sh
index 32687d2..651544d 100755
--- a/bin/cd_audio.sh
+++ b/bin/cd_audio.sh
@@ -21,7 +21,7 @@
# Todo: switch from specifying filetype to detecting filetype? Would allow
# generation of audio CDs from mixed format sources.

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
mode="mp3"

Return to the top of this page or return to the overview of this repo.

Diff bin/flac_reencode.sh

diff --git a/bin/flac_reencode.sh b/bin/flac_reencode.sh
index 7b7d959..953c590 100755
--- a/bin/flac_reencode.sh
+++ b/bin/flac_reencode.sh
@@ -14,7 +14,7 @@
# References:
# http://unix.aspcode.net/view/63539508700411522976682/copy-all-tags-from-one-flac-file-to-another

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
tdir=""

Return to the top of this page or return to the overview of this repo.

Diff bin/flac_to_mp3.sh

diff --git a/bin/flac_to_mp3.sh b/bin/flac_to_mp3.sh
index ecd270f..043db8e 100755
--- a/bin/flac_to_mp3.sh
+++ b/bin/flac_to_mp3.sh
@@ -19,7 +19,7 @@
# This hasn't been touched in a while and may or may not work. Haven't
# needed it since I stopped transcoding to mp3 in scs4tool.sh.

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
cwd=""

Return to the top of this page or return to the overview of this repo.

Diff bin/get_rss.sh

diff --git a/bin/get_rss.sh b/bin/get_rss.sh
index 6b34c89..353d472 100755
--- a/bin/get_rss.sh
+++ b/bin/get_rss.sh
@@ -18,7 +18,7 @@
##
#

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"

Return to the top of this page or return to the overview of this repo.

Diff bin/hc_notify.sh

diff --git a/bin/hc_notify.sh b/bin/hc_notify.sh
index c0dc6e6..a1e9230 100755
--- a/bin/hc_notify.sh
+++ b/bin/hc_notify.sh
@@ -22,7 +22,7 @@
#
# This could use some updating.

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
timeout=1000

Return to the top of this page or return to the overview of this repo.

Diff bin/hc_swap.sh

diff --git a/bin/hc_swap.sh b/bin/hc_swap.sh
index 590d41f..8494883 100755
--- a/bin/hc_swap.sh
+++ b/bin/hc_swap.sh
@@ -16,7 +16,7 @@
# Script logic is fundamentally unchanged from everett1992's version.
# All I've done is throw a bunch of junk in.

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
dir=""

Return to the top of this page or return to the overview of this repo.

Diff bin/lc.sh

diff --git a/bin/lc.sh b/bin/lc.sh
index 153f390..eb62642 100755
--- a/bin/lc.sh
+++ b/bin/lc.sh
@@ -22,7 +22,7 @@
##
#

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"

Return to the top of this page or return to the overview of this repo.

Diff bin/mpt_single.sh

diff --git a/bin/mpt_single.sh b/bin/mpt_single.sh
index c1ea775..45e8cce 100755
--- a/bin/mpt_single.sh
+++ b/bin/mpt_single.sh
@@ -16,7 +16,7 @@
#
# TODO: This could be fleshed out quite a bit.

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"

Return to the top of this page or return to the overview of this repo.

Diff bin/scs4tool.sh

diff --git a/bin/scs4tool.sh b/bin/scs4tool.sh
index a8f4f47..7a7fc99 100755
--- a/bin/scs4tool.sh
+++ b/bin/scs4tool.sh
@@ -27,8 +27,8 @@
##
#

-if [ -x $HOME/bin/cev_print.sh ]; then
- . $HOME/bin/cev_print.sh
+if [ -x $HOME/.local/bin/cev_print.sh ]; then
+ . $HOME/.local/bin/cev_print.sh
else
print_help() { grep "^## " "$0" | cut -c 4-; }
print_version() { grep "^#- " "$0" | cut -c 4-; }

Return to the top of this page or return to the overview of this repo.

Diff bin/sox_spectrogram.sh

diff --git a/bin/sox_spectrogram.sh b/bin/sox_spectrogram.sh
index d914af2..d0714ff 100755
--- a/bin/sox_spectrogram.sh
+++ b/bin/sox_spectrogram.sh
@@ -17,7 +17,7 @@
## -V Print version info
# TODO: implement option to choose image viewer; currently xdg-open

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
comment=""

Return to the top of this page or return to the overview of this repo.

Diff bin/tag_audio.sh

diff --git a/bin/tag_audio.sh b/bin/tag_audio.sh
index 495d927..f3ee738 100755
--- a/bin/tag_audio.sh
+++ b/bin/tag_audio.sh
@@ -24,7 +24,7 @@
## -V Print version info
#

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
filetype=""

Return to the top of this page or return to the overview of this repo.

Diff bin/tag_cover.sh

diff --git a/bin/tag_cover.sh b/bin/tag_cover.sh
index c4dc644..86ca58c 100755
--- a/bin/tag_cover.sh
+++ b/bin/tag_cover.sh
@@ -21,7 +21,7 @@
# TODO: better error checking.
# TODO: implement option to choose image viewer instead of xdg-open

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
filetype=""

Return to the top of this page or return to the overview of this repo.

Diff bin/tag_key.sh

diff --git a/bin/tag_key.sh b/bin/tag_key.sh
index c4f897a..3e2cb1f 100755
--- a/bin/tag_key.sh
+++ b/bin/tag_key.sh
@@ -22,10 +22,10 @@
#
# TODO: Split writing to KEY and COMMENT to different options.

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
-keybin="$HOME/bin/key"
+keybin="$HOME/.local/bin/key"
filetype=""
fileext=""
write=""

Return to the top of this page or return to the overview of this repo.

Diff bin/tag_rg.sh

diff --git a/bin/tag_rg.sh b/bin/tag_rg.sh
index 27bdf68..0608a8e 100755
--- a/bin/tag_rg.sh
+++ b/bin/tag_rg.sh
@@ -18,7 +18,7 @@
## -V Print version info
#

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
filetype=""

Return to the top of this page or return to the overview of this repo.

Diff bin/test_mimetype.sh

diff --git a/bin/test_mimetype.sh b/bin/test_mimetype.sh
index fefda7e..feb5ceb 100755
--- a/bin/test_mimetype.sh
+++ b/bin/test_mimetype.sh
@@ -15,7 +15,7 @@
## -v Verbose
## -V Print version info

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
testtype="text/plain"

Return to the top of this page or return to the overview of this repo.

Diff bin/toggle.sh

diff --git a/bin/toggle.sh b/bin/toggle.sh
index 5dd49da..f9e10a1 100755
--- a/bin/toggle.sh
+++ b/bin/toggle.sh
@@ -14,7 +14,7 @@
## -V Print version info.
##

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
exe=""

Return to the top of this page or return to the overview of this repo.

Diff bin/words.sh

diff --git a/bin/words.sh b/bin/words.sh
index 954c8b1..0a4fa28 100755
--- a/bin/words.sh
+++ b/bin/words.sh
@@ -17,7 +17,7 @@
##
#

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"

Return to the top of this page or return to the overview of this repo.

Diff bin/xvt.sh

diff --git a/bin/xvt.sh b/bin/xvt.sh
index 572c0da..64c6441 100755
--- a/bin/xvt.sh
+++ b/bin/xvt.sh
@@ -20,7 +20,7 @@
# This'll break if you run a shell within a shell. It (should) only detect
# the outside shell. Might be fixed by altering the logic to check PPID.

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
cwd=""

Return to the top of this page or return to the overview of this repo.

Diff bin/youtube.sh

diff --git a/bin/youtube.sh b/bin/youtube.sh
index 10e9000..745ee15 100755
--- a/bin/youtube.sh
+++ b/bin/youtube.sh
@@ -3,7 +3,7 @@
#- youtube.sh 2015/00/00 cev
# simple wrapper script.

-youtube-dl \
+/z/work/yt-dlp/yt-dlp.sh \
-f 18 \
-o '%(autonumber)s-%(title)s-%(id)s.%(ext)s' \
--restrict-filename \

Return to the top of this page or return to the overview of this repo.

Diff config/herbstluftwm/autostart.fix

diff --git a/config/herbstluftwm/autostart.fix b/config/herbstluftwm/autostart.fix
index e4b6e7c..cc7e1f2 100644
--- a/config/herbstluftwm/autostart.fix
+++ b/config/herbstluftwm/autostart.fix
@@ -53,24 +53,25 @@ hc detect_monitors
hc keybind $mod-Shift-q quit
hc keybind $mod-Shift-r reload
hc keybind $mod-space spawn /usr/local/bin/jgmenu_run
-hc keybind $mod-Return spawn xvt.sh -n
+hc keybind $mod-Return spawn $HOME/.local/bin/xvt.sh -n
hc keybind $mod-Delete close
hc keybind $mod-End spawn picom-trans -c 85
hc keybind $mod-Home spawn picom-trans -c 100
-hc keybind $mod-Page_Up spawn picom-trans -c +5
-hc keybind $mod-Page_Down spawn picom-trans -c -- -5
-hc keybind Pause spawn fix_clip.sh
+hc keybind $mod-Page_Up jumpto last-minimized
+hc keybind $mod-Page_Down spawn herbstclient attr clients.focus.minimized true
+hc keybind Pause spawn $HOME/.local/bin/fix_clip.sh
hc keybind $mod-period use_index +1 --skip-visible
hc keybind $mod-comma use_index -1 --skip-visible
hc keybind $mod-BackSpace cycle_monitor
-hc keybind $mod-m cycle_all +1
-hc keybind $mod-Shift-m cycle_all -1
+hc keybind $mod-m cycle +1
+hc keybind $mod-Shift-m cycle -1
hc keybind $mod-c cycle +1
hc keybind $mod-Shift-c cycle -1
hc keybind $mod-n cycle +1
hc keybind $mod-Shift-n cycle -1
hc keybind $mod-i jumpto urgent
-hc keybind $mod-Tab use_previous
+hc keybind $mod-Tab cycle_all +1
+hc keybind $mod-Shift-Tab cycle_all -1


# keyboard bindings / layouting
@@ -130,14 +131,18 @@ hc keybind $mod-KP_5 load "$l_h_three"
hc keybind $mod-KP_6 load "$l_h_right"
hc keybind $mod-KP_Right load "$l_h_right"
hc keybind $mod-KP_7 load "$l_vh_1"
-hc keybind $mod-KP_HOME load "$l_vh_1"
+# TODO CEV
+# hc keybind $mod-KP_HOME load "$l_vh_1"
hc keybind $mod-KP_8 load "$l_vh_2"
hc keybind $mod-KP_Up load "$l_vh_2"
hc keybind $mod-KP_9 load "$l_vh_3"
hc keybind $mod-KP_Page_Up load "$l_vh_3"

# preload some layouts
-hc load "F1" "$l_h_left"
+hc floating "F1" on
+hc floating "F2" on
+hc floating "F3" on
+hc floating "F4" on

# mouse bindings
hc mouseunbind --all
@@ -146,8 +151,7 @@ hc mousebind $mod-Button2 zoom
hc mousebind $mod-Button3 resize

# settings / attributes
-hc attr settings.always_show_frame 1
-hc attr settings.auto_detect_panels 'false'
+hc attr settings.auto_detect_panels 'true'
hc attr settings.default_frame_layout 2
hc attr settings.frame_bg_transparent 'true'
hc attr settings.frame_border_width 0
@@ -164,29 +168,33 @@ hc attr settings.focus_follows_mouse 0
hc attr settings.tree_style '*| +`--.'
hc attr theme.tiling.reset 0
hc attr theme.floating.reset 0
-hc attr theme.border_width 0
-hc attr theme.inner_width 0
-hc attr theme.outer_width 0
-hc attr theme.padding_top 0
+hc attr theme.border_width 0 # 8
+hc attr theme.inner_width 0 # 0
+hc attr theme.outer_width 0 # 4 (?)
+hc attr theme.padding_top 8 # for a not-titelbar
hc attr theme.padding_left 0
-hc attr theme.padding_bottom 0
+hc attr theme.padding_bottom 4 # like WindowMaker
hc attr theme.padding_right 0
-hc attr theme.title_depth 8
-hc attr theme.title_height 27
-hc attr theme.title_font 'Inconsolata-24'
+hc attr theme.title_align 'left' # 'center'
+hc attr theme.title_depth 0 # 8 is good
+hc attr theme.title_height 0 # 22 is good
+hc attr theme.title_font 'Inconsolata-20'

# colors
hc attr theme.background_color 'xDK0h'
hc attr theme.color 'xDK0s'
-hc attr theme.outer_color 'xDK0h'
+hc attr theme.inner_color 'xDK0s'
+hc attr theme.outer_color 'xDK1'
hc attr theme.title_color 'xDK4'
hc attr theme.active.background_color 'xDK1'
-hc attr theme.active.color 'xDK2'
-hc attr theme.active.outer_color 'xDK1'
+hc attr theme.active.color 'xDK0h'
+hc attr theme.active.inner_color 'xDK0h'
+hc attr theme.active.outer_color 'xDK0'
hc attr theme.active.title_color 'xLT4'
hc attr theme.urgent.background_color 'xORNf'
hc attr theme.urgent.color 'xORNn'
-hc attr theme.urgent.outer_color 'xORNf'
+hc attr theme.urgent.inner_color 'xORNf'
+hc attr theme.urgent.outer_color 'xORNb'
hc attr theme.urgent.title_color 'xDK0'
hc attr settings.frame_bg_normal_color 'xDK0h'
hc attr settings.frame_bg_active_color 'xDK0h'
@@ -199,9 +207,17 @@ hc rule focus=off
hc rule class=mpv focus=off pseudotile=off
hc rule class=XConsole focus=off tag="$(nameforidx 3 $tagnames)" index=0
hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)' manage=off
+hc rule class=Dock_applet.py manage=off
+# windows that shouldn't be decorated
+hc rule class=Caja hook=undecorate
+hc rule class=Com.github.jmoerman.go-for-it hook=undecorate
# windows that should get focus. terminal emulators, image viewers, etc.
hc rule class=Alacritty focus=on
+hc rule class=Eom focus=on
+hc rule class=Gimp-2.10 focus=on
+hc rule class=Io.github.celluloid_player.Celluloid focus=on
hc rule class=lximage-qt focus=on
+hc rule class=Mate-terminal focus=on
hc rule class=qterminal focus=on
hc rule class=steam_proton floating=on
hc rule class=Sxiv focus=on
@@ -220,12 +236,11 @@ hc rule windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' floating=on
# web browsers
hc rule class=Chromium-browser focus=off tag="$(nameforidx 4 $tagnames)"
hc rule class=Falkon focus=off tag="$(nameforidx 4 $tagnames)"
+hc rule class=Firefox-esr focus=on
hc rule class=Navigator focus=off tag="$(nameforidx 4 $tagnames)"
hc rule class=QupZilla focus=off tag="$(nameforidx 4 $tagnames)"

# final setup
hc unlock
-/usr/local/bin/tint2 -c ~/.config/tint2/tint2full.rc &
-hc pad 0 0 0 0 0 # zero out padding
-hc pad 1 0 0 0 64
+hc pad 0 32 0 0 0
printf 'config/herbstluftwm/autostart: ...complete\n'

Return to the top of this page or return to the overview of this repo.

Diff config/tint2/tint2systray.rc.fix

diff --git a/config/tint2/tint2systray.rc.fix b/config/tint2/tint2systray.rc.fix
index 6639376..16bbd4a 100644
--- a/config/tint2/tint2systray.rc.fix
+++ b/config/tint2/tint2systray.rc.fix
@@ -104,13 +104,13 @@ border_color_pressed = xDK0h 80
# Panel
panel_items = SP
panel_position = bottom left vertical
-panel_size = 384 64
+panel_size = 440 64
panel_margin = 0 0
panel_padding = 0 0 0
panel_background_id = 1
panel_monitor = 1
panel_dock = 0
-panel_layer = bottom
+panel_layer = normal
panel_shrink = 1
panel_window_name = tint2
font_shadow = 0

Return to the top of this page or return to the overview of this repo.

Diff fixcolors.sh

diff --git a/fixcolors.sh b/fixcolors.sh
index c65958a..8b2bdba 100755
--- a/fixcolors.sh
+++ b/fixcolors.sh
@@ -20,7 +20,7 @@
## -X Hexadecimal output without the prefixed #. (xxxxxx form).
##

-[ -x $HOME/bin/cev_print.sh ] && . $HOME/bin/cev_print.sh
+[ -x $HOME/.local/bin/cev_print.sh ] && . $HOME/.local/bin/cev_print.sh

self="${0##*'/'}"
colordef="./colordef_gruvbox.sh"

Return to the top of this page or return to the overview of this repo.

Diff q1/cev.cfg

diff --git a/q1/cev.cfg b/q1/cev.cfg
index 6a9314b..7063d3e 100644
--- a/q1/cev.cfg
+++ b/q1/cev.cfg
@@ -57,8 +57,8 @@ crosshair "1"
joy_enable "0"

//
-gl_cshiftpercent "22"
-gl_texturemode GL_LINEAR_MIPMAP_LINEAR
+gl_cshiftpercent "0"
+gl_texturemode GL_NEAREST_MIPMAP_LINEAR

// FOV for 4:3 gameplay
fov "96"

Return to the top of this page or return to the overview of this repo.

Diff q3a/cev.cfg

diff --git a/q3a/cev.cfg b/q3a/cev.cfg
index 3c6425d..ea0a032 100644
--- a/q3a/cev.cfg
+++ b/q3a/cev.cfg
@@ -40,9 +40,9 @@ bind g "+movedown"

// weapons
bind "SEMICOLON" "weapon 4"
-bind o "weapon 7"
+bind "o" "weapon 3"
bind "p" "weapon 7"
-bind u "weapon 6"
+bind "u" "weapon 6"

// misc
bind TAB "+scores"
@@ -76,7 +76,7 @@ bind MWHEELUP "weapon 2"
seta in_mouse "1"
seta m_accel "0"
// seta sensitivity "4"
-seta m_speed "4"
+seta m_speed "2.3"

// cg - client game?
seta cg_altLightning "0"
@@ -124,52 +124,16 @@ seta g_spSkill "85"
seta cl_renderer "opengl2"
seta com_maxfps "125"
seta r_allowExtensions 1
-seta r_autoExposure 1
-seta r_baseGloss 0.1
-seta r_baseNormalX 1.222
-seta r_baseNormalY 1.222
-seta r_baseParallax 0.05
-seta r_baseSpecular 0.02
-seta r_deluxeMapping 1
-seta r_depthPrepass 1
-seta r_dlightmode 0
-seta r_drawSun 1
-seta r_drawSunRays 1
-seta r_dynamiclight 1
-seta r_ext_compiled_vertex_array 1
-seta r_ext_compressed_textures 1
-seta r_ext_framebuffer_multisample 0
-seta r_ext_gamma_control 0
-seta r_ext_multisample 0
-seta r_ext_multitexture 1
-seta r_ext_texture_filter_anisotropic 2
-seta r_flares 0
seta r_gamma 1
-seta r_genNormalMaps 1
-seta r_hdr 1
-seta r_ignorehwgamma 1
-seta r_intensity 2
seta r_mapoverbrightbits 1
// seta r_mapBrightness 1.5
seta r_normalMapping 2
seta r_overbrightbits 1
// seta r_brightness 1
-seta r_parallaxMapping 1
seta r_picmip 0
-seta r_postProcess 1
seta r_railWidth 64
-seta r_roundImagesDown 0
-seta r_shadowFilter 0
-seta r_shadowBlur 1
-seta r_softOverbright 1
-seta r_specularMapping 1
-seta r_ssao 1
-seta r_stencilbits 8
-seta r_subdivisions 4
-seta r_sunShadows 1
seta r_swapInterval 0
seta r_textureMode "GL_LINEAR_MIPMAP_LINEAR"
-seta r_toneMap 1
seta r_vertexlight 0

// sound

Return to the top of this page or return to the overview of this repo.