Drop pqiv. Move terminal specific env variables from global env to elvish. Remove sensitive info from global env.

bin/agent-init

@@ -1,4 +1,5 @@
 #!/bin/sh
+export MPW_FULLNAME="(cat "$HOME/sns/mpwname")"
 mpwc -k max -s gpg | xclip -sel c -l 1
 gpg2 -d -q "$HOME/sns/password.gpg" | mpwc -k max -s ssh -S 2>/dev/null | xclip -sel c -l 1
 ssh-add

bin/mpw-get

@@ -1,9 +1,10 @@
 #!/usr/bin/env elvish
+name = (cat ~/sns/mpwname)
 t=""
 if (eq 0 (count $args)) {
-  @sites=(cat (get-env XDG_CONFIG_HOME)/mpwc/(get-env MPW_FULLNAME).mpsites)
+  @sites=(cat (get-env XDG_CONFIG_HOME)/mpwc/$name.mpsites)
   t=(echo &sep="\n" $@sites | rofi -dmenu -p 'Enter site: ' -width 20 -columns 1)
 } else {
   t=$args[0]
 }
-gpg2 -d -q ~/sns/password.gpg | mpwc -S -k max -s $t 2>/dev/null | xclip -sel c -r -l 1
+gpg2 -d -q ~/sns/password.gpg | mpwc -S -k max -n $name -s $t 2>/dev/null | xclip -sel c -r -l 1

bin/nimprettify

@@ -1,5 +1,5 @@
 #!/bin/sh
-f=${TMPDIR:-/tmp}/$(mktemp nimprettify_XXXX.nim)
+f=$(mktemp "${TMPDIR:-/tmp}"/nimprettify_XXXX.nim)
 cat >"$f"
 nimpretty "$f" >/dev/null 2>/dev/null
 cat "$f"

bspwm

@@ -17,4 +17,4 @@ bspc rule -a kittyfloat state=floating
 bspc rule -a TelegramDesktop desktop=^3
 bspc rule -a Hexchat desktop=^3
 bspc rule -a Ripcord desktop=^3
-bspc rule -a Steam desktop=^4
+bspc rule -a Steam desktop=^4 state=floating

elvish/rc.elv

@@ -37,3 +37,6 @@ xr~ = (alias sudo xbps-remove -R)
 
 -override-wcwidth 🦀 2
 set-env GPG_TTY (tty)
+set-env PAGER kakpager
+set-env MANPAGER less
+set-env LESSHISTFILE -

nim.nim

@@ -41,15 +41,14 @@ when defined(release) or defined(danger):
   switch "passL", "-fuse-linker-plugin"
   switch "passL", "-s"
 
-when defined(danger):
+when defined(hotcodereloading):
+  switch "nimcache", "nimcache"
+elif defined(danger):
   switch "nimcache", "/tmp/nim/" & projectName() & "_d"
 elif defined(release):
   switch "nimcache", "/tmp/nim/" & projectName() & "_r"
 else:
   switch "nimcache", "/tmp/nim/" & projectName()
 
-when defined(hotcodereloading):
-  switch "nimcache", "nimcache"
-
 switch "styleCheck", "hint"
 switch "parallelBuild", "0"

pqiv

@@ -1,7 +0,0 @@
-[options]
-browse=yes
-max-depth=0
-thumbnail-persistence=yes
-hide-info-box=yes
-lazy-load=yes
-disable-backends=archive,archive_cbx

profile

@@ -17,11 +17,9 @@ GPG_TTY=$(tty)
 TERMINAL='kitty -1'
 EDITOR=kak
 VISUAL=kak
-PAGER=kakpager
-MANPAGER=less
 QT_QPA_PLATFORMTHEME=gtk2
 
-LESSHISTFILE='-'
+NO_AT_BRIDGE=1
 GTK2_RC_FILES=$XDG_CONFIG_HOME/gtk-2.0/gtkrc
 GNUPGHOME=$XDG_DATA_HOME/gnupg
 GPG_AGENT_INFO=$GNUPGHOME/S.gpg-agent:0:1
@@ -34,9 +32,9 @@ unset LS_COLORS
 # Mass export
 export \
  XDG_DATA_HOME XDG_RUNTIME_DIR XDG_CACHE_HOME XDG_CONFIG_HOME XDG_RUNTIME_DIR \
- XBPS_DISTDIR DOTS_DIR GTK2_RC_FILES TERMINAL EDITOR VISUAL PAGER MANPAGER \
+ XBPS_DISTDIR DOTS_DIR GTK2_RC_FILES TERMINAL EDITOR VISUAL \
  GOPATH CARGO_HOME GPG_TTY GPG_AGENT_INFO GNUPGHOME QT_QPA_PLATFORMTHEME \
- _JAVA_AWT_WM_NONREPARENTING _JAVA_OPTIONS LESSHISTFILE
+ _JAVA_AWT_WM_NONREPARENTING _JAVA_OPTIONS NO_AT_BRIDGE
 
 # Init sharable {ssh,gpg}-agent
 if [ -z "$SSH_AUTH_SOCK" ]; then
@@ -46,9 +44,6 @@ if [ -z "$SSH_AUTH_SOCK" ]; then
 	. "$XDG_CACHE_HOME/ssh-env"
 fi
 
-# Sensitive info
-. "$HOME/sns/profile"
-
 # Start X or shell
 if [ "$GPG_TTY" = /dev/tty1 ]; then
 	exec dbus-launch sx

ranger/rifle.conf

@@ -119,9 +119,8 @@ ext mobi, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
 mime ^image/svg, has display,  X, flag f = display -- "$@"
 mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
 
-mime ^image, has pqiv,      X, flag f = pqiv -- "$@"
+mime ^image, has qimgv,     X, flag f = qimgv "$@"
 mime ^image, has sxiv,      X, flag f = sxiv -- "$@"
-mime ^image, has nomacs,    X, flag f = nomacs -- "$@"
 mime ^image, has gimp,      X, flag f = gimp -- "$@"
 ext xcf,                    X, flag f = gimp -- "$@"
 

setup

@@ -25,7 +25,6 @@ firefox
 kitty
 elvish
 kak (kakoune)
-pqiv
 mpv
 mpd
 ncmpcpp
@@ -69,8 +68,6 @@ for arg; do
 			_render $arg "$CONF/polybar/config";;
 		rofi)
 			_install $arg.rasi "$CONF/rofi/config.rasi";;
-		pqiv)
-			_install $arg "$CONF/pqivrc";;
 		mpv)
 			_install $arg/mpv.conf "$CONF/mpv/mpv.conf";;
 		mpd)