Fix merge conflicts

.config/calcurse/keys

@@ -1,70 +1,47 @@
-#
+generic-cancel  ESC
-# Calcurse keys configuration file
+generic-select  SPC
-#
+generic-credits  @
-# This file sets the keybindings used by Calcurse.
+generic-help  ?
-# Lines beginning with "#" are comments, and ignored by Calcurse.
+generic-quit  q Q
-# To assign a keybinding to an action, this file must contain a line
+generic-save  s S ^S
-# with the following syntax:
+generic-reload  R
-#
+generic-copy  c
-#        ACTION  KEY1  KEY2  ...  KEYn
+generic-paste  p ^V
-#
+generic-change-view  TAB
-# Where ACTION is what will be performed when KEY1, KEY2, ..., or KEYn
+generic-import  i I
-# will be pressed.
+generic-export  x X
-#
+generic-goto  g G
-# To define bindings which use the CONTROL key, prefix the key with 'C-'.
+generic-other-cmd  o O
-# The escape, space bar and horizontal Tab key can be specified using
+generic-config-menu  C
-# the 'ESC', 'SPC' and 'TAB' keyword, respectively.
+generic-redraw  ^R
-# Arrow keys can also be specified with the UP, DWN, LFT, RGT keywords.
+generic-add-appt  ^A
-# Last, Home and End keys can be assigned using 'KEY_HOME' and 'KEY_END'
+generic-add-todo  ^T
-# keywords.
+generic-prev-day  T ^H
-#
+generic-next-day  t ^L
-# A description of what each ACTION keyword is used for is available
+generic-prev-week  W ^K
-# from calcurse online configuration menu.
+generic-next-week  w ^J
-
+generic-prev-month  M
-generic-cancel  ESC 
+generic-next-month  m
-generic-select  SPC 
+generic-prev-year  Y
-generic-credits  @ 
+generic-next-year  y
-generic-help  ? 
+generic-scroll-down  ^N
-generic-quit  q Q 
+generic-scroll-up  ^P
-generic-save  s S ^S 
+generic-goto-today  ^G
-generic-reload  R 
+generic-command  :
-generic-copy  c 
+move-right  l L RGT
-generic-paste  p ^V 
+move-left  h H LFT
-generic-change-view  TAB 
+move-down  j J DWN
-generic-import  i I 
+move-up  k K UP
-generic-export  x X 
+start-of-week  0
-generic-goto  g G 
+end-of-week  $
-generic-other-cmd  o O 
+add-item  a A
-generic-config-menu  C 
+del-item  d D
-generic-redraw  ^R 
+edit-item  e E
-generic-add-appt  ^A 
+view-item  v V
-generic-add-todo  ^T 
+pipe-item  |
-generic-prev-day  T ^H 
+flag-item  !
-generic-next-day  t ^L 
+repeat  r
-generic-prev-week  W ^K 
+edit-note  n N
-generic-next-week  w ^J 
+view-note  >
-generic-prev-month  M 
+raise-priority  +
-generic-next-month  m 
+lower-priority  -
-generic-prev-year  Y 
-generic-next-year  y 
-generic-scroll-down  ^N 
-generic-scroll-up  ^P 
-generic-goto-today  ^G 
-generic-command  : 
-move-right  l L RGT 
-move-left  h H LFT 
-move-down  j J DWN 
-move-up  k K UP 
-start-of-week  0 
-end-of-week  $ 
-add-item  a A 
-del-item  d D 
-edit-item  e E 
-view-item  v V 
-pipe-item  | 
-flag-item  ! 
-repeat  r 
-edit-note  n N 
-view-note  > 
-raise-priority  + 
-lower-priority  - 

.config/i3/config

@@ -146,7 +146,7 @@ bindsym $mod+Shift+End		exec --no-startup-id xcqr
 
 # #---Letter Key Bindings---# #
 bindsym $mod+q			[con_id="__focused__" instance="^(?!dropdown_).*$"] kill
-bindsym $mod+Shift+q		[con_id="__focused__" instance="^(?!dropdown_).*$"] kill
+bindsym $mod+Shift+q		[con_id="__focused__" instance="^(?!dropdown_).*$"] exec --no-startup-id kill -9 `xdotool getwindowfocus getwindowpid`
 
 bindsym $mod+Ctrl+w		exec $term -e nmtui
 bindsym $mod+w			exec --no-startup-id $BROWSER
@@ -303,7 +303,6 @@ no_focus [title="mpvfloat"]
 
 
 # #---Function Buttons---# #
-#bindsym $mod+F1		exec --no-startup-id groff -kejpt -mom ~/.readme.mom -Tpdf | zathura -
 bindsym $mod+F1         exec --no-startup-id groff -kejpt -mom ~/.local/share/larbs/readme.mom -Tpdf | zathura -
 bindsym $mod+F2		restart
 bindsym $mod+F3		exec --no-startup-id displayselect

.config/vifm/vifmrc

@@ -295,7 +295,7 @@ filetype *.csv,*.xlsx sc-im %c
 fileviewer *.csv sed "s/,,,,/,,-,,/g;s/,,/ /g" %c | column -t | sed "s/ - /  /g" | cut -c -%pw
 
 filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus mpv --no-audio-display --input-ipc-server=/tmp/mpvsoc$(date +%%s) %c
-filextype *.pdf,*.ps,*.eps,*.ps.gz,*.djvu zathura %f 2>/dev/null &,
+filextype *.pdf,*.ps,*.eps,*.ps.gz,*.djvu,*.epub zathura %f 2>/dev/null &,
 fileviewer *.pdf pdftotext -l 1 -nopgbrk %c -
 fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.qt,*.divx,*.as[fx],*mp3,*.flac mediafile %c
 filextype *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx,*.as[fx] mpv --input-ipc-server=/tmp/mpvsoc$(date +%%s) %f 2>/dev/null &,

.local/share/larbs/readme.mom

@@ -114,7 +114,9 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWMod+Enter\fP \(en Spawn terminal (the default terminal is \f(CWst\fP; run \f(CWman st\fP for more.)
 .ITEM
-\f(CWMod+q/Q\fP \(en Close window
+\f(CWMod+q\fP \(en Close window
+.ITEM
+\f(CWMod+Q\fP \(en Force close window
 .ITEM
 \f(CWMod+d\fP \(en dmenu (For running commands or programs without shortcuts)
 .ITEM
@@ -343,6 +345,13 @@ These settings may override your preferred settings, so you should open this fil
 Sometimes, PulseAudio can be finicky on initial installation and configuration.
 If you have no audio output, chances are your problems will be resolved by a reboot or manually killing and restarting PulseAudio.
 You may also need to set your preferred default output sink which you can do by the command line, or by selecting one with \f(CWpulsemixer\fP (\f(CWmod+A\fP).
+.HEADING 2 "How do I copy and paste?"
+.PP
+Copying and pasting is always program-specific on any system.
+In most graphical programs, copy and paste will be the same as they are on Windows: \f(CWctrl-c\fP and \f(CWctrl-v\fP.
+In the Linux terminal, those binds have other more important purposes, so you can run \f(CWman st\fP to see how to copy and paste in my terminal build.
+.PP
+Additionally, I've set vim to use the clipboard as the default buffer, which means when you copy or delete something in vim, it will be in your system clipboard as well, so you can \f(CWctrl-v\fP it into your Firefox instance, etc. You can also paste material copied from other programs into vim with the typical vim bindings.
 .HEADING 2 "How do I change the background/wallpaper?"
 .PP
 The i3 configuration will always read the file \f(CW~/.config/wall.png\fP as the wallpaper.
@@ -350,14 +359,9 @@ The script \f(CWsetbg\fP, if run on an image will set it as the persistent backg
 When using the file manager, you can simply hover over an image name and type \f(CWbg\fP and this will run \f(CWsetbg\fP.
 .HEADING 2 "How I change the colorscheme?"
 .PP
-You can edit \f(CW~/.Xresources\fP to change the colorscheme.
+LARBS no longer uses Xresource by default, but you can still add an \f(CW~/.Xdefaults\fP file and add color settings to change the theme of numerous programs, including the terminal. See
-The terminal, status bar and other programs will automatically read the Xresources colors.
-Check
 .PDF_WWW_LINK "https://wiki.archlinux.org/index.php/X_resources" "the Arch Wiki's article"
 for more information.
-LARBS is also compatible with pywal, but it is not installed or used by default anymore.
-.PP
-Do not remove \f(CW~/.Xresources\fP or the color settings specifically because some programs, especially the i3 bar read them and will display as blank if they are deleted.
 .HEADING 2 "How do I set up my email?"
 .LI
 .ITEM
@@ -402,6 +406,10 @@ LARBS is deployed as a git repository in your home directory.
 You can use it as such to fetch, diff and merge changes from the remote repository.
 If you don't want to do that or don't know how to use git, you can actually just rerun the script (as root) and reinstall LARBS and it will automatically update an existing install if you select the same username.
 This will overwrite the original config files though, including changes you made for them, but this is an easier brute force approach that will also install any new dependencies.
+.HEADING 2 "Where are the build files for st or AUR programs?"
+.PP
+They are only created in \f(CW/tmp/\fP and thus are likely deleted after installation as they are not necessary.
+If you want to recompile a program, you will have to clone again.
 .HEADING 1 "Contact"
 .LI
 .ITEM

.scripts/i3cmds/dmenumount

@@ -3,7 +3,6 @@
 # If they're in /etc/fstab, they'll be mounted automatically.
 # Otherwise, you'll be prompted to give a mountpoint from already existsing directories.
 # If you input a novel directory, it will prompt you to create that directory.
-pgrep -x dmenu && exit
 
 getmount() { \
 	[ -z "$chosen" ] && exit 1
@@ -17,7 +16,7 @@ getmount() { \
 
 mountusb() { \
 	chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')"
-	sudo -A mount "$chosen" && notify-send "$chosen mounted." && exit 0
+	sudo -A mount "$chosen" && notify-send "💻 USB mounting" "$chosen mounted." && exit 0
 	alreadymounted=$(lsblk -nrpo "name,type,mountpoint" | awk '$2=="part"&&$3!~/\/boot|\/home$|SWAP/&&length($3)>1{printf "-not \( -path *%s -prune \) \ \n",$3}')
 	getmount "/mnt /media /mount /home -maxdepth 5 -type d $alreadymounted"
 	partitiontype="$(lsblk -no "fstype" "$chosen")"
@@ -25,14 +24,14 @@ mountusb() { \
 		"vfat") sudo -A mount -t vfat "$chosen" "$mp" -o rw,umask=0000;;
 		*) sudo -A mount "$chosen" "$mp"; user="$(whoami)"; ug="$(groups | awk '{print $1}')"; sudo -A chown "$user":"$ug" 741 "$mp";;
 	esac
-	notify-send "$chosen mounted to $mp."
+	notify-send "💻 USB mounting" "$chosen mounted to $mp."
 	}
 
 mountandroid() { \
 	chosen=$(echo "$anddrives" | dmenu -i -p "Which Android device?" | cut -d : -f 1)
 	getmount "$HOME -maxdepth 3 -type d"
 	simple-mtpfs --device "$chosen" "$mp"
-	notify-send "Android device mounted to $mp."
+	notify-send "🤖 Android Mounting" "Android device mounted to $mp."
 	}
 
 asktype() { \

.scripts/i3cmds/dmenuumount

@@ -7,17 +7,17 @@ unmountusb() {
 	[ -z "$drives" ] && exit
 	chosen=$(echo "$drives" | dmenu -i -p "Unmount which drive?" | awk '{print $1}')
 	[ -z "$chosen" ] && exit
-	sudo -A umount "$chosen" && pgrep -x dunst && notify-send "$chosen unmounted."
+	sudo -A umount "$chosen" && notify-send "💻 USB unmounting" "$chosen unmounted."
 	}
 
 unmountandroid() { \
 	chosen=$(awk '/simple-mtpfs/ {print $2}' /etc/mtab | dmenu -i -p "Unmount which device?")
 	[ -z "$chosen" ] && exit
-	sudo -A umount -l "$chosen" && pgrep -x dunst && notify-send "$chosen unmounted."
+	sudo -A umount -l "$chosen" && notify-send "🤖 Android unmounting" "$chosen unmounted."
 	}
 
 asktype() { \
-	case $(printf "USB\\nAndroid" | dmenu -i -p "Unmount a USB drive or Android device?") in
+	case "$(printf "USB\\nAndroid" | dmenu -i -p "Unmount a USB drive or Android device?")" in
 		USB) unmountusb ;;
 		Android) unmountandroid ;;
 	esac

.scripts/tools/getbib

@@ -1,21 +1,14 @@
 #!/bin/sh
+[ -z "$1" ] && echo "Give either a pdf file or a DOI as an argument." && exit
 
-# Give this script a .pdf and it will attempt
+if [ -f "$1" ]; then
-# to return a proper .bib citation via doi.
+	# Try to get DOI from pdfinfo or pdftotext output.
-# Internet connection required.
-
-if [ -f "$1" ];
-then
-	# Get the doi from metadata, if not possible, get
-	# doi from pdftotext output, if not possible, exit.
 	doi=$(pdfinfo "$1" | grep -io "doi:.*") ||
-	doi=$(pdftotext "$1" 2>/dev/null - | grep -o "doi:.*" -m 1) ||
+	doi=$(pdftotext "$1" 2>/dev/null - | grep -io "doi:.*" -m 1) ||
 	exit 1
 else
-	# If not given file, assume argument is doi
 	doi="$1"
 fi
 
 # Check crossref.org for the bib citation.
-curl -s "http://api.crossref.org/works/$doi/transform/application/x-bibtex" -w "\\n" |
+curl -s "http://api.crossref.org/works/$doi/transform/application/x-bibtex" -w "\\n"
-	sed -e "/^[^\\(\\t\\|@\\|}\\)]/d"

.scripts/tools/ifinstalled

@@ -1,3 +1,3 @@
 #!/bin/sh
 # If $1 command is not available, error code and notify.
-command -v "$1" >/dev/null || { notify-send "📦 <b>$1</b> must be installed for this function." && exit 1 ;}
+command -v "$1" >/dev/null || { notify-send "📦 $1" "must be installed for this function." && exit 1 ;}