Merge branch 'master' into ursa_minor

27 files changed, 121 insertions, 61 deletions

diff --git a/README.rst b/README.rst
index 5ec3bd3..3d4962f 100644
--- a/README.rst
+++ b/README.rst
@@ -4,7 +4,26 @@ Tucker's Dotfiles
 These dotfiles are here mostly to move them between my computers and 
 as a backup, but feel free to use them yourself.
 
-vim plugins
+Branches
+--------
+
+I keep the master branch as templates for new systems. Each of my
+computers then have their own branch, this is to account for different
+font size and other necessary changes. Any changes that need to be
+made i.e. font change, are changed to "!INPUT" in files for easy
+search/repace. Example, Xresourses::
+
+  XTerm*faceName: !FONT
+  UXTerm*faceName: !FONT
+  
+  XTerm*faceSize: !FONT_SIZE
+  UXTerm*faceSize: !FONT_SIZE
+  
+  XTerm*allowBoldFont: false
+  UXTerm*allowBoldFont: false
+
+
+Vim Plugins
 -----------
 I keep my vim plugins as submodules in this repo, I use
 `github.com/tuckerevans/plugVim <https://www.github.com/tuckerevans/plugvim>`_
diff --git a/X/.Xresources b/X/.Xresources
index f262dea..e13b021 100644
--- a/X/.Xresources
+++ b/X/.Xresources
@@ -1,9 +1,8 @@
-XTerm*faceName: IBM 3270
-UXTerm*faceName: IBM 3270
+XTerm*faceName: Terminus
+UXTerm*faceName: Terminus
 
-
-XTerm*faceSize: 16
-UXTerm*faceSize: 16
+XTerm*faceSize: 10
+UXTerm*faceSize: 10
 
 XTerm*allowBoldFont: false
 UXTerm*allowBoldFont: false
@@ -12,6 +11,9 @@ UXTerm*boldMode: false
 
 XTerm*colorBDMode: true
 UXTerm*colorBDMode: true
+
+*VT100*translations: #override Shift <Btn1Up>: exec-formatted("firefox '%t'", PRIMARY)
+XTerm*on3Clicks: regex ([[:alpha:]]+://)?([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!! COLORS (serious business) !!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/X/.screenSetup.sh b/X/.screenSetup.sh
new file mode 100755
index 0000000..0c65708
--- /dev/null
+++ b/X/.screenSetup.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+xrandr --output DVI-I-1 --primary --mode 1920x1080 --pos 0x840 --rotate normal --output DP-1 --off --output HDMI-0 --mode 1920x1080 --pos 1920x0 --rotate right
diff --git a/X/.xinitrc b/X/.xinitrc
index 450adb3..df15743 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -1,5 +1,8 @@
-feh --bg-fill /home/tje/Pictures/Wallpapers/Resistor.png
+#Basic startx file uncomment lines for more functionality
+
+#feh --bg-fill !PATH_TO_WALLPAPER
 xrdb -merge /home/tje/.Xresources
 start-pulseaudio-x11 &
+~/.screenSetup.sh
 exec i3
 exec twm
diff --git a/bash/.bashrc b/bash/.bashrc
index b42ff1b..dc18213 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,6 +1,8 @@
 # .bashrc
 set -o vi
 
+PATH=~/bin:$PATH
+
 source ~/.pass_completion
 HISTSIZE=1000
 HISTFILESIZE=8000
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index fae94ff..0d82aa3 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -13,7 +13,7 @@ set $mod Mod1
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:Courier Prime 8
+font pango: Courier 8
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
@@ -160,7 +160,7 @@ bindsym $mod+r mode "resize"
 bar {
         status_command LC_ALL=C i3status
 	separator_symbol " | "
-	font pango: 3270Medium Nerd Font 14
+	font pango: GohuFonmmmt 10
 #	colors {
 #		background #414A59
 #		statusline  #F5F6F7
@@ -168,9 +168,9 @@ bar {
 }
 
 # Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 1 +5% #increase sound volume
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 1 -5% #decrease sound volume
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 1 toggle # mute sound
 
 # Sreen brightness controls
 bindsym XF86MonBrightnessUp exec xbacklight -inc 5 # increase screen brightness
@@ -188,6 +188,7 @@ bindsym XF86AudioPrev exec playerctl previous
 
 exec --no-startup-id synclient NaturalScrolling=1  VertScrollDelta=-113
 exec --no-startup-id /home/tje/i3-battery-popup -N
+exec /home/tje/.screenSetup.sh
 
 bindsym $mod+b exec firefox
 bindsym $mod+p exec passmenu
diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config
index f7ddbcc..f5876d1 100644
--- a/i3/.config/i3status/config
+++ b/i3/.config/i3status/config
@@ -14,10 +14,8 @@ general {
 
 order += "ipv6"
 order += "disk /"
-order += "wireless _first_"
 order += "ethernet _first_"
 order += "volume master"
-order += "battery all"
 order += "load"
 order += "cpu_temperature 0"
 order += "tztime local"
diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 09c0a01..2cde563 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -176,3 +176,53 @@ SyncState *
 Group clarkson
 Channel clarkson-default
 Channel clarkson-sent
+
+###################
+# tuckerevans.com #
+###################
+
+IMAPAccount tuckerevans
+Host banshee.mxlogin.com
+User tje@tuckerevans.com
+PassCmd "pass show email/tuckerevans.com"
+SSLType IMAPS
+Port 993
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore tuckerevans-remote
+Account tuckerevans
+
+MaildirStore tuckerevans-local
+Path ~/Mail/tuckerevans/
+Inbox ~/Mail/tuckerevans/inbox
+
+Channel tuckerevans-default
+Master :tuckerevans-remote:
+Slave :tuckerevans-local:inbox
+
+Channel tuckerevans-sent
+Master :tuckerevans-remote:"Sent"
+Slave :tuckerevans-local:sent
+
+#Channel tuckerevans-trash
+#Master :tuckerevans-remote:"Trash"
+#Slave :tuckerevans-local:trash
+
+#Channel tuckerevans-archive
+#Master :tuckerevans-remote:"Archives"
+#Slave :tuckerevans-local:all
+
+#Channel tuckerevans-junk
+#Master :tuckerevans-remote:"spam"
+#Slave :tuckerevans-local:junk
+
+Create Both
+Expunge Both
+SyncState *
+
+Group tuckerevans
+Channel tuckerevans-default
+#Channel tuckerevans-trash
+#Channel tuckerevans-archive
+Channel tuckerevans-sent
+#Channel tuckerevans-junk
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index 4da69b0..6813c12 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -42,3 +42,12 @@ tls on
 tls_starttls on              
 user "evanst@clarkson.edu"       
 passwordeval "pass show clarkson/app-passwords/msmtp"
+
+account tuckerevans
+host banshee.mxlogin.com
+from "tje@tuckerevans.com"
+port 465
+tls on
+tls_starttls off
+user "tje@tuckerevans.com"
+passwordeval "pass show email/tuckerevans.com"
diff --git a/mutt/.mutt/tuckerevans.com b/mutt/.mutt/tuckerevans.com
new file mode 100644
index 0000000..5a6c965
--- /dev/null
+++ b/mutt/.mutt/tuckerevans.com
@@ -0,0 +1,11 @@
+set from="Tucker Evans <tje@tuckerevans.com>"
+set hostname="tuckerevans.com"
+set folder="~/Mail/tuckerevans"
+set mbox="~/Mail/tuckerevans"
+set record="~/Mail/tuckerevans/sent"
+set postponed="~/Mail/tuckerevans/drafts"
+set spoolfile="~/Mail/tuckerevans/inbox"
+
+set sendmail="/usr/bin/msmtp -a tuckerevans"
+
+color status black cyan
diff --git a/mutt/.muttrc b/mutt/.muttrc
index 11f52b0..4646224 100644
--- a/mutt/.muttrc
+++ b/mutt/.muttrc
@@ -48,10 +48,12 @@ folder-hook '~/Mail/gmail.com' 'source ~/.mutt/gmail.com'
 folder-hook '~/Mail/ohmnii.com/inbox' 'source ~/mutt/ohmnii.com'
 folder-hook '~/Mail/landmark.edu' 'source ~/mutt/landmark.edu'
 folder-hook '~/Mail/clarkson.edu' 'source ~/mutt/clarkson.edu
+folder-hook '~/Mail/tuckerevans.com/inbox' 'source ~/mutt/tuckerevans.com'
 
 
-macro index <f2> '<sync-mailbox><change-folder>~/Mail/gmail/inbox<enter><enter-command>source ~/.mutt/gmail.com<enter>'
-macro index <f3> '<sync-mailbox><change-folder>~/Mail/ohmnii/inbox<enter><enter-command>source ~/.mutt/ohmnii.com<enter>'
+macro index <f1> '<sync-mailbox><change-folder>~/Mail/gmail/inbox<enter><enter-command>source ~/.mutt/gmail.com<enter>'
+macro index <f2> '<sync-mailbox><change-folder>~/Mail/ohmnii/inbox<enter><enter-command>source ~/.mutt/ohmnii.com<enter>'
+macro index <f3> '<sync-mailbox><change-folder>~/Mail/tuckerevans/inbox<enter><enter-command>source ~/.mutt/tuckerevans.com<enter>'
 macro index <f4> '<sync-mailbox><change-folder>~/Mail/clarkson/inbox<enter><enter-command>source ~/.mutt/clarkson.edu<enter>'
 macro index <f5> '<sync-mailbox><change-folder>~/Mail/landmark/inbox<enter><enter-command>source ~/.mutt/landmark.edu<enter>'
 
diff --git a/vim/.vim/after/ftplugin/haskell.vim b/vim/.vim/after/ftplugin/haskell.vim
index b0ce109..109cd5b 100644
--- a/vim/.vim/after/ftplugin/haskell.vim
+++ b/vim/.vim/after/ftplugin/haskell.vim
@@ -4,4 +4,3 @@ set expandtab                   "Always uses spaces instead of tabs
 set softtabstop=4               "Insert 4 spaces when tab is pressed
 set shiftwidth=4                "An indent is 4 spaces
 set shiftround                  "Round indent to nearest shiftwidth multiple
-
diff --git a/vim/.vim/after/ftplugin/nroff.vim b/vim/.vim/after/ftplugin/nroff.vim
new file mode 100644
index 0000000..031c8d9
--- /dev/null
+++ b/vim/.vim/after/ftplugin/nroff.vim
@@ -0,0 +1,2 @@
+set spell
+autocmd BufWritePost * silent! !grap % | pic | tbl | eqn | troff -ms | grops > %:r.ps
diff --git a/vim/.vim/after/ftplugin/rst.vim b/vim/.vim/after/ftplugin/rst.vim
index 4ea3bbf..c5fc1a9 100644
--- a/vim/.vim/after/ftplugin/rst.vim
+++ b/vim/.vim/after/ftplugin/rst.vim
@@ -1,7 +1,6 @@
 " Tab specific option
-set tabstop=8                   "A tab is 8 spaces
-set noexpandtab                   "Always uses spaces instead of tabs
-set shiftwidth=2                "An indent is 4 spaces
-set softtabstop=8               "Insert 4 spaces when tab is pressed
+set tabstop=4                   "A tab is 8 spaces
+set expandtab                   "Always uses spaces instead of tabs
+set softtabstop=4               "Insert 4 spaces when tab is pressed
+set shiftwidth=4                "An indent is 4 spaces
 set shiftround                  "Round indent to nearest shiftwidth multiple
-
diff --git a/vim/.vim/after/ftplugin/tex.vim b/vim/.vim/after/ftplugin/tex.vim
index 95e50d4..87f4512 100644
--- a/vim/.vim/after/ftplugin/tex.vim
+++ b/vim/.vim/after/ftplugin/tex.vim
@@ -1,2 +1 @@
 set spell
-au BufWritePost * silent! execute "!pdflatex %" | redraw!
diff --git a/vim/.vim/after/ftplugin/tr.vim b/vim/.vim/after/ftplugin/tr.vim
deleted file mode 100644
index 87f4512..0000000
--- a/vim/.vim/after/ftplugin/tr.vim
+++ /dev/null
@@ -1 +0,0 @@
-set spell
diff --git a/vim/.vim/ftplugin/asm.vim b/vim/.vim/ftplugin/asm.vim
deleted file mode 100644
index e69de29..0000000
--- a/vim/.vim/ftplugin/asm.vim
+++ /dev/null
diff --git a/vim/.vim/ftplugin/by.vim b/vim/.vim/ftplugin/by.vim
deleted file mode 100644
index 7f2b61c..0000000
--- a/vim/.vim/ftplugin/by.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set nospell
-set tw=0
diff --git a/vim/.vim/ftplugin/c.vim b/vim/.vim/ftplugin/c.vim
deleted file mode 100644
index a445f6f..0000000
--- a/vim/.vim/ftplugin/c.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set tw=0
-set cindent
-set nospell
diff --git a/vim/.vim/ftplugin/conf.vim b/vim/.vim/ftplugin/conf.vim
deleted file mode 100644
index 7f2b61c..0000000
--- a/vim/.vim/ftplugin/conf.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set nospell
-set tw=0
diff --git a/vim/.vim/ftplugin/go.vim b/vim/.vim/ftplugin/go.vim
deleted file mode 100644
index 736e482..0000000
--- a/vim/.vim/ftplugin/go.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tw=0
-set cindent
diff --git a/vim/.vim/ftplugin/java.vim b/vim/.vim/ftplugin/java.vim
deleted file mode 100644
index 736e482..0000000
--- a/vim/.vim/ftplugin/java.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tw=0
-set cindent
diff --git a/vim/.vim/ftplugin/mail.vim b/vim/.vim/ftplugin/mail.vim
deleted file mode 100644
index c6e2b8a..0000000
--- a/vim/.vim/ftplugin/mail.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set softtabstop=4
-set shiftwidth=4
-set expandtab
diff --git a/vim/.vim/ftplugin/python.vim b/vim/.vim/ftplugin/python.vim
deleted file mode 100644
index 643e63d..0000000
--- a/vim/.vim/ftplugin/python.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-set nospell
-set tw=0
-set tabstop=8
-set softtabstop=8
-set shiftwidth=8
-set noexpandtab
-
diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim
deleted file mode 100644
index 87f4512..0000000
--- a/vim/.vim/ftplugin/tex.vim
+++ /dev/null
@@ -1 +0,0 @@
-set spell
diff --git a/vim/.vim/ftplugin/tree.vim b/vim/.vim/ftplugin/tree.vim
deleted file mode 100644
index 073abf6..0000000
--- a/vim/.vim/ftplugin/tree.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-set tw=0
-set nolist
-set nospell
-
-map pp a,    01<esc>
-map PP a,    09<esc>
-map tt a,    06<esc>
-map bb a,    07<esc>
-map ss a,    03<esc>
-map SS a,    04<esc>
-map nn a,    05<esc>
-map vv a,    02<esc>
-map cc a,  Cull<esc>
diff --git a/vim/.vim/ftplugin/txt.vim b/vim/.vim/ftplugin/txt.vim
deleted file mode 100644
index 7dcafeb..0000000
--- a/vim/.vim/ftplugin/txt.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set spell
-set tw=70