upstream merge

.config/i3/config

@@ -118,7 +118,8 @@ bindsym $mod+Shift+Return	exec $term -T "stfloat"
 
 # Custom Modes
 mode "Leave" {
-	bindsym l	exec --no-startup-id mpc pause; exec --no-startup-id pauseallmpv ; exec --no-startup-id lockr
+	bindsym l	exec --no-startup-id mpc pause; exec --no-startup-id pauseallmpv ; exec --no-startup-id lockr; exec --no-startup-id xset dpms force off
+
 	bindsym s	exec --no-startup-id prompt "Shutdown computer?" "$shutdown"
 	bindsym z	exec --no-startup-id prompt "Suspend computer?" "systemctl suspend";mode default
 	bindsym r	exec --no-startup-id prompt "Reboot computer?" "$reboot"
@@ -212,9 +213,7 @@ bindsym $mod+Shift+l		move right 30
 bindsym $mod+z			gaps outer current plus 5
 bindsym $mod+Shift+z		gaps outer current minus 5
 
-
 bindsym $mod+x			exec --no-startup-id clipmenu -i -fn Ubuntu:size=10 -nb '#002b36' -nf '#839496' -sb '#073642' -sf '#93a1a1'
-
 bindsym $mod+c			exec --no-startup-id cabl
 bindsym $mod+Shift+c		exec --no-startup-id camtoggle
 
@@ -310,7 +309,7 @@ bindsym $mod+F4		exec --no-startup-id $term
 bindsym $mod+F5		exec --no-startup-id $netrefresh
 bindsym $mod+F6		exec --no-startup-id torwrap
 bindsym $mod+F7		exec --no-startup-id td-toggle
-bindsym $mod+F8		exec --no-startup-id ~/.config/mutt/etc/mailsync.sh
+bindsym $mod+F8		exec --no-startup-id mailsync
 bindsym $mod+F9		exec --no-startup-id dmenumount
 bindsym $mod+F10	exec --no-startup-id dmenuumount
 bindsym $mod+F11	exec --no-startup-id ducksearch

.config/i3blocks/config

@@ -21,6 +21,9 @@ label=📰
 interval=once
 signal=6
 
+#[iplocate]
+#interval=30
+
 [pacpackages]
 label=📦
 interval=once

.config/vifm/vifmrc

@@ -85,7 +85,6 @@ nmap q ZQ
 
 fileview */ tree %c -L 1 --dirsfirst
 fileview ../ tree %c -L 1 --dirsfirst
-fileviewer *.md,*.xml,*.css,*.py,*.c,*.h,*.sh,*.diff,*.tex,*.md,*.bib,*.sty,*.desktop highlight -O ansi %c
 fileviewer *.html w3m -dump %c
 filextype *.html,*.htm firefox %f 2>/dev/null &
 

.local/share/larbs/readme.mom

@@ -283,7 +283,7 @@ additions.
 .LIST OFF
 .HEADING 2 "Recording"
 .PP
-I use scrot and ffmpeg to make different recordings of the desktop and audio.
+I use maim and ffmpeg to make different recordings of the desktop and audio.
 All of these recording shortcuts will output into \f(CW~\fP, and will not overwrite
 previous recordings as their names are based on their exact times.
 .LI
@@ -363,37 +363,12 @@ LARBS no longer uses Xresource by default, but you can still add an \f(CW~/.Xdef
 .PDF_WWW_LINK "https://wiki.archlinux.org/index.php/X_resources" "the Arch Wiki's article"
 for more information.
 .HEADING 2 "How do I set up my email?"
-.LI
-.ITEM
-Install \f(CWneomutt\fP, \f(CWofflineimap\fP and \f(CWmsmtp\fP if you haven't already.
-.ITEM
-Create a GPG private/public key pair if you haven't already. Type \f(CWmod+shift+e\fP and you can select a tutorial for how to do this.
-.ITEM
- Download the mutt-wizard repository to the mutt config directory:
-\f(CWgit clone https://github.com/lukesmithxyz/mutt-wizard ~/.config/mutt\fP.
-\fBREAD THE README.\fP
 .PP
-.ITEM
-There run \f(CWmutt-wizard.sh\fP and follow the directions, specifically:
-.LI
-.ITEM
-Add an account.
-.ITEM
-Run \f(CWofflineimap -o\fP in the terminal.
-.ITEM
-Then select the "Autodetect mailboxes" option.
-.LIST OFF
-.LIST OFF
+LARBS is automatically set up to be compatible with \f(CWmutt-wizard\fP, which is now in the AUR and can be installed by running \f(CWyay -S mutt-wizard-git\fP.
+You can then add email accounts by running \f(CWmw add\fP.
 .PP
-You should then be able to open your mail in mutt with Mod+e.
-And this is somewhat of a miracle considering all of the moving pieces that have come together to make this happen.
-Honestly, people give me all this credit for making LARBS, but the mutt-wizard is probably my favorite work.
-.PP
-You can, through the mutt-wizard, schedule automatic mail checks every several minutes.
-You can also press \f(CWMod-F8\fP at any time to check for new mail in your accounts.
-You might also want to run \f(CWnotmuch setup\fP to set \f(CWnotmuch\fP up as a mail indexer.
-This will allow quick searches of your mail in mutt with \f(CWctrl+f\fP.
-The mailsync script will update the notmuch database once you do this.
+Once you have successfully added your email address(es), you can open your mail with \f(CWneomutt\fP which is also bound to \f(CWMod+e\fP.
+You can sync your mail by pressing \f(CWMod+F8\fP and you can set a cronjob to sync mail every several minutes by running \f(CWmw cron\fP.
 .HEADING 2 "How do I set up my music?"
 .PP
 By default, mpd, the music daemon assumes that \f(CW~/Music\fP is your music directory.

.profile

@@ -7,7 +7,7 @@ export EDITOR="nvim"
 export TERMINAL="st"
 export BROWSER="chromium"
 export READER="zathura"
-export FILE="vu"
+export FILE="vifm"
 export BIB="$HOME/Documents/LaTeX/uni.bib"
 export REFER="$HOME/Documents/referbib"
 export SUDO_ASKPASS="$HOME/.scripts/tools/dmenupass"

.scripts/i3cmds/showclip

@@ -3,13 +3,8 @@
 # Display contents of selection via dunst if running.
 # Separate script for i3.
 
-! pgrep -x dunst >/dev/null && echo "dunst not running." && exit
-
 clip=$(xclip -o -selection clipboard)
-
 prim=$(xclip -o -selection primary)
 
-[ "$clip" != "" ] && notify-send "<b>Clipboard:</b>
-$clip"
-[ "$prim" != "" ] && notify-send "<b>Primary:</b>
-$prim"
+[ -n "$clip" ] && notify-send "Clipboard:" "$clip"
+[ -n "$prim" ] && notify-send "Primary:" "$prim"

.scripts/statusbar/iplocate

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Gets your public ip address checks which country you are in and
+# displays that information in the statusbar
+#
+# https://www.maketecheasier.com/ip-address-geolocation-lookups-linux/
+ifinstalled "geoiplookup" || exit
+addr="$(curl ifconfig.me 2>/dev/null)" || exit
+grep "flag: " ~/.config/emoji | grep "$(geoiplookup $addr | sed 's/.*, //')" | sed "s/flag: //;s/;.*//"

.scripts/statusbar/mpdupdate

@@ -1,8 +1,8 @@
 #!/bin/sh
-[ "$(pgrep -x "$(basename "$0")" | wc -l)" -gt 2 ] && exit
+# Whenever the mpd state changes, update the mpd i3 module.
+kill -0 "$(cat /tmp/mpdupdate)" 2>/dev/null && exit || echo $$ > /tmp/mpdupdate
 
 sleep 5 && while : ; do
-	pgrep -x mpd || exit
-	mpc idle > /dev/null
-	pkill -RTMIN+11 i3blocks ;
+	pkill -RTMIN+11 i3blocks
+	mpc idle >/dev/null || exit
 done

.tmux.conf

@@ -1,13 +1,13 @@
 set -g prefix C-a
 setw -g mode-keys vi
-setw -g mode-bg black
+#setw -g mode-bg black
 set-option -g default-terminal "xterm-256color"
-set-option -g pane-active-border-fg green
+#set-option -g pane-active-border-fg green
 set-window-option -g xterm-keys on # for vim
 set-window-option -g mode-keys vi # vi key
 set-window-option -g monitor-activity on
-set-window-option -g window-status-current-fg white
-setw -g window-status-current-attr reverse
+#set-window-option -g window-status-current-fg white
+#setw -g window-status-current-attr reverse
 setw -g automatic-rename
 set -g mouse on
 set -g history-limit 30000
@@ -36,10 +36,10 @@ bind-key -n C-up prev
 bind-key -n C-left prev
 bind-key -n C-right next
 bind-key -n C-down next
-set-window-option -g window-status-current-bg red
+#set-window-option -g window-status-current-bg red
 bind C-j previous-window
 bind C-k next-window
-bind-key C-a last-window # C-a C-a for last active window
+#bind-key C-a last-window # C-a C-a for last active window
 bind A command-prompt "rename-window %%"
 setw -g aggressive-resize on
 bind-key h select-pane -L