increase basedness of keybinds

.bashrc

@@ -7,32 +7,43 @@
 
 # alias ls='ls --color=auto'
 PS1='\[\e[38;5;249m\]+$(jobs | wc -l)\[\e[38;5;24m\][$(ip route get 1.1.1.1 2>/dev/null | awk -F"src " '"'"'NR==1{split($2,a," ");print a[1]}'"'"')\[\e[38;5;46m\]:\[\e[38;5;208m\]\W\[\e[38;5;24m\]]\$ \[\e[0m\]'
-alias luamake=/home/oliver/sources/lua-language-server/3rd/luamake/luamake
-alias l=lfcd
-alias clip="xclip -selection clipboard"
-alias phone="simple-mtpfs"
-alias bell="paplay /usr/share/sounds/freedesktop/stereo/complete.oga"
-alias usage="du -h -d 1 2> /dev/null | sort -h"
-# For laptop multi-gpu offloading
-alias nvidia_gpu="DRI_PRIME=1 __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia"
-# Opinionated defaults
-alias feh="swallow feh --force-aliasing --draw-exif --scale-down --draw-filename"
-alias ffplay="swallow ffplay $@"
-alias shutdown="shutdown -P now"
-alias untar="tar -xvf $@"
-alias cura="cura5 -platformtheme gtk3"
 
-export DENO_INSTALL="/home/oliver/.deno"
-export PATH="$PATH:$DENO_INSTALL/bin:$HOME/.cargo/bin:$HOME/.local/bin/"
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export TORCH_CUDA_VERSION="cu117"
-export LIBTORCH="/home/oliver/sources/libtorchcxx11"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LIBTORCH}/lib"
-export WINEPREFIX="$HOME/.wine/"
 export DXVK_HUD="fps,compiler"
 export EDITOR="nvim"
 export TZ='America/Denver'
 
+# XDG
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+
+# Clean ~/
+# Languages
+export GOPATH="$XDG_DATA_HOME/go"
+export GOMODCACHE="$XDG_DATA_HOME/go/mod"
+export RBENV_ROOT="$XDG_DATA_HOME/rbenv"
+export PYENV_ROOT="$XDG_DATA_HOME/pyenv"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
+export DENO_INSTALL="$XDG_DATA_HOME/deno"
+export DOTNET_CLI_HOME="$XDG_DATA_HOME/dotnet"
+export PYTHON_HISTORY="$XDG_CACHE_HOME/pyhton_history"
+# Programs
+export LESSHIST="-"
+export WINEPREFIX="$XDG_CONFIG_HOME/wine"
+export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
+export XAUTHORITY="$XDG_CONFIG_HOME/x11/Xauthority"
+export GIT_CONFIG_GLOBAL="$XDG_CONFIG_HOME/gitconfig"
+export HISTFILE="$XDG_CACHE_HOME/bash_history"
+# Would need to be run as root, prevents the creation of "~/.sudo_as_admin_successful"
+# echo Default !admin_flag >> /etc/sudoers.d/disable_saas
+
+# Paths
+export PATH="$PATH:$HOME/.local/bin/"
+export PATH="$PATH:$CARGO_HOME/bin:$DENO_INSTALL/bin:$PYENV_ROOT/bin"
+
 lfcd() {
 	tmp="$(mktemp)"
 	lfrun -last-dir-path="$tmp" "$@"
@@ -47,3 +58,9 @@ lfcd() {
 	    fi
 	fi
 }
+
+# Load aliases from file
+if [ -f $XDG_CONFIG_HOME/aliasrc ]; then
+    . $XDG_CONFIG_HOME/aliasrc
+fi
+

.config/aliasrc

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# New commands
+alias clip="xclip -selection clipboard"
+alias phone="simple-mtpfs"
+alias bell="paplay /usr/share/sounds/freedesktop/stereo/complete.oga"
+alias usage="du -h -d 1 2> /dev/null | sort -h"
+# alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# For laptop multi-gpu offloading
+alias nvidia_gpu="DRI_PRIME=1 __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia"
+
+# Opinionated defaults
+alias feh="swallow feh --force-aliasing --draw-exif --scale-down --draw-filename"
+alias ffplay="swallow ffplay $@"
+alias shutdown="shutdown -P now"
+alias untar="tar -xvf $@"
+alias cura="cura5 -platformtheme gtk3"
+alias cp="cp -iv"
+alias mv="mv -iv"
+alias rm="rm -vI"
+alias vim="nvim"
+
+# User lfcd by default (it should exist), fall back
+# to ranger if lfcd isn't found. IDK why you wouldn't
+# have either
+[ -x "$(command -v ranger)"] && alias l=". ranger"
+[ -x "$(command -v lfcd)" ] && alias l="lfcd"
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    alias grep='grep --color=auto'
+fi
+

.config/nvim/init.vim

@@ -25,7 +25,6 @@ set tabstop=4 shiftwidth=4 smarttab
 highlight Comment ctermfg=Grey
 nnoremap <silent> <leader>p :split +term <CR>
 
-
 " =============== NERDTree ================================================
 " Toggle file browser
 nnoremap <silent> <leader>e :NERDTreeToggle<CR>
@@ -37,7 +36,7 @@ let g:onedark_config = {
 colorscheme onedark
 hi CocFloating 	guibg=#151515	guifg=clear
 hi Pmenu 	guibg=#151515 	guifg=clear
-hi @parameter 							guifg=#ed6215
+" hi @parameter			guifg=#ed6215
 hi CursorColumn guibg=#e2c792 	guifg=#232326
  
 " =============== NERDTree Config ================================================
@@ -63,16 +62,16 @@ endfunction
 autocmd CursorHold * silent call CocActionAsync('highlight')
 
 " coc rename
-nnoremap <silent> <leader>r <Plug>(coc-rename)
+nmap <leader>r <Plug>(coc-rename)
 " Jump between references and definiton 
-nnoremap <silent> <C-k> :call CocActionAsync('jumpReferences')<CR>
-nnoremap <silent> K :call CocActionAsync('jumpDefinition')<CR>
+nnoremap <leader>j :call CocActionAsync('jumpReferences')<CR>
+nnoremap <leader>k :call CocActionAsync('jumpDefinition')<CR>
 " show help menu
-nnoremap <C-u> :call CocActionAsync('codeAction', 'cursor')<CR>
-
+nnoremap <leader>d :call CocActionAsync('codeAction', 'cursor')<CR>
+nnoremap <leader>a :call CocActionAsync('runCommand', 'editor.action.formatDocument')<CR>
 
 " Show Documentation
-nnoremap <silent> J :call ShowDocumentation()<CR>
+nnoremap <leader>f :call ShowDocumentation()<CR>
 function! ShowDocumentation() " Show hover when provider exists, fallback to vim's builtin behavior.
 	if CocAction('hasProvider', 'hover')
 		call CocActionAsync('definitionHover')

.config/x11/.xinitrc

@@ -1,7 +1,8 @@
 #!/bin/sh
+x11_home="$XDG_CONFIG_HOME/x11"
 
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
+userresources=$x11_home/Xresources
+usermodmap=$x11_home/Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 

.local/bin/bell

@@ -1,3 +1,2 @@
 #!/bin/bash
-
-paplay /usr/share/sounds/freedesktop/stereo/complete.oga
+pw-play /usr/share/sounds/freedesktop/stereo/complete.oga

.local/bin/brightness

@@ -0,0 +1,2 @@
+#!/bin/bash
+xrandr | grep " connected" | awk '{print $1}' | xargs -I% xrandr --output % --brightness $1

.local/bin/chroot-gen

@@ -1,7 +1,9 @@
 #!/bin/bash
 # Adapted from LinuxConfig.org 
 # GNU GPL v3.0+
-CMDS="mkdir touch mv rm ls grep cat vim"
+
+# cmds build into bash: echo, cd
+CMDS="bash clear mkdir touch mv rm ls grep cat vim"
 
 USER=$1
 CMDS=($CMDS) # convert to array
@@ -9,13 +11,26 @@ CMDS=($CMDS) # convert to array
 if ! id "$USER" 2&>/dev/null; then
 	echo 'INFO: User not found'
 	echo 'Creating...'
-	useradd -m $USER
+	useradd --create-home --shell /usr/bin/bash $USER
 	echo "Password for $USER:"
 	passwd $USER
 fi
 
 CHROOT=$(eval echo ~$USER)
-printf "Match User $USER\n 	ChrootDirectory $CHROOT$CHROOT" > /etc/ssh/sshd_config.d/70-$USER.conf
+
+mkdir -p $CHROOT$CHROOT # make new home dir
+chown $USER:$USER $CHROOT$CHROOT
+echo "PS1='\[\e[38;5;202m\][\[\e[38;5;45m\]\h\[\e[38;5;202m\]:\[\e[38;5;40m\]\W\[\e[38;5;202m\]]\\$ \[\e[0m\]'" > $CHROOT$CHROOT/.bashrc
+
+# ChrootDirectory requires these permissions 
+chown root:root $CHROOT
+chmod 745 $CHROOT
+printf "Match User $USER\n 	ChrootDirectory $CHROOT" > /etc/ssh/sshd_config.d/70-$USER.conf
+
+# cp user and group into chroot
+mkdir -p $CHROOT/etc/
+cat /etc/passwd | grep $USER > $CHROOT/etc/passwd
+cat /etc/group | grep $USER > $CHROOT/etc/group
 
 # cp in all commands and dependencies 
 for cmd in "${CMDS[@]}"; do
@@ -25,14 +40,9 @@ for cmd in "${CMDS[@]}"; do
 	cp --parents $(which $cmd) $CHROOT
 done
 
-# cp user and group into chroot
-mkdir -p $CHROOT/etc/
-cat /etc/passwd | grep $USER > $CHROOT/etc/passwd
-cat /etc/group | grep $USER > $CHROOT/etc/group
-
 SHELL=$(cat /etc/passwd | grep $USER | tr ":" "\n" | tail -n 1)
 if [ ! -f $CHROOT$SHELL ]; then 
-	echo "WARN: You didn't add the shell specified in /etc/passwd for $USER: ($SHELL)"
+	echo "WARN: You didn't add the shell specified in /etc/passwd for \"$USER\": ($SHELL)"
 fi
 
 # ARCH amd64
@@ -45,7 +55,4 @@ if [ -f  /lib/ld-linux.so.2 ]; then
    cp --parents /lib/ld-linux.so.2 /$CHROOT
 fi
 
-echo "NOTE: 	If you are using a shell that is NOT /bin/bash, you need to tell"
-echo 		" 	chroot that by using: chroot $CHROOT {other shell path}"
-echo ""
-echo "Chroot jail is ready. To access it execute: chroot $CHROOT"
+systemctl restart sshd

.local/bin/printclip

@@ -5,4 +5,4 @@ for (( i=1; i<4; i++ )); do
 	sleep 1
 done
 echo "Go!"
-xdotool type $(xclip -o)
+xclip -o | xdotool type --file -

.local/bin/srt-mp4-embed

@@ -0,0 +1,2 @@
+#!/bin/bash
+ffmpeg -i "$1" -i "$2" -c:s mov_text -c:v copy -c:a copy $(basename "$1").embed.mp4

.local/bin/ssh-encode

@@ -1,31 +1,45 @@
 #!/bin/bash
-# ssh-encode FILE SSH-ALIAS
-FILE=$1
-OTHER=$2
-EXTENSION=".new.mp4"
-# probably best this file is on a tmpfs mount as to reduce
-# rw wear
-TEMP="/tmp/"
-
+__usage="Usage: $(basename $0) FILE [ssh alias]
+Options:
+	[FILE],      Input video file
+	[ssh alias], The alias setup in ~/.ssh/config (default location)
+	             See: ssh_config(5)
+	-d,          Delete origional file
+Notes:
+The file will be copied to the remote computer and then the new file movied to the local computer.
+This can use lots of bandwidth. Plan accordingly.
+"
 
 if [[ -z $1 ]];
 then
+	echo "$__usage"
 	echo "Pass the file to encode as the first argument."
 	exit
 fi
 
 if [[ -z $2 ]];
 then
+	echo "$__usage"
 	echo "Pass the ssh alias of the remote device as the second argument."
 	exit
 fi
 
-# move file to other's temp drive
-scp $FILE $OTHER:$TEMP
-# use ffmpeg to encode on other computer
-ssh $OTHER "ffmpeg -y -i $TEMP$FILE -vcodec h264_nvenc -acodec aac -pix_fmt yuv420p -g 15 -movflags frag_keyframe+empty_moov $TEMP$FILE$EXTENSION"
-# move file back
-scp $OTHER:$TEMP$FILE$EXTENSION .
-# delete temp file
-ssh $OTHER "rm $TEMP$FILE; rm $TEMP$FILE$EXTESION"
+FILE=$1
+BASE=$(basename "$FILE")
+OTHER=$2
+EXTENSION=".new.mp4"
+TEMP="/tmp/" # don't put in a dir with spaces
+
+# move file to other's temp drive
+scp "$FILE" $OTHER:$TEMP
+# use ffmpeg to encode on other computer
+ssh $OTHER "ffmpeg -y -i $TEMP\"$BASE\" -vcodec hevc -filter:v scale=-2:720 $TEMP\"$BASE\"$EXTENSION"
+# move file back
+scp $OTHER:$TEMP"$BASE"$EXTENSION "$FILE"$EXTENSION
+# delete temp file
+ssh $OTHER "rm $TEMP\"$FILE\"; rm $TEMP\"$FILE\"$EXTENSION"
+
+if [[ $3 == "-d" ]];
+	rm $FILE
+then
 

.local/bin/tgz

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+tar cvf $1.tar $1 
+gzip --best $1.tar
+rm $1.tar

README.md

@@ -1,2 +1,13 @@
 # config
 These are my configs for my personal linux systems (AwesomeWM / X11)
+## Installation
+This is needed to install nvim plugins
+```bash
+sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+```
+otherwise just copy the .local and .config folders into your system's
+
+## Coc plugins
+* coc-pyright
+* coc-rust-analyzer