aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bash_profile39
-rw-r--r--.config/X11/xbindkeysrc36
-rw-r--r--.config/systemd/user/events-idle.service4
-rw-r--r--.config/systemd/user/events-resume.service2
-rw-r--r--.config/systemd/user/events-usb.service2
-rw-r--r--.config/systemd/user/workout-notify.service2
-rwxr-xr-x.local/bin/clipboard (renamed from .local/bin/scripts/clipboard)0
-rwxr-xr-x.local/bin/dropdown-terminal (renamed from .local/bin/scripts/dropdown-terminal)0
-rwxr-xr-x.local/bin/events-idle3
-rwxr-xr-x.local/bin/events-resume (renamed from .local/bin/scripts/events-resume)0
-rwxr-xr-x.local/bin/events-usb (renamed from .local/bin/scripts/events-usb)0
-rwxr-xr-x.local/bin/file-search (renamed from .local/bin/scripts/file-search)0
-rwxr-xr-x.local/bin/internet-search (renamed from .local/bin/scripts/internet-search)0
-rwxr-xr-x.local/bin/lockscreen (renamed from .local/bin/scripts/lockscreen)0
-rwxr-xr-x.local/bin/nix-xorg-conf (renamed from .local/bin/scripts/nix-xorg-conf)0
-rwxr-xr-x.local/bin/scripts/events-idle4
-rwxr-xr-x.local/bin/snipping-tool (renamed from .local/bin/scripts/snipping-tool)0
-rwxr-xr-x.local/bin/sshfs-mount (renamed from .local/bin/scripts/sshfs-mount)0
-rwxr-xr-x.local/bin/switch-monitor (renamed from .local/bin/scripts/switch-monitor)0
-rwxr-xr-x.local/bin/sx (renamed from .local/bin/scripts/sx)0
-rwxr-xr-x.local/bin/vnc-exit (renamed from .local/bin/scripts/vnc-exit)0
-rwxr-xr-x.local/bin/vnc-suspend (renamed from .local/bin/scripts/vnc-suspend)0
-rwxr-xr-x.local/bin/volume-control (renamed from .local/bin/scripts/volume-control)0
-rwxr-xr-x.local/bin/window-overview (renamed from .local/bin/scripts/window-overview)0
-rwxr-xr-x.local/bin/window-switcher (renamed from .local/bin/scripts/window-switcher)0
-rwxr-xr-x.local/bin/workout-notify (renamed from .local/bin/scripts/workout-notify)0
-rwxr-xr-x.local/bin/wrappers/adb2
-rwxr-xr-x.local/bin/wrappers/aegisub2
-rwxr-xr-x.local/bin/wrappers/chromium (renamed from .local/bin/chromium)0
-rwxr-xr-x.local/bin/wrappers/claws-mail (renamed from .local/bin/claws-mail)0
-rwxr-xr-x.local/bin/wrappers/codium2
-rwxr-xr-x.local/bin/wrappers/eslint (renamed from .local/bin/eslint)0
-rwxr-xr-x.local/bin/wrappers/firefox (renamed from .local/bin/firefox)0
-rwxr-xr-x.local/bin/wrappers/gnaural2
-rwxr-xr-x.local/bin/wrappers/google-chrome-stable (renamed from .local/bin/google-chrome-stable)0
-rwxr-xr-x.local/bin/wrappers/gore2
-rwxr-xr-x.local/bin/wrappers/latexindent (renamed from .local/bin/latexindent)0
-rwxr-xr-x.local/bin/wrappers/mplayer (renamed from .local/bin/mplayer)0
-rwxr-xr-x.local/bin/wrappers/palemoon2
-rwxr-xr-x.local/bin/wrappers/prettier (renamed from .local/bin/prettier)0
-rwxr-xr-x.local/bin/wrappers/scribus2
-rwxr-xr-x.local/bin/wrappers/stylelint (renamed from .local/bin/stylelint)0
-rwxr-xr-x.local/bin/wrappers/svn2
-rwxr-xr-x.local/bin/wrappers/tiemu (renamed from .local/bin/tiemu)0
-rwxr-xr-x.local/bin/wrappers/tilp2
-rwxr-xr-x.local/bin/wrappers/treesheets2
-rwxr-xr-x.local/bin/wrappers/vale (renamed from .local/bin/vale)0
-rwxr-xr-x.local/bin/wrappers/w3m2
-rwxr-xr-x.local/bin/wrappers/wget (renamed from .local/bin/wget)0
-rwxr-xr-x.local/bin/wrappers/xournalpp2
-rwxr-xr-x.local/bin/wrappers/xsane2
-rwxr-xr-x.local/bin/xrandr-scale3
-rw-r--r--.vim/vimrc (renamed from .vimrc)13
53 files changed, 85 insertions, 49 deletions
diff --git a/.bash_profile b/.bash_profile
index 6b75ff4..9581a74 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -6,44 +6,49 @@ prefixPath() {
*":$1:"*) true ;;
*) PATH="$1:$PATH" ;;
esac
- export PATH;
+ export PATH
}
-prefixPath "$HOME/.local/bin";
-prefixPath "$HOME/.local/bin/scripts";
+prefixPath "$HOME/.local/bin"
+prefixPath "$HOME/.local/bin/scripts"
+prefixPath "$HOME/.local/bin/wrappers"
# auto login
[ "$EUID" != 0 ] && [ -z "$DISPLAY" ] && [ "$(tty)" = '/dev/tty1' ] \
- && command -v nix && "$HOME"/.local/bin/scripts/nix-xorg-conf > "$HOME"/.config/X11/xorg.conf.d/00-modules.conf \
- && exec sx;
+ && command -v nix && nix-xorg-conf > "$HOME"/.config/X11/xorg.conf.d/00-modules.conf \
+ && exec sx
-umask 0022;
+umask 0022
-PS1_USER='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;34m\]\w\[\e[0m\] \[\e[0;34m\]\$\[\e[0m\] '
-PS1_ROOT='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;31m\]\w\[\e[0m\] \[\e[0;31m\]\$\[\e[0m\] '
-PS1_SSHD='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;32m\]\w\[\e[0m\] \[\e[0;32m\]\$\[\e[0m\] '
+PS1_USER='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;34m\]\W\[\e[0m\] \[\e[0;34m\]\$\[\e[0m\] '
+PS1_ROOT='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;31m\]\W\[\e[0m\] \[\e[0;31m\]\$\[\e[0m\] '
+PS1_SSHD='$(E=$? && [ "$E" = 0 ] || echo "$E ")\[\e[0;32m\]\W\[\e[0m\] \[\e[0;32m\]\$\[\e[0m\] '
-[ "$EUID" != 0 ] && export PS1="$PS1_USER";
-[ "$EUID" = 0 ] && export PS1="$PS1_ROOT";
+[ "$EUID" != 0 ] && export PS1="$PS1_USER"
+[ "$EUID" = 0 ] && export PS1="$PS1_ROOT"
-[ -n "$SSH_CLIENT" ] && [ "$EUID" != 0 ] && export PS1="$PS1_SSHD";
+[ -n "$SSH_CLIENT" ] && [ "$EUID" != 0 ] && export PS1="$PS1_SSHD"
export XDG_CACHE_HOME="$HOME/.cache"
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+export BROWSER=browser
+export EDITOR=vim
+export TERMINAL=urxvt
export DESKTOP_SESSION=gnome
export XDG_CURRENT_DESKTOP=gnome
-export BROWSER=browser;
export CARGO_HOME="$XDG_CACHE_HOME/cargo"
export DOWNLOAD_KEYSERVER="hkp://keyserver.ubuntu.com"
-export EDITOR=vim
+export ELECTRUMDIR="$XDG_DATA_HOME/electrum"
export FZF_DIRECTORY_MARKS=$XDG_CONFIG_HOME/fzf/marks/directories
export FZF_FILE_MARKS=$XDG_CONFIG_HOME/fzf/marks/files
export GNUPGHOME="$XDG_DATA_HOME/gnupg"
export GOPATH="$XDG_DATA_HOME/go"
-export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
export GTK_OVERLAY_SCROLLING=0
export HISTCONTROL=ignoreboth:erasedups
export HISTFILESIZE=-1
@@ -51,16 +56,16 @@ export HISTSIZE=-1
export HISTTIMEFORMAT="%d/%m/%y %T "
export ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
export INPUTRC="$XDG_CONFIG_HOME/inputrc"
+export LEIN_HOME="$XDG_DATA_HOME/lein"
export LESSHISTFILE="$XDG_CACHE_HOME/less.history"
export MANPAGER="vim -M +MANPAGER -"
export MPLAYER_HOME="$XDG_CONFIG_HOME/mplayer"
export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npmrc"
export PASSWORD_STORE_DIR="$XDG_CONFIG_HOME/pass"
-export PROMPT_COMMAND='cd .; history -a; history -n;'
+export PROMPT_COMMAND='cd .; history -a; history -n'
export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc"
export RECOLL_CONFDIR="$XDG_CONFIG_HOME/recoll"
export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-export TERMINAL=urxvt
export TEXINPUTS=$XDG_DATA_HOME/tex:
export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
diff --git a/.config/X11/xbindkeysrc b/.config/X11/xbindkeysrc
index 2fbb2f2..dac6e85 100644
--- a/.config/X11/xbindkeysrc
+++ b/.config/X11/xbindkeysrc
@@ -1,17 +1,17 @@
# quake terminal
-"$HOME/.local/bin/scripts/dropdown-terminal"
+"dropdown-terminal"
Mod4 + q
# program launcher
-"$HOME/.local/bin/dmenu_run_history"
+"dmenu_run_history"
Mod4 + r
# privilege launcher
-"$HOME/.local/bin/dmenu_run_history privilege"
+"dmenu_run_history privilege"
Mod4 + e
# terminal launcher
-"$HOME/.local/bin/dmenu_run_history terminal"
+"dmenu_run_history terminal"
Mod4 + w
# zoom application
@@ -31,59 +31,59 @@
Mod4 + t
# show bookmarks
-"bookmarks show $HOME/Documents/text/bookmarks/bookmarks.html"
+"bookmarks show $HOME/Shares/Projects/bookmarks/archives/bookmarks-old.html"
Mod4 + g
# clipboard toggle
-"$HOME/.local/bin/scripts/clipboard"
+"clipboard"
Mod4 + z
# text plumber
-"$HOME/.local/bin/plumber-dmenu"
+"plumber-dmenu"
Mod4 + i
# pass menu
-"$HOME/.local/bin/pass-menu"
+"pass-menu"
Mod4 + d
# file search
-"$HOME/.local/bin/scripts/file-search"
+"file-search"
Mod4 + p
# window switcher
-"$HOME/.local/bin/scripts/window-switcher"
+"window-switcher"
Alt + Tab
# window overview
-"$HOME/.local/bin/scripts/window-overview"
+"window-overview"
Mod4 + Tab
# file search
-"$HOME/.local/bin/scripts/internet-search"
+"internet-search"
Mod4 + a
# volume up
-"$HOME/.local/bin/scripts/volume-control up"
+"volume-control up"
XF86AudioRaiseVolume
# volume down
-"$HOME/.local/bin/scripts/volume-control down"
+"volume-control down"
XF86AudioLowerVolume
# volume mute
-"$HOME/.local/bin/scripts/volume-control mute"
+"volume-control mute"
XF86AudioMute
# lock screen
-"$HOME/.local/bin/scripts/lockscreen"
+"lockscreen"
XF86ScreenSaver
# snipping tool
-"$HOME/.local/bin/scripts/snipping-tool"
+"snipping-tool"
Print
# switch monitor
-"$HOME/.local/bin/scripts/switch-monitor"
+"switch-monitor"
XF86Display
# screen record
diff --git a/.config/systemd/user/events-idle.service b/.config/systemd/user/events-idle.service
index ef0cd77..62b4edd 100644
--- a/.config/systemd/user/events-idle.service
+++ b/.config/systemd/user/events-idle.service
@@ -9,8 +9,8 @@ CPUQuota=60%
RestartSec=5
Restart=always
SyslogIdentifier=events-idle
-ExecStartPre=/usr/bin/env sh -c '%h/.local/bin/scripts/events-idle'
-ExecStart=/usr/bin/env sh -c 'while true; do sleep 300 && [ "$(xprintidle)" -gt 120000 ] && %h/.local/bin/scripts/events-idle; done'
+ExecStartPre=/usr/bin/env sh -c 'events-idle'
+ExecStart=/usr/bin/env sh -c 'while true; do sleep 300 && [ "$(xprintidle)" -gt 120000 ] && events-idle; done'
[Install]
WantedBy=default.target
diff --git a/.config/systemd/user/events-resume.service b/.config/systemd/user/events-resume.service
index 2a43df4..a65c0a8 100644
--- a/.config/systemd/user/events-resume.service
+++ b/.config/systemd/user/events-resume.service
@@ -7,7 +7,7 @@ Type=simple
RestartSec=3
Restart=always
SyslogIdentifier=events-resume
-ExecStart=/usr/bin/env sh -c 'dbus-monitor --system | while read; do grep -q 'PrepareForSleep' && %h/.local/bin/scripts/events-resume; done'
+ExecStart=/usr/bin/env sh -c 'dbus-monitor --system | while read; do grep -q 'PrepareForSleep' && events-resume; done'
[Install]
WantedBy=default.target
diff --git a/.config/systemd/user/events-usb.service b/.config/systemd/user/events-usb.service
index 852d6c1..201d171 100644
--- a/.config/systemd/user/events-usb.service
+++ b/.config/systemd/user/events-usb.service
@@ -7,7 +7,7 @@ Type=simple
RestartSec=3
Restart=always
SyslogIdentifier=events-usb
-ExecStart=/usr/bin/env sh -c 'udevadm monitor | while read; do grep -m1 -q "(usb)" && %h/.local/bin/scripts/events-usb; done'
+ExecStart=/usr/bin/env sh -c 'udevadm monitor | while read; do grep -m1 -q "(usb)" && events-usb; done'
[Install]
WantedBy=default.target
diff --git a/.config/systemd/user/workout-notify.service b/.config/systemd/user/workout-notify.service
index 3ea82f4..e043f07 100644
--- a/.config/systemd/user/workout-notify.service
+++ b/.config/systemd/user/workout-notify.service
@@ -4,5 +4,5 @@ Description=Workout notifications
[Service]
Type=oneshot
Environment=DISPLAY=:0
-ExecStart=%h/.local/bin/scripts/workout-notify
+ExecStart=/usr/bin/env sh -c 'workout-notify'
SyslogIdentifier=workout-notify
diff --git a/.local/bin/scripts/clipboard b/.local/bin/clipboard
index c565bbb..c565bbb 100755
--- a/.local/bin/scripts/clipboard
+++ b/.local/bin/clipboard
diff --git a/.local/bin/scripts/dropdown-terminal b/.local/bin/dropdown-terminal
index 46f83ea..46f83ea 100755
--- a/.local/bin/scripts/dropdown-terminal
+++ b/.local/bin/dropdown-terminal
diff --git a/.local/bin/events-idle b/.local/bin/events-idle
new file mode 100755
index 0000000..ff489eb
--- /dev/null
+++ b/.local/bin/events-idle
@@ -0,0 +1,3 @@
+#!/bin/sh -eux
+
+file-search update
diff --git a/.local/bin/scripts/events-resume b/.local/bin/events-resume
index 50ffd2c..50ffd2c 100755
--- a/.local/bin/scripts/events-resume
+++ b/.local/bin/events-resume
diff --git a/.local/bin/scripts/events-usb b/.local/bin/events-usb
index 32d5823..32d5823 100755
--- a/.local/bin/scripts/events-usb
+++ b/.local/bin/events-usb
diff --git a/.local/bin/scripts/file-search b/.local/bin/file-search
index 130b90c..130b90c 100755
--- a/.local/bin/scripts/file-search
+++ b/.local/bin/file-search
diff --git a/.local/bin/scripts/internet-search b/.local/bin/internet-search
index 096c4ee..096c4ee 100755
--- a/.local/bin/scripts/internet-search
+++ b/.local/bin/internet-search
diff --git a/.local/bin/scripts/lockscreen b/.local/bin/lockscreen
index bd456c2..bd456c2 100755
--- a/.local/bin/scripts/lockscreen
+++ b/.local/bin/lockscreen
diff --git a/.local/bin/scripts/nix-xorg-conf b/.local/bin/nix-xorg-conf
index 7fabd3a..7fabd3a 100755
--- a/.local/bin/scripts/nix-xorg-conf
+++ b/.local/bin/nix-xorg-conf
diff --git a/.local/bin/scripts/events-idle b/.local/bin/scripts/events-idle
deleted file mode 100755
index d9359da..0000000
--- a/.local/bin/scripts/events-idle
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -eux
-
-# update file search cache
-"$HOME"/.local/bin/scripts/file-search update;
diff --git a/.local/bin/scripts/snipping-tool b/.local/bin/snipping-tool
index 4347bfe..4347bfe 100755
--- a/.local/bin/scripts/snipping-tool
+++ b/.local/bin/snipping-tool
diff --git a/.local/bin/scripts/sshfs-mount b/.local/bin/sshfs-mount
index 0e2352c..0e2352c 100755
--- a/.local/bin/scripts/sshfs-mount
+++ b/.local/bin/sshfs-mount
diff --git a/.local/bin/scripts/switch-monitor b/.local/bin/switch-monitor
index 80d7191..80d7191 100755
--- a/.local/bin/scripts/switch-monitor
+++ b/.local/bin/switch-monitor
diff --git a/.local/bin/scripts/sx b/.local/bin/sx
index bda1ba0..bda1ba0 100755
--- a/.local/bin/scripts/sx
+++ b/.local/bin/sx
diff --git a/.local/bin/scripts/vnc-exit b/.local/bin/vnc-exit
index afc4833..afc4833 100755
--- a/.local/bin/scripts/vnc-exit
+++ b/.local/bin/vnc-exit
diff --git a/.local/bin/scripts/vnc-suspend b/.local/bin/vnc-suspend
index 589a7f2..589a7f2 100755
--- a/.local/bin/scripts/vnc-suspend
+++ b/.local/bin/vnc-suspend
diff --git a/.local/bin/scripts/volume-control b/.local/bin/volume-control
index 95454a3..95454a3 100755
--- a/.local/bin/scripts/volume-control
+++ b/.local/bin/volume-control
diff --git a/.local/bin/scripts/window-overview b/.local/bin/window-overview
index 62b50d9..62b50d9 100755
--- a/.local/bin/scripts/window-overview
+++ b/.local/bin/window-overview
diff --git a/.local/bin/scripts/window-switcher b/.local/bin/window-switcher
index b19de68..b19de68 100755
--- a/.local/bin/scripts/window-switcher
+++ b/.local/bin/window-switcher
diff --git a/.local/bin/scripts/workout-notify b/.local/bin/workout-notify
index 6934a45..6934a45 100755
--- a/.local/bin/scripts/workout-notify
+++ b/.local/bin/workout-notify
diff --git a/.local/bin/wrappers/adb b/.local/bin/wrappers/adb
new file mode 100755
index 0000000..cfe91cf
--- /dev/null
+++ b/.local/bin/wrappers/adb
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which adb --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/wrappers/aegisub b/.local/bin/wrappers/aegisub
new file mode 100755
index 0000000..9ade37a
--- /dev/null
+++ b/.local/bin/wrappers/aegisub
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which aegisub --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/chromium b/.local/bin/wrappers/chromium
index d0e9a9f..d0e9a9f 100755
--- a/.local/bin/chromium
+++ b/.local/bin/wrappers/chromium
diff --git a/.local/bin/claws-mail b/.local/bin/wrappers/claws-mail
index b19aa55..b19aa55 100755
--- a/.local/bin/claws-mail
+++ b/.local/bin/wrappers/claws-mail
diff --git a/.local/bin/wrappers/codium b/.local/bin/wrappers/codium
new file mode 100755
index 0000000..87e93e5
--- /dev/null
+++ b/.local/bin/wrappers/codium
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which codium --all | grep --invert-match "local/bin" | head -n 1) --extensions-dir "$XDG_DATA_HOME/codium" "$@"
diff --git a/.local/bin/eslint b/.local/bin/wrappers/eslint
index d0e6013..d0e6013 100755
--- a/.local/bin/eslint
+++ b/.local/bin/wrappers/eslint
diff --git a/.local/bin/firefox b/.local/bin/wrappers/firefox
index ab8c72e..ab8c72e 100755
--- a/.local/bin/firefox
+++ b/.local/bin/wrappers/firefox
diff --git a/.local/bin/wrappers/gnaural b/.local/bin/wrappers/gnaural
new file mode 100755
index 0000000..cb63d08
--- /dev/null
+++ b/.local/bin/wrappers/gnaural
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which gnaural --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/google-chrome-stable b/.local/bin/wrappers/google-chrome-stable
index b9c406f..b9c406f 100755
--- a/.local/bin/google-chrome-stable
+++ b/.local/bin/wrappers/google-chrome-stable
diff --git a/.local/bin/wrappers/gore b/.local/bin/wrappers/gore
new file mode 100755
index 0000000..af19cab
--- /dev/null
+++ b/.local/bin/wrappers/gore
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which gore --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/latexindent b/.local/bin/wrappers/latexindent
index 44e7459..44e7459 100755
--- a/.local/bin/latexindent
+++ b/.local/bin/wrappers/latexindent
diff --git a/.local/bin/mplayer b/.local/bin/wrappers/mplayer
index 8554a81..8554a81 100755
--- a/.local/bin/mplayer
+++ b/.local/bin/wrappers/mplayer
diff --git a/.local/bin/wrappers/palemoon b/.local/bin/wrappers/palemoon
new file mode 100755
index 0000000..caef463
--- /dev/null
+++ b/.local/bin/wrappers/palemoon
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which palemoon --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/prettier b/.local/bin/wrappers/prettier
index 94fd412..94fd412 100755
--- a/.local/bin/prettier
+++ b/.local/bin/wrappers/prettier
diff --git a/.local/bin/wrappers/scribus b/.local/bin/wrappers/scribus
new file mode 100755
index 0000000..c77ac6b
--- /dev/null
+++ b/.local/bin/wrappers/scribus
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which scribus --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/stylelint b/.local/bin/wrappers/stylelint
index d0efb27..d0efb27 100755
--- a/.local/bin/stylelint
+++ b/.local/bin/wrappers/stylelint
diff --git a/.local/bin/wrappers/svn b/.local/bin/wrappers/svn
new file mode 100755
index 0000000..77fdbdb
--- /dev/null
+++ b/.local/bin/wrappers/svn
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+$(which svn --all | grep --invert-match "local/bin" | head -n 1) --config-dir "$XDG_CONFIG_HOME"/subversion "$@";
diff --git a/.local/bin/tiemu b/.local/bin/wrappers/tiemu
index 310f7dc..310f7dc 100755
--- a/.local/bin/tiemu
+++ b/.local/bin/wrappers/tiemu
diff --git a/.local/bin/wrappers/tilp b/.local/bin/wrappers/tilp
new file mode 100755
index 0000000..4f07917
--- /dev/null
+++ b/.local/bin/wrappers/tilp
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which tilp --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/wrappers/treesheets b/.local/bin/wrappers/treesheets
new file mode 100755
index 0000000..956277b
--- /dev/null
+++ b/.local/bin/wrappers/treesheets
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which treesheets --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/vale b/.local/bin/wrappers/vale
index f5863f2..f5863f2 100755
--- a/.local/bin/vale
+++ b/.local/bin/wrappers/vale
diff --git a/.local/bin/wrappers/w3m b/.local/bin/wrappers/w3m
new file mode 100755
index 0000000..f2c62b4
--- /dev/null
+++ b/.local/bin/wrappers/w3m
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which w3m --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/wget b/.local/bin/wrappers/wget
index 9f06fce..9f06fce 100755
--- a/.local/bin/wget
+++ b/.local/bin/wrappers/wget
diff --git a/.local/bin/wrappers/xournalpp b/.local/bin/wrappers/xournalpp
new file mode 100755
index 0000000..3601bbf
--- /dev/null
+++ b/.local/bin/wrappers/xournalpp
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which xournalpp --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/wrappers/xsane b/.local/bin/wrappers/xsane
new file mode 100755
index 0000000..2edfe09
--- /dev/null
+++ b/.local/bin/wrappers/xsane
@@ -0,0 +1,2 @@
+#!/bin/sh -eu
+HOME=$HOME/.config && $(which xsane --all | grep --invert-match "local/bin" | head -n 1) "$@";
diff --git a/.local/bin/xrandr-scale b/.local/bin/xrandr-scale
index f5d3c2e..bdb92bd 100755
--- a/.local/bin/xrandr-scale
+++ b/.local/bin/xrandr-scale
@@ -1,2 +1,3 @@
-#!/bin/sh
+#!/bin/sh -eu
+# TODO: Output can change default $1 to first known monitor.
xrandr --output "$1" --scale "$2"x"$2"
diff --git a/.vimrc b/.vim/vimrc
index 2dab540..96a8cf7 100644
--- a/.vimrc
+++ b/.vim/vimrc
@@ -2,7 +2,7 @@
mapclear " Clear all mappings.
packadd! matchit " Add match tag pairs package.
-let skip_defaults_vim=1 " Do not load defaults if ~/.vimrc is missing.
+let skip_defaults_vim=1 " Do not load defaults if vimrc is missing.
"------------General------------"
@@ -95,7 +95,7 @@ endfunction
"---------------Shortcuts---------------"
" Edit shortcuts
-nmap <leader>ev :tabedit ~/.vimrc<cr>
+nmap <leader>ev :tabedit ~/.vim/vimrc<cr>
nmap <leader>eh :tabedit ~/.vim/post-save-hook<cr>
" Show key mappings
@@ -119,7 +119,7 @@ nmap <leader>dp :call fzf#run({'options': ['--preview', 'echo doc {} \| psysh \|
nmap <leader>jl :norm yaW<cr> \| :Jump<cr>
" Load and save sessions
-nmap <leader>sl :source ~/.vim/sessions/session.vim \| :source ~/.vimrc<cr>:Notify('printf "Last saved session loaded."')<cr>
+nmap <leader>sl :source ~/.vim/sessions/session.vim \| :source ~/.vim/vimrc<cr>:Notify('printf "Last saved session loaded."')<cr>
nmap <leader>ss :silent! exe "!~/.vim/hooks/pre-session-save" \| :mksession! ~/.vim/sessions/session.vim \| :redraw!<cr>:Notify('printf "Current session saved."')<cr>
" Toggle Spell Check
@@ -141,7 +141,7 @@ nmap <leader>qw <C-w>c<cr>
nmap <leader>re gg=G<C-o><C-o>
" Reset all settings and source configuration.
-nmap <leader>ra :set all& \| :source ~/.vimrc \| :packloadall \|:e<cr>:Notify('printf "Settings cleared and reloaded."')<cr>
+nmap <leader>ra :set all& \| :source ~/.vim/vimrc \| :packloadall \|:e<cr>:Notify('printf "Settings cleared and reloaded."')<cr>
" Remove duplicate lines
vnoremap <leader>rd !awk '\!visited[$0]++'<cr>
@@ -161,6 +161,10 @@ nmap <leader>cl :call TypographyFormat()<cr>
" Toggle line numbers
nmap <leader>cn :set relativenumber!<cr>
+" Move line up or down
+nmap <leader>ck ddkkpk<cr>
+nmap <leader>cj ddpk<cr>
+
" Justify columns
vnoremap <leader>ct !column -t -o' '<cr>
@@ -179,6 +183,7 @@ nmap <leader>ot :exe '!$TERMINAL -cd ' . expand('%:p:h') . ' &'<cr><cr>
nmap <leader>of :call fzf#run({'options': [], 'source': "cat $FZF_FILE_MARKS", 'sink': 'e', 'window': { 'xoffset': 0, 'yoffset': 1, 'width': 1, 'height': 0.5 }})<cr><down>
nmap <leader>od :call fzf#run({'options': ['--preview', 'ls {}'], 'source': "cut -d' ' -f3 $FZF_DIRECTORY_MARKS", 'sink': 'cd', 'window': { 'xoffset': 0, 'yoffset': 1, 'width': 1, 'height': 0.5 }})<cr><down>
nmap <leader>oo :call fzf#run({'options': ['--preview', 'highlight -O ansi --force {}'], 'source': 'rg --files --hidden \|\| find . -type f -printf "%P\n"', 'sink': 'e', 'window': { 'xoffset': 0, 'yoffset': 1, 'width': 1, 'height': 0.5 }})<cr><down>
+nmap <leader>oa :call fzf#run({'options': ['--preview', 'ls {}'], 'source': "find $HOME -type d -maxdepth 6", 'sink': 'cd', 'window': { 'xoffset': 0, 'yoffset': 1, 'width': 1, 'height': 0.5 }})<cr><down>
" Mappings for nnn
nmap <leader>nm :NnnPicker<cr>