various updates

9 files changed, 93 insertions, 29 deletions

diff --git a/.Xresources b/.Xresources
index 3490ba8..bf4adb8 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,7 +1,7 @@
 Xft.autohint: 0
 Xft.antialias: 1
 Xft.hinting: 1
-Xft.hintstyle: hintslight
+Xft.hintstyle: hintfull
 Xft.rgba: rgba
 
 Xcursor.theme: Adwaita
diff --git a/.bash_profile b/.bash_profile
index 4e397a4..c4b4855 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -33,5 +33,7 @@ export QT_QPA_PLATFORMTHEME=qt5ct
 sed -i 's/echo Agent pid [0-9]*;$//g' $HOME/.ssh/ssh-agent.env
 source $HOME/.ssh/ssh-agent.env
 
+set -o vi
+
 # Get the aliases and functions
 [ -f $HOME/.bashrc ] && . $HOME/.bashrc
diff --git a/.bashrc b/.bashrc
index 49bf74a..b0b9d5c 100644
--- a/.bashrc
+++ b/.bashrc
@@ -21,22 +21,26 @@ alias lofi="mpv 'https://www.youtube.com/watch?v=5qap5aO4i9A' --no-video"
 alias tmux='tmux -f $HOME/.config/tmux/config'
 alias mail='neomutt'
 
-dbg() {
+dbg()
+{
     command gdb -q "$@"
 }
 export dbg
 
 # xbps aliasing
-log() {
+log()
+{
     printf '%b%s %b%s%b %s\n' \
     "$c1" "${3:-->}" "${c3}${2:+$c2}" "$1" "$c3" "$2" >&2
 }
 
-warn() {
+warn()
+{
     log "$1" "$2" "${3:-ERROR}"
 }
 
-pkg() {
+pkg()
+{
     subcmd="$1"
     shift 1 # pop off first argument
     case $subcmd in
@@ -49,9 +53,30 @@ pkg() {
         remove | r)
             doas xbps-remove "$@"
         ;;
+        configure | c)
+            doas xbps-reconfigure "$@"
+        ;;
         update | up | u)
             doas xbps-install -Su "$@"
         ;;
+        src | s)
+            subsubcmd="$1"
+            case $subsubcmd in
+                install | i)
+                    shift 1
+                    (
+                        cd $HOME/opt/void-packages;
+                        xi "$@"
+                    )
+                ;;
+                *)
+                    (
+                        cd $HOME/opt/void-packages;
+                        ./xbps-src "$@"
+                    )
+                ;;
+            esac
+        ;;
         find | f)
             xlocate "$@"
         ;;
@@ -77,12 +102,18 @@ g()
         commit | c)
             git commit "$@"
         ;;
+        clone | cl)
+            git clone "$@"
+        ;;
         checkout | co)
             git checkout "$@"
         ;;
         tag | t)
             git tag "$@"
         ;;
+        init | i)
+            git init "$@"
+        ;;
         mv)
             git mv "$@"
         ;;
@@ -101,9 +132,18 @@ g()
         rebase | r)
             git rebase "$@"
         ;;
+        reflog | ref)
+            git reflog "$@"
+        ;;
         add | a)
             git add "$@"
         ;;
+        new | n)
+            ssh git@nbnoll.xyz mkrepo "$@"
+        ;;
+        remote | rem)
+            git remote "$@"
+        ;;
         *)
             warn "$subcmd" "unknown subcommand"
         ;;
@@ -113,21 +153,28 @@ g()
 export -f g
 
 # su
-su() {
+su()
+{
     PS1="(root)>" command su
 }
-export su
+export -f su
+
+# fzf
+source "$HOME/.local/share/fzf.sh"
 
 # prompt
-prompt_path() {
+prompt_path()
+{
   echo "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)/$(basename "${BASH_SOURCE[0]}")"
 }
 
-prompt_os() {
+prompt_os()
+{
   uname -s | tr '[:upper:]' '[:lower:]'
 }
 
-prompt_configure_completion() {
+prompt_configure_completion()
+{
   bind 'set colored-stats on'
   bind 'set colored-completion-prefix on'
   bind 'set completion-ignore-case on'
@@ -143,7 +190,8 @@ prompt_configure_completion() {
   shopt -s 'dirspell'
 }
 
-prompt_configure_dircolors() {
+prompt_configure_dircolors()
+{
   if [ -x "$(command -v dircolors)" ]; then
     if [ -r "$HOME/.dircolors" ]; then
       eval "$(dircolors -b "$HOME/.dircolors")"
@@ -153,19 +201,22 @@ prompt_configure_dircolors() {
   fi
 }
 
-prompt_configure_history() {
+prompt_configure_history()
+{
     export HISTCONTROL='ignoreboth:erasedups'
     export HISTTIMEFORMAT='[%Y-%m-%d %T] '
     shopt -s 'histappend'
 }
 
-prompt_configure_variables() {
+prompt_configure_variables()
+{
   export prompt_git_bin
   prompt_git_bin="$(command -v git)"
 }
 
 # load all configuration files
-prompt_configure() {
+prompt_configure()
+{
   export prompt_PS1_last_exit
   export prompt_PS1_prefix
   export prompt_PS1_content
@@ -178,7 +229,8 @@ prompt_configure() {
 }
 
 # prepares the prompt variables
-prompt_reset_prompt() {
+prompt_reset_prompt()
+{
   export prompt_PS1_last_exit="$?"
   export prompt_PS1_prefix=''
   prompt_PS1_prefix='\[\e]0;\w\a\]'
@@ -187,12 +239,14 @@ prompt_reset_prompt() {
 }
 
 # make prompt_PS1_suffix red if the previous command failed
-prompt_add_exit_code_to_prompt() {
+prompt_add_exit_code_to_prompt()
+{
   [ "$prompt_PS1_last_exit" -ne 0 ] && prompt_PS1_suffix="\[\e[31m\]${prompt_PS1_suffix}\[\e[0m\]"
 }
 
 # display git branch and repo state asterisk after path, if inside of a repository
-prompt_add_git_to_prompt() {
+prompt_add_git_to_prompt()
+{
   local prompt
   local branch
   local status_count
@@ -218,7 +272,8 @@ prompt_add_git_to_prompt() {
 }
 
 # prepend user@hostname to prompt, if connected via ssh
-prompt_add_ssh_to_prompt() {
+prompt_add_ssh_to_prompt()
+{
   if [ -n "$SSH_CONNECTION" ]; then
     prompt_PS1_prefix='\[\e]0;\u@\h \w\a\]'
     prompt_PS1_content="\[\e[2m\]\u@\h\[\e[0m\] ${prompt_PS1_content}"
@@ -226,7 +281,8 @@ prompt_add_ssh_to_prompt() {
 }
 
 # set the prompt
-do_prompt() {
+do_prompt()
+{
   prompt_reset_prompt
   prompt_add_exit_code_to_prompt
   prompt_add_ssh_to_prompt
@@ -237,7 +293,8 @@ do_prompt() {
 }
 
 # clean up shared prompt variables
-prompt_cleanup() {
+prompt_cleanup()
+{
   unset prompt_PS1_prefix \
         prompt_PS1_content \
         prompt_PS1_suffix \
@@ -245,7 +302,8 @@ prompt_cleanup() {
 }
 
 # do the thing!
-prompt_init() {
+prompt_init()
+{
   if [[ "$-" == *i* ]]; then
     prompt_configure
     if [[ "$PROMPT_COMMAND" != *do_prompt* ]]; then
diff --git a/.config/nvim/pack/vendor/packages b/.config/nvim/pack/vendor/packages
index 79d5ad8..cfe2e4b 100644
--- a/.config/nvim/pack/vendor/packages
+++ b/.config/nvim/pack/vendor/packages
@@ -14,9 +14,11 @@ junegunn/fzf.vim
 junegunn/vim-easy-align
 
 tpope/vim-surround
+tpope/vim-eunuch
 tpope/vim-repeat
 tpope/vim-vinegar
 tpope/vim-commentary
+tpope/vim-unimpaired
 
 simeji/winresizer
 adelarsq/vim-matchit
diff --git a/.config/picom/config b/.config/picom/config
index 6b09969..18a4b59 100644
--- a/.config/picom/config
+++ b/.config/picom/config
@@ -15,9 +15,9 @@ xrender-sync-fence    = false;
 # fading
 
 fading        = true;
-fade-delta    = 5;
-fade-in-step  = 0.05;
-fade-out-step = 0.05;
+fade-delta    = 2;
+fade-in-step  = 0.20;
+fade-out-step = 0.20;
 
 # ------------------------------------------------------------------------
 # shadow
diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py
index aa332b2..fbcb6a3 100644
--- a/.config/qutebrowser/config.py
+++ b/.config/qutebrowser/config.py
@@ -346,8 +346,9 @@ font = "12pt consolas"
 c.fonts.default_size = "12pt"
 c.fonts.default_family = "consolas"
 
-c.fonts.web.size.default = 12
-c.fonts.web.size.default_fixed = 12
+c.fonts.web.size.default = 14
+c.fonts.web.size.default_fixed = 14
+c.fonts.contextmenu = "10pt DejaVu Sans"
 
 # ------------------------------------------------------------------------
 # fonts
@@ -447,6 +448,7 @@ def redirect(request):
             request.redirect(url)
             change = False
         except:
+            change = False
             pass
 
     if change:
diff --git a/.config/tmux/config b/.config/tmux/config
index 98afd39..e788e46 100644
--- a/.config/tmux/config
+++ b/.config/tmux/config
@@ -76,7 +76,7 @@ bind-key u capture-pane \;\
 ######################
 
 set -g default-terminal "screen-256color"
-set -sa terminal-overrides ",term*:Tc:sitm=\E[3m:ritm=\E[23m:Smulx=\E[4::%p1%dm:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m"
+set -sa terminal-overrides ",xterm*:Tc:sitm=\E[3m:ritm=\E[23m:Smulx=\E[4::%p1%dm:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m"
 
 # UTF-8
 set -q -g status-utf8 on 
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index 483f2f2..ab8f37c 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -8,7 +8,7 @@
 set adjust-open "best-fit"
 
 # Font size
-set font "Consolas 16"
+set font "Consolas 12"
 
 # Zoom size
 set zoom-step 20
diff --git a/.screenlayout/setup.sh b/.screenlayout/setup.sh
index 17f8207..c0c6e98 100755
--- a/.screenlayout/setup.sh
+++ b/.screenlayout/setup.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output DP-1 --off --output DP-2 --mode 1920x1080 --pos 1920x0 --rotate normal --output DP-3 --off --output HDMI-1 --mode 1920x1080 --pos 0x0 --rotate normal
+xrandr --output DP-1 --off --output DP-2 --mode 1920x1080 --pos 1920x0 --rotate normal --output DP-3 --off --output HDMI-1 --primary --mode 1920x1080 --pos 0x0 --rotate normal