From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 15 Jun 2024 15:36:59 +0000 (+0300)
Subject: I use nsxiv now
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;ds=sidebyside;h=HEAD;hp=9d0713a36dc003697856079aae6ae31c7ae98bf8;p=dotfiles.git

I use nsxiv now
---

diff --git a/bin/bin/my-cleanup b/bin/bin/my-cleanup
index 925e9c4..b27d884 100755
--- a/bin/bin/my-cleanup
+++ b/bin/bin/my-cleanup
@@ -5,6 +5,7 @@ rm -fr \
     ~/.cache ~/.config ~/.local* ~/.thumbnails \
     ~/.w3m \
     ~/.java \
+    ~/.gnome \
     ~/.pylint.d \
     ~/.viminfo \
     ~/.Trash \
diff --git a/bin/bin/my-ps2pdf b/bin/bin/my-ps2pdf
index 5510c18..01e37bd 100755
--- a/bin/bin/my-ps2pdf
+++ b/bin/bin/my-ps2pdf
@@ -15,7 +15,7 @@ opts=(
     -dPDFSETTINGS=/default
     -dPDFA=1
     -dCompatibilityLevel=1.4
-    -dPDFACompatibilityPolicy=3 # that will skip some errors about XMP
+    -sPDFACompatibilityPolicy=3 # that will skip some errors about XMP
     -dAutoRotatePages=/None
     -dOptimize=true
     -sColorConversionStrategy=RGB # advised for PDF/A
@@ -38,8 +38,9 @@ exiftool $1.pdf | while read l ; do
 done
 for i ({1..${#toremove}}) toremove[$i]=-${toremove[$i]}=
 exiftool -zip -overwrite_original -quiet \
-    -tagsFromFile $1 -Producer\>Creator \
-    ${=toremove} $1.pdf
+    -tagsFromFile $1 -Creator\<Producer $1.pdf
+exiftool -zip -overwrite_original -quiet \
+    -tagsFromFile $1 -Producer\>Creator ${=toremove} $1.pdf
 [[ -z $LINEARIZE ]] || LINEARIZE=--linearize
 qpdf $LINEARIZE --compress-streams=y $1.pdf $1.pdf.pdf
 mv $1.pdf.pdf $1.pdf
diff --git a/git/.gitconfig b/git/.gitconfig
index bd6ae59..7d19ce5 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,6 +3,7 @@
 [advice]
 	pushUpdateRejected = false
 	detachedHead = false
+	addIgnoredFile = false
 [alias]
 	wt = worktree
 	unchanged = update-index --assume-unchanged
diff --git a/gnupg/.gnupg/gpg-agent.conf b/gnupg/.gnupg/gpg-agent.conf
index 2216402..e5a309f 100644
--- a/gnupg/.gnupg/gpg-agent.conf
+++ b/gnupg/.gnupg/gpg-agent.conf
@@ -1,2 +1,2 @@
-pinentry-program /home/stargrave/local/bin/pinentry-curses
+pinentry-program /home/stargrave/env/local/bin/pinentry-curses
 default-cache-ttl 14400
diff --git a/img/bin/my-transcode-jpg b/img/bin/my-transcode-jpg
index bf4863d..2f299a9 100755
--- a/img/bin/my-transcode-jpg
+++ b/img/bin/my-transcode-jpg
@@ -2,7 +2,9 @@
 
 tmp=`mktemp`
 trap "rm -f $tmp $tmp.jpg" HUP PIPE INT QUIT TERM EXIT
-jpegtran -optimize -progressive -perfect -copy all "$1" > $tmp.jpg
-cjxl $tmp.jpg "${1%.*}.jxl" --distance=0 --effort=9 --brotli_effort=11 --lossless_jpeg=1
-[ -s "${1%.*}.jxl" ]
-touch -r "$1" "${1%.*}.jxl"
+src="$1"
+shift
+jpegtran -optimize -progressive -perfect -copy all "$src" >$tmp.jpg
+cjxl $tmp.jpg "${src%.*}.jxl" $@ --distance=0 --effort=9 --brotli_effort=11 --lossless_jpeg=1
+[ -s "${src%.*}.jxl" ]
+touch -r "$src" "${src%.*}.jxl"
diff --git a/links/bin/xom b/links/bin/xom
index 57d4f5c..3c8168c 100755
--- a/links/bin/xom
+++ b/links/bin/xom
@@ -10,9 +10,12 @@ if [ $# -gt 1 ] ; then
     pep) url="https://www.python.org/dev/peps/pep-0$@/" ;;
     py) url="https://pypi.org/project/$@/" ;;
     rfc) url="https://datatracker.ietf.org/doc/html/rfc$@" ;;
-    s) url="https://html.duckduckgo.com/html?q=$@" ;;
+    s) url="https://search.brave.com/search?q=$@" ;;
     we) url="https://en.wikipedia.org/wiki/$@" ;;
     wr) url="https://ru.wikipedia.org/wiki/$@" ;;
     esac
 fi
-exec links -g "$url"
+[ -e /tmp/stargrave-flags/HI ] || {
+    fonts="-menu-font-size 16 -html-user-font-size 20"
+}
+exec links -g $fonts "$url"
diff --git a/lynx/.lynx_jumps.html b/lynx/.lynx_jumps.html
index 95d897f..432b861 100644
--- a/lynx/.lynx_jumps.html
+++ b/lynx/.lynx_jumps.html
@@ -9,7 +9,7 @@
 <dt>pep<dd><a href="https://www.python.org/dev/peps/pep-0%s/">PEP</a></dd>
 <dt>py<dd><a href="https://pypi.org/project/%s/">PyPI</a></dd>
 <dt>rfc<dd><a href="https://datatracker.ietf.org/doc/html/rfc%s">RFC</a></dd>
-<dt>s<dd><a href="https://html.duckduckgo.com/html?q=%s">DuckDuckGo</a></dd>
+<dt>s<dd><a href="https://search.brave.com/search?q=%s">Brave</a></dd>
 <dt>we<dd><a href="https://en.wikipedia.org/wiki/%s">WikiEN</a></dd>
 <dt>wr<dd><a href="https://ru.wikipedia.org/wiki/%s">WikiRU</a></dd>
 </dl>
diff --git a/lynx/.mailcap b/lynx/.mailcap
index 7e4cdc5..b4aeb92 100644
--- a/lynx/.mailcap
+++ b/lynx/.mailcap
@@ -2,20 +2,20 @@ application/epub+zip; zat '%s'; test=test -n "$DISPLAY"
 application/pdf; zat '%s'; test=test -n "$DISPLAY"
 application/vnd.gnupg.wks; gpg-wks-client -v --read --send; needsterminal; description=WKS message
 application/x-perl; pod2text --color '%s' | less; needsterminal
-image/gif; sxiv '%s'; test=test -n "$DISPLAY"
-image/jpeg; sxiv '%s'; test=test -n "$DISPLAY"
-image/jxl; sxiv '%s'; test=test -n "$DISPLAY"
-image/png; sxiv '%s'; test=test -n "$DISPLAY"
-image/tiff; sxiv '%s'; test=test -n "$DISPLAY"
-image/webp; sxiv '%s'; test=test -n "$DISPLAY"
+image/gif; nsxiv '%s'; test=test -n "$DISPLAY"
+image/jpeg; nsxiv '%s'; test=test -n "$DISPLAY"
+image/jxl; nsxiv '%s'; test=test -n "$DISPLAY"
+image/png; nsxiv '%s'; test=test -n "$DISPLAY"
+image/tiff; nsxiv '%s'; test=test -n "$DISPLAY"
+image/webp; nsxiv '%s'; test=test -n "$DISPLAY"
 image/x-djvu; zat '%s'; test=test -n "$DISPLAY"
-image/x-portable-anymap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-arbitrarymap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-bitmap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-floatmap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-graymap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-pixmap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-xpixmap; sxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-anymap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-arbitrarymap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-bitmap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-floatmap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-graymap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-pixmap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-xpixmap; nsxiv '%s'; test=test -n "$DISPLAY"
 text/html; lynx -noreferer -partial -assume_charset=%{charset} -dump %s; copiousoutput; nametemplate=%s.html
 text/info; info '%s'; needsterminal
 text/plain; less '%s'; needsterminal
diff --git a/mpv/.mpv/config b/mpv/.mpv/config
index b50b600..0b8c924 100644
--- a/mpv/.mpv/config
+++ b/mpv/.mpv/config
@@ -4,6 +4,8 @@ cache-secs=60
 display-tags=*
 gapless-audio=yes
 autosync=30
+cache-on-disk=no
+gpu-shader-cache=no
 audio-channels=2
 hwdec=vaapi
 hwdec-codecs=h264,hevc,vp8,vp9,mpeg2video,vc1
diff --git a/recoll/.zsh/env/005recoll.zsh b/recoll/.zsh/env/005recoll.zsh
index 11c8af1..d259cc9 100644
--- a/recoll/.zsh/env/005recoll.zsh
+++ b/recoll/.zsh/env/005recoll.zsh
@@ -1 +1 @@
-export RECOLL_DATADIR=~/local/stow/recoll/share/recoll
+export RECOLL_DATADIR=~/env/local/share/recoll
diff --git a/recoll/recoll/man/recoll.conf b/recoll/recoll/man/recoll.conf
index 25213e8..09a0506 100644
--- a/recoll/recoll/man/recoll.conf
+++ b/recoll/recoll/man/recoll.conf
@@ -9,5 +9,5 @@ topdirs = \
 	/usr/share/man \
 	/usr/local/share/info \
 	/usr/local/info \
-	~/local/share/man \
-	~/local/share/info
+	~/env/local/share/man \
+	~/env/local/share/info
diff --git a/vim/.vim/ftplugin/mutt/autos.vim b/vim/.vim/ftplugin/mutt/autos.vim
index 7708164..1290bbf 100644
--- a/vim/.vim/ftplugin/mutt/autos.vim
+++ b/vim/.vim/ftplugin/mutt/autos.vim
@@ -3,4 +3,5 @@ mutt#KillSignature()
 set textwidth=72
 set commentstring=>%s
 set syntax=mail
+set nocursorcolumn
 silent :%substitute /^> */>/e | set nohlsearch
diff --git a/vim/.vim/pack/stargrave/start/zshfe/autoload/zshfe.vim b/vim/.vim/pack/stargrave/start/zshfe/autoload/zshfe.vim
deleted file mode 100644
index bb94dd6..0000000
--- a/vim/.vim/pack/stargrave/start/zshfe/autoload/zshfe.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-vim9script
-
-export def Do(query: string, opencmd: string)
-    silent var result = systemlist(g:zshfe_path .. " " .. query)
-    if len(result) == 0 | return | endif
-    execute opencmd .. " " .. result[0][: -2]
-enddef
diff --git a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.vim b/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.vim
deleted file mode 100644
index cb05d99..0000000
--- a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.vim
+++ /dev/null
@@ -1,18 +0,0 @@
-vim9script
-
-# zsh file completion caller
-# Maintainer: Sergey Matveev <stargrave@stargrave.org>
-# License: GNU General Public License version 3 of the License or later
-
-if exists("*zshfe#Do") | finish | endif
-if !exists("g:zshfe_path")
-    g:zshfe_path = expand("<sfile>:p:h") .. "/zshfe.zsh"
-endif
-
-command! -nargs=1 Fe call zshfe#Do(<f-args>, "edit")
-command! -nargs=1 Fsp call zshfe#Do(<f-args>, "split")
-command! -nargs=1 Fvs call zshfe#Do(<f-args>, "vsplit")
-
-nmap <Leader>e :Fe 
-nmap <Leader><space> :Fsp 
-nmap <Leader>v :Fvs 
diff --git a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh b/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh
deleted file mode 100755
index 9222054..0000000
--- a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env zsh
-
-setopt ERR_EXIT
-zmodload zsh/zpty
-zpty zshfe zsh
-zpty -w zshfe "print ZSHFE $*"$'\t EFHSZ\nexit\n'
-zpty -r zshfe zshfe "*exit"
-print -- $zshfe | sed -n "s/^ZSHFE \(.*\) EFHSZ/\1/p"
diff --git a/vim/.vim/plugin/netrw.vim b/vim/.vim/plugin/netrw.vim
index 9b71a8d..6799cfc 100644
--- a/vim/.vim/plugin/netrw.vim
+++ b/vim/.vim/plugin/netrw.vim
@@ -4,6 +4,8 @@ g:loaded_mein_netrw = 1
 
 g:netrw_banner = 0
 g:netrw_bufsettings = "noma nomod nowrap ro nobl"
+g:netrw_liststyle = 1
+g:netrw_timefmt = "%F %T"
 
 def g:WinClose(islocal: number): string
     close
diff --git a/wish/.wishrc b/wish/.wishrc
new file mode 100644
index 0000000..6b3dc14
--- /dev/null
+++ b/wish/.wishrc
@@ -0,0 +1,6 @@
+if {[file exists /tmp/stargrave-flags/HI]} {
+    font create myDefaultFont -family Go -size 12
+    option add *font myDefaultFont
+    tk scaling [expr {163 / 72.0}]
+}
+tk_setPalette grey
diff --git a/x/.Xresources b/x/.Xresources
index 00f07a8..aec20aa 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,4 +1,3 @@
-Xft.dpi: 96
 Xft.hinting: true
 Xft.antialias: true
 Xft.autohint: false
diff --git a/x/.xinitrc b/x/.xinitrc
index 4717bbb..8d56962 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,10 +1,13 @@
 #!/bin/zsh
 
 xsetroot -solid \#222222
-xset b off
 setxkbmap -rules xorg -layout us,ru -option grp:caps_toggle,grp_led:caps
 xrdb ~/.Xresources
 xmodmap ~/.Xmodmap
 ~/work/godwmstat/godwmstat -xsetroot &
 rm -f ~/.ssh/agent ; ssh-agent -a $SSH_AUTH_SOCK
+if [[ -e /tmp/stargrave-flags/HI ]] ; then
+    xset m 4 1
+    ( sleep 30 ; xsetroot -xcf /usr/local/share/icons/Adwaita/cursors/left_ptr 42 ) &
+fi
 exec ~/src/suckless/dwm/dwm
diff --git a/x/bin/mylock b/x/bin/mylock
index e123f5b..57b1e1e 100755
--- a/x/bin/mylock
+++ b/x/bin/mylock
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-xset dpms force off
+[ -e /tmp/stargrave-flags/HI ] || xset dpms force off
 gpgconf --reload gpg-agent
 SSH_AUTH_SOCK=$HOME/.ssh/agent ssh-add -D
 slock
diff --git a/x/bin/start-im b/x/bin/start-im
index 69727ae..fc2f81c 100755
--- a/x/bin/start-im
+++ b/x/bin/start-im
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-st -t Terminal8 -e sh -c "cd /home/stargrave/secure/mmc ; /home/stargrave/work/mmc/cmd/start" 2>/dev/null &
+st -t Terminal8 -e sh -c "cd /home/stargrave/secure/mmc ; envdir env /home/stargrave/work/mmc/cmd/start" 2>/dev/null &
diff --git a/x/bin/start-x b/x/bin/start-x
index ca17aa2..cf889aa 100755
--- a/x/bin/start-x
+++ b/x/bin/start-x
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 rm .serverauth.* .Xauthority*
-exec startx
+exec startx $@
diff --git a/x/bin/start-x-hidpi b/x/bin/start-x-hidpi
new file mode 100755
index 0000000..461753e
--- /dev/null
+++ b/x/bin/start-x-hidpi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mkdir -p /tmp/stargrave-flags
+touch /tmp/stargrave-flags/HI
+exec start-x -- -dpi 163
diff --git a/zathura/.zathurarc b/zathura/.zathurarc
index 39be0c1..6523573 100644
--- a/zathura/.zathurarc
+++ b/zathura/.zathurarc
@@ -1,2 +1,3 @@
 set sandbox strict
 set dbus-service false
+set font "monospace normal 20"
diff --git a/zathura/.zsh/rc/010zathurarc.zsh b/zathura/.zsh/rc/010zathurarc.zsh
new file mode 100644
index 0000000..a5bc5f8
--- /dev/null
+++ b/zathura/.zsh/rc/010zathurarc.zsh
@@ -0,0 +1,4 @@
+[[ -d $XDG_CONFIG_HOME/zathura ]] || {
+    mkdir -p $XDG_CONFIG_HOME/zathura
+    ln -fs ~/.zathurarc $XDG_CONFIG_HOME/zathura/zathurarc
+}
diff --git a/zathura/bin/zat b/zathura/bin/zat
index f12a718..9debef1 100755
--- a/zathura/bin/zat
+++ b/zathura/bin/zat
@@ -2,6 +2,7 @@
 
 export PATH=$HOME/local/bin:$PATH
 export XDG_DATA_DIRS=$HOME/local
+export XDG_CONFIG_HOME=/tmp/stargrave-xdg
 export LD_LIBRARY_PATH=$HOME/local/lib:$LD_LIBRARY_PATH
 winid=`start-tabbed.sh zathura -c`
 zathura -e $winid "$1"
diff --git a/zsh/.zsh/aliases/sxiv b/zsh/.zsh/aliases/sxiv
new file mode 100644
index 0000000..3844f60
--- /dev/null
+++ b/zsh/.zsh/aliases/sxiv
@@ -0,0 +1 @@
+alias sxiv=nsxiv
diff --git a/zsh/.zsh/env/005irc.zsh b/zsh/.zsh/env/005irc.zsh
index e107fae..743e10c 100644
--- a/zsh/.zsh/env/005irc.zsh
+++ b/zsh/.zsh/env/005irc.zsh
@@ -1,3 +1,2 @@
 export IRCNAME="Sergey Matveev"
 export IRCNICK="stargrave"
-export MMC_ENTRYPOINT=mm.rnd.stcnet.ru