better river hotkeys.

.gitignore

@@ -33,3 +33,6 @@ konsolerc
 plasma*
 systemsettingsrc
 
+/dot/file/xonotic/data
+/dot/file/xonotic/lock
+/dot/file/xonotic/key*

dot/file/profile

@@ -43,59 +43,79 @@ source-if-exist() {
 if test "$OS" != "Windows_NT" ; then
 	PATH="$HOME/exe:$HOME/.local/bin:$PATH"
 fi
-# Standard variables.
-export-loop  \
-	ETC '$HOME/etc' \
-	ENV '$HOME/.shrc' \
-	PROMPT '"; "' \
-	PS1 '"$PROMPT"' \
-	SUDO_PROMPT '"# "' \
-	EDITOR '`bb which nvim vim vi ed`' \
-	VISUAL '$EDITOR' \
-	GIT_EDITOR '$VISUAL' \
-	PAGER '`bb which less more`' \
-	MANPAGER '$PAGER' \
-	\
-	CDHIST '$ETC/cds' \
-	CDHISTMAX '50' \
-	\
-	CMDHIST '$ETC/cmds' \
-	CMDHISTMAX '100' \
-	PROFILE '$HOME/.profile' \
-	ENVDIR '$HOME/env' \
-	SETENV '$ETCsetenv/sh' \
-	LOGIN '$ETC/login/sh' \
-	INDENT '"	"'\
-	\
-	GOPATH '$HOME/app/go' \
-	GOBIN '$HOME/bin'\
-	XDG_UTILS_DEBUG_LEVEL '3'\
-	XDG_CONFIG_HOME '$HOME/.config' \
-	XDG_DATA_HOME '$HOME/dat' \
-	GIT 'https://surdeus.su' \
-	PERSONAL_SHELL 'sh' \
-	VIMRC '$HOME/.vimrc'\
-	XKB_DEFAULT_OPTIONS 'caps:escape' \
-	\
-	XCOMPOSER 'river' \
-	XTERMINAL 'wayst' \
-	XRUNNER 'fuzzel' \
-	XDMENU 'fuzzel -d' \
-	XBAR 'waybar' \
-	XBLUETOOTH_MANAGER 'blueman-manager' \
-	XOUTPUT_DAEMON 'kanshi' \
-	XSOUND_CONTROL 'pavucontrol' \
-	XFILE_MANAGER 'thunar' \
-	XRESOURCE_MONITOR '$XTERMINAL -e htop' \
-	XCALENDAR '$XTERMINAL -e calcurse' \
-	XPUSH_NOTIFICATION_DAEMON 'dunst' \
-	XNOTIFY 'dunstify' \
-	XLOCKER 'swaylock' \
-	XSUSPEND 'systemctl suspend' \
-	XCLIPBOARD_MANAGER 'clipman store' \
-	SSH_ASKPASS ''\
 
-export XCLIPBOARD_TOOL="clipman pick --tool=CUSTOM --tool-args='$XDMENU'"
+
+# Custom.
+	export APP="$HOME/app"
+	export BIN="$HOME/bin"
+	export LOAD="$HOME/load"
+	export ETC="$HOME/etc"
+	export PATH="$PATH:$BIN"
+	export GIT="https://surdeus.su"
+
+# CLI.
+	export ENV="$HOME/.shrc"
+	export PROMPT="; "
+	export PS1="$PROMPT"
+	export SUDO_PROMPT="# "
+	export EDITOR=`bb which nvim vim vi ed`
+	export VISUAL="$EDITOR" 
+	export GIT_EDITOR="$VISUAL" 
+	export PAGER=`bb which less more`
+	export MANPAGER="$PAGER" 
+	
+	export CMDHIST="$ETC/cmds" 
+	export CMDHISTMAX="100"
+	export PROFILE="$HOME/.profile"
+	export ENVDIR="$HOME/env"
+	export SETENV="$ETCsetenv/sh" 
+	export LOGIN="$ETC/login/sh"
+	export INDENT="	"
+	
+# XDG.
+	export XDG_UTILS_DEBUG_LEVEL='3'
+	export XDG_CONFIG_HOME="$HOME/.config"
+	export XDG_DATA_HOME="$HOME/dat"
+	export PERSONAL_SHELL="sh"
+	export VIMRC="$HOME/.vimrc"
+	export XKB_DEFAULT_OPTIONS="caps:escape"
+
+	export SSH_ASKPASS=''
+
+# Golang.
+	export GOPATH="$APP/go"
+	export GOBIN="$BIN"
+	export PATH="$PATH:$GOBIN"
+
+# X/Wayland stuff.
+	export XCOMPOSER='river' 
+	export XTERMINAL='wayst' 
+	export XRUNNER='fuzzel' 
+	export XDMENU='fuzzel -d' 
+	export XBAR='waybar' 
+	export XBLUETOOTH_MANAGER='blueman-manager' 
+	export XOUTPUT_DAEMON='kanshi' 
+	export XSOUND_CONTROL='pavucontrol' 
+	export XFILE_MANAGER='thunar' 
+	export XRESOURCE_MONITOR="$XTERMINAL -e htop" 
+	export XCALENDAR="$XTERMINAL -e calcurse" 
+	export XPUSH_NOTIFICATION_DAEMON='dunst' 
+	export XNOTIFY='dunstify' 
+	export XLOCKER='swaylock' 
+	export XSUSPEND='systemctl suspend' 
+	export XCLIPBOARD_MANAGER='clipman store' 
+	export XEDITOR="`bb which nvim-qt`" 
+	export XCLIPBOARD_TOOL="clipman pick --tool=CUSTOM --tool-args='$XDMENU'"
+	export XDISPLAY_REGION="slurp"
+	export XDISPLAY_SCREENSHOT="grim"
+	export XDISPLAY_REGION_SCREENSHOT='slurp | grim -g - - | wl-copy'
+
+# Android.
+export ANDROID_HOME="$HOME/app/android/Sdk"
+#export ANDROID_SDK_HOME="$HOME/app/android-sdk"
+export ANDROID_USER_HOME=$XDG_CONFIG_HOME/android
+export PATH="$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools"
+#export PATH="$PATH:$ANDROID_SDK_HOME/cmdline-tools/*/bin"
 
 source-if-exist "$ETC/script/lf.sh"
 test -r $SETENV && . "$SETENV" && setenv profile
@@ -107,6 +127,7 @@ if no-output which bb ; then
 	}
 fi
 
+
 export GPG_TTY=$(tty)
 export SSH_TTY=$(tty)
 

dot/file/xonotic/data/config.cfg

@@ -119,7 +119,7 @@ seta "cl_eventchase_death" "0"
 "cl_forwardspeed" "360"
 seta "cl_freeze" "0"
 seta "cl_magical_hax" ""
-seta "cl_matchcount" "480"
+seta "cl_matchcount" "488"
 "cl_movement_track_canjump" "1"
 seta "cl_nocarry" "0"
 seta "cl_nohats" "0"
@@ -130,19 +130,19 @@ seta "cl_radio" "1"
 "cl_sidespeed" "360"
 "cl_smoothviewheight" "0"
 seta "cl_spawn_point_particles" "0"
-seta "cl_startcount" "107"
+seta "cl_startcount" "110"
 "cl_upspeed" "360"
 seta "cl_vaporizerbeam" "0"
 seta "cl_vaporizerbeam_minping" "160"
 seta "cl_weaponimpulsemode" "1"
 seta "cl_weaponmodel_force" "0"
-seta "cl_weaponpriority" "vaporizer okhmg okrpc oknex vortex nexgun riflegun fireball mortar explosives okmachinegun machinegun mac10 hagar rifle huntingrifle arc electro devastator rpg7 crylink minelayer okshotgun shotgun shockwave hlac tuba blaster porto seeker hook ballstealer"
+seta "cl_weaponpriority" "vaporizer okhmg okrpc oknex vortex nexgun riflegun fireball mortar explosives okmachinegun machinegun assaultrifle mac10 hagar rifle huntingrifle arc electro devastator rpg7 crylink minelayer okshotgun shotgun shockwave hlac tuba blaster porto seeker hook ballstealer"
 seta "cl_zoomsensitivity" "1"
 seta "cl_zoomspeed" "-1"
 "con_chat" "10"
 "con_chatrect" "1"
 "con_chatrect_x" "0.012812"
-"con_chatrect_y" "0.808333"
+"con_chatrect_y" "0.705000"
 "con_chatwidth" "0.454377"
 "crosshair" "33"
 seta "crosshair_alpha" "1"
@@ -165,7 +165,7 @@ seta "hud_cursormode" "0"
 seta "hud_panel_quickmenu_file" "quickmenu.txt"
 "m_accelerate" "0"
 "m_filter" "1"
-"mastervolume" "0.054954"
+"mastervolume" "0.275423"
 seta "menu_maxplayers" "1"
 seta "menu_mouse_absolute" "0"
 seta "menu_slist_showfull" "0"
@@ -186,7 +186,7 @@ seta "notification_INFO_ITEM_WEAPON_UNAVAILABLE" "1"
 "r_shadow_realtime_dlight" "0"
 "r_shadow_usenormalmap" "0"
 "r_subdivisions_tolerance" "8"
-"sensitivity" "6"
+"sensitivity" "8"
 seta "snd_channel8volume" "0"
 "sv_curl_serverpackages" "csprogs-xonotic-v0.8.2~.txt"
 seta "timelimit_override" "0"

nvim/lua/general.lua

@@ -1,4 +1,4 @@
-vim.cmd("syntax off")
+vim.cmd("syntax on")
 vim.cmd("set nowrap")
 
 vim.g.autoformat = false

river/init

@@ -187,12 +187,16 @@ riverctl default-layout rivertile
 
 riverctl focus-follows-cursor normal
 
-riverctl map normal Super C spawn "clipman pick --tool=CUSTOM --tool-args='fuzzel -d' || $XNOTIFY 'Problem calling clip'"
+# Run clipboard manager.
+riverctl map normal Super C spawn "$XCLIPBOARD_TOOL || $XNOTIFY 'Problem calling clip'"
+
+# Screenshot region.
+riverctl map normal Super+Shift S spawn "eval $XDISPLAY_REGION_SCREENSHOT"
 
 # Only first time, no reloading.
 if test -z "$RIVER_RELOAD" ; then
-	wl-paste -t text --watch $XCLIPBOARD_MANAGER
+	eval wl-paste -t text --watch $XCLIPBOARD_MANAGER &
-	rivertile -view-padding 0 -outer-padding 0 &
+	eval rivertile -view-padding 0 -outer-padding 0 &
 	eval $XPUSH_NOTIFICATION_DAEMON &
 	eval $XOUTPUT_DAEMON &