Merge branch 'ursa_minor'

28 files changed, 323 insertions, 55 deletions

diff --git a/.gitmodules b/.gitmodules
index c207e91..454c5ba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "vim/.vim/pack/tje/start/vim-autoclose"]
 	path = vim/.vim/pack/tje/start/vim-autoclose
 	url = git@github.com:Townk/vim-autoclose.git
+[submodule "vim/.vim/pack/tje/start/wordCount.vim"]
+	path = vim/.vim/pack/tje/start/wordCount.vim
+	url = git@github.com:ChesleyTan/wordCount.vim.git
diff --git a/bash/.bashrc b/bash/.bashrc
index 339a22e..1a634db 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -7,13 +7,25 @@ set -o vi
 [[ $- != *i* ]] && return
 
 alias ls='ls --color=auto'
-alias ll='ls -la'
-#alias school='cd !SCHOOL_FOLDER'
+alias ll='ls -laF'
 
 alias xcopy='xclip -selection clipboard'
 alias xpaste='xclip -selection clipboard -o'
 
+alias rtv='rtv --enable-media'
+
+alias sloc='sloccount'
+
 PS1='[\u@\h \W]\$ '
 
+export GPG_TTY=$(tty)
+
 MAIL=/var/spool/mail/tje && export MAIL
-export EDITOR=vi
+export EDITOR=vim
+
+
+export IRCNICK="TropicalTea"
+export IRCNAME="tje"
+export IRCSERVER="chat.freenode.net"
+
+alias word=wordgrinder
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 01e0749..86f89dd 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -159,6 +159,7 @@ bindsym $mod+r mode "resize"
 
 bar {
         status_command i3status
+	separator_symbol " | "
 #	colors {
 #		background #414A59
 #		statusline  #F5F6F7
@@ -187,5 +188,13 @@ bindsym XF86AudioPrev exec playerctl previous
 exec --no-startup-id synclient NaturalScrolling=1  VertScrollDelta=-113
 exec --no-startup-id /home/tje/i3-battery-popup -N
 
+<<<<<<< HEAD
 bindsym $mod+b exec !BROWSER
 bindsym $mod+p exec passmenu
+=======
+bindsym $mod+b exec qutebrowser
+bindsym $mod+p exec passmenu
+
+for_window [class="mpv"] floating enable
+for_window [class="feh"] floating enable
+>>>>>>> ursa_minor
diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config
index a291ae3..36062e3 100644
--- a/i3/.config/i3status/config
+++ b/i3/.config/i3status/config
@@ -7,10 +7,9 @@
 # If the above line is not correctly displayed, fix your editor first!
 
 general {
-        colors = true
-        interval = 5
-#color_good = "#5294E2"
-#	color_bad = "#CC575D"
+	colors = true
+	interval = 5
+	output_format = i3bar
 }
 
 order += "ipv6"
@@ -20,33 +19,48 @@ order += "ethernet _first_"
 order += "volume master"
 order += "battery all"
 order += "load"
+order += "cpu_temperature 0"
 order += "tztime local"
+order += "tztime utc"
+
+ipv6 {
+	format_up = "%ip"
+	format_down = ""
+}
 
 wireless _first_ {
-        format_up = "W: (%quality at %essid) %ip"
-        format_down = "W: down"
+	format_up = "W:%quality %ip"
+	format_down = "W: down"
 }
 
 ethernet _first_ {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
+	# if you use %speed, i3status requires root privileges
+	format_up = "E: %ip %speed"
+	format_down = "E: down"
 }
 
 battery all {
-        format = "%status %percentage %remaining"
+	format = "%status %percentage"
+}
+tztime utc {
+	format = "UTC: %H:%M"
+	timezone = "Etc/UTC"
 }
 
 tztime local {
-        format = "%Y-%m-%d %H:%M:%S"
+	format = "EST: %Y-%m-%d %H:%M:%S"
 }
 
 load {
-        format = "%1min"
+	format = "%1min"
+}
+cpu_temperature 0 {
+	format = "%degrees C"
+	path ="/sys/devices/platform/coretemp.0/hwmon/hwmon1/temp1_input"
 }
 
 disk "/" {
-        format = "%avail"
+	format = "%avail"
 }
 
 volume master {
diff --git a/input/.inputrc b/input/.inputrc
index 96ed405..823704a 100644
--- a/input/.inputrc
+++ b/input/.inputrc
@@ -1,3 +1,4 @@
 $include /etc/inputrc
 
 set editing-mode vi
+set enable-keypad on
diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
new file mode 100644
index 0000000..4d6ae8b
--- /dev/null
+++ b/mbsync/.mbsyncrc
@@ -0,0 +1,142 @@
+IMAPAccount gmail
+Host imap.gmail.com
+User tuckerevans24@gmail.com
+PassCmd "pass show google_app_passwords/mbsync"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore gmail-remote
+Account gmail
+
+MaildirStore gmail-local
+#The trailing "/" is important
+Path ~/Mail/gmail/
+Inbox ~/Mail/gmail/inbox
+
+Channel gmail-default
+Master :gmail-remote:
+Slave :gmail-local:inbox
+
+Channel gmail-sent
+Master :gmail-remote:"[Gmail]/Sent Mail"
+Slave :gmail-local:sent
+
+#Channel gmail-trash
+#Master :gmail-remote:"Trash"
+#Slave :gmail-local:trash
+
+#Channel gmail-archive
+#Master :gmail-remote:"[Gmail]/All Mail"
+#Slave :gmail-local:all
+
+
+#Channel gmail-junk
+#Master :gmail-remote:"Archives"
+#Slave :gmail-local:junk
+
+Create Both
+Expunge Both
+SyncState *
+
+Group gmail
+Channel gmail-default
+#Channel gmail-trash
+#Channel gmail-archive
+Channel gmail-sent
+#Channel gmail-junk
+
+#######################################
+
+IMAPAccount ohmnii
+Host imap.mail.us-east-1.awsapps.com
+User tucker@ohmnii.com
+PassCmd "pass show email/ohmnii.com"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore ohmnii-remote
+Account ohmnii
+
+MaildirStore ohmnii-local
+Path ~/Mail/ohmnii/
+Inbox ~/Mail/ohmnii/inbox
+
+Channel ohmnii-default
+Master :ohmnii-remote:
+Slave :ohmnii-local:inbox
+
+Channel ohmnii-sent
+Master :ohmnii-remote:"Sent Items"
+Slave :ohmnii-local:sent
+
+#Channel ohmnii-trash
+#Master :ohmnii-remote:"Deleted Items"
+#Slave :ohmnii-local:trash
+
+#Channel ohmnii-archive
+#Master :ohmnii-remote:"Archives"
+#Slave :ohmnii-local:all
+
+#Channel ohmnii-junk
+#Master :ohmnii-remote:"Junk Email"
+#Slave :ohmnii-local:junk
+
+Create Both
+Expunge Both
+SyncState *
+
+Group ohmnii
+Channel ohmnii-default
+#Channel ohmnii-trash
+#Channel ohmnii-archive
+Channel ohmnii-sent
+#Channel ohmnii-junk
+
+
+#######################################
+
+IMAPAccount landmark
+Host outlook.office365.com
+Port 993
+User tuckerevans@landmark.edu
+PassCmd "pass show email/landmark.edu"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore landmark-remote
+Account landmark
+
+MaildirStore landmark-local
+Path ~/Mail/landmark/
+Inbox ~/Mail/landmark/inbox
+
+Channel landmark-default
+Master :landmark-remote:
+Slave :landmark-local:inbox
+
+Channel landmark-sent
+Master :landmark-remote:"Sent Items"
+Slave :landmark-local:sent
+
+#Channel landmark-trash
+#Master :landmark-remote:"Deleted Items"
+#Slave :landmark-local:trash
+
+#Channel landmark-archive
+#Master :landmark-remote:"Archives"
+#Slave :landmark-local:all
+
+#Channel landmark-junk
+#Master :landmark-remote:"Junk Email"
+#Slave :landmark-local:junk
+
+Create Both
+Expunge Both
+SyncState *
+
+Group landmark
+Channel landmark-default
+#Channel landmark-trash
+#Channel landmark-archive
+Channel landmark-sent
+#Channel landmark-junk
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
new file mode 100644
index 0000000..8698c29
--- /dev/null
+++ b/msmtp/.msmtprc
@@ -0,0 +1,34 @@
+defaults
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+auth on                     
+logfile ~/.msmtp.log
+
+
+account gmail              
+host smtp.gmail.com          
+port 587                     
+from "tuckerevans24@gmail.com"
+tls on                       
+tls_starttls on              
+user "tuckerevans24"       
+passwordeval "pass show google_app_passwords/msmtp"
+
+account ohmnii
+host smtp.mail.us-east-1.awsapps.com
+from "tucker@ohmnii.com"
+port 465
+tls on
+tls_starttls off
+user "tucker@ohmnii.com"
+passwordeval "pass show email/ohmnii.com"
+
+account landmark
+host smtp.office365.com
+from "tuckerevans@landmark.edu"
+port 587
+tls on
+tls_starttls on
+user "tuckerevans@landmark.edu"
+passwordeval "pass show email/landmark.edu"
+
+account default : gmail
diff --git a/mutt/.mutt/gmail.com b/mutt/.mutt/gmail.com
new file mode 100644
index 0000000..7f82916
--- /dev/null
+++ b/mutt/.mutt/gmail.com
@@ -0,0 +1,11 @@
+set from = "tuckerevans24@gmail.com"
+set hostname = "gmail.com"
+set folder = "~/Mail/gmail"
+set mbox = "~/Mail/gmail"
+set record = "~/Mail/gmail/sent"
+set postponed = "~/Mail/gmail/Drafts"
+set spoolfile = "~/Mail/gmail/inbox"
+
+set sendmail = "/usr/bin/msmtp -a default"
+
+color status black blue
diff --git a/mutt/.mutt/landmark.edu b/mutt/.mutt/landmark.edu
new file mode 100644
index 0000000..a23ac92
--- /dev/null
+++ b/mutt/.mutt/landmark.edu
@@ -0,0 +1,11 @@
+set from="Tucker Evans <tuckerevans@landmark.edu>"
+set hostname="landmark.edu"
+set folder="~/Mail/landmark"
+set mbox="~/Mail/landmark"
+set record="~/Mail/landmark/sent"
+set postponed="~/Mail/landmark/drafts"
+set spoolfile="~/Mail/landmark/inbox"
+
+set sendmail="/usr/bin/msmtp -a landmark"
+
+color status black cyan
diff --git a/mutt/.mutt/ohmnii.com b/mutt/.mutt/ohmnii.com
new file mode 100644
index 0000000..0f410c6
--- /dev/null
+++ b/mutt/.mutt/ohmnii.com
@@ -0,0 +1,11 @@
+set from="Tucker Evans <tucker@ohmnii.com>"
+set hostname="ohmnii.com"
+set folder="~/Mail/ohmnii"
+set mbox="~/Mail/ohmnii"
+set record="~/Mail/ohmnii/sent"
+set postponed="~/Mail/ohmnii/drafts"
+set spoolfile="~/Mail/ohmnii/inbox"
+
+set sendmail="/usr/bin/msmtp -a ohmnii"
+
+color status black green
diff --git a/mutt/.muttrc b/mutt/.muttrc
index c4bbf73..5629b52 100644
--- a/mutt/.muttrc
+++ b/mutt/.muttrc
@@ -1,24 +1,15 @@
 #======================================================#
 # Boring details
-set realname = tje
-set from = "Tucker Evans <tuckerevans24@gmail.com>"
+set realname = "Tucker Evans"
+set from = "<tuckerevans24@gmail.com>"
 set use_from = yes
-set envelope_from ="yes"
-set sendmail="/usr/bin/msmtp"
+set use_envelope_from ="yes"
+set mbox_type=Maildir
 
 # If not set in environment variables:
-set spoolfile = /var/spool/mail/tje
 
-#======================================================#
-# Folders
-set folder="~/Mail"                # Mailboxes in here
-set record="+sent"                 # where to store sent messages
-set postponed="+postponed"         # where to store draft messages
-set move=no                        # Don't move mail from the spool.
-
-#======================================================#
 # Watch these mailboxes for new mail:
-mailboxes ! +Fetchmail +slrn +mutt
+mailboxes ! +mutt
 set sort_browser=alpha    # Sort mailboxes by alpha(bet)
 
 #======================================================#
@@ -52,26 +43,39 @@ set sort = reverse-date-received
 
 alternative_order text/plain text/html
 auto_view text/html
+
+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'
+
+
+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 <f4> '<sync-mailbox><change-folder>~/Mail/landmark/inbox<enter><enter-command>source ~/.mutt/landmark.edu<enter>'
+
 # -*-muttrc-*-
 
 # Palette for use with the Linux console.  Black background.
 
-#color hdrdefault blue black
-#color quoted blue black
-#color signature blue black
-#color attachment red black
-#color prompt brightmagenta black
-#color message brightred black
-#color error brightred black
-#color indicator black red
-#color status brightgreen blue
-#color tree white black
-#color normal white black
-#color markers blue black
-#color search white black
-#color tilde brightmagenta black
-#color index blue black ~F
-#color index red black "~N|~O"
-
-# color body brightwhite black '\*+[^*]+\*+'
-# color body brightwhite black '_+[^_]+_+'
+color hdrdefault white black
+color quoted blue black
+color signature blue black
+color attachment red black
+color prompt white black
+color message brightred black
+color error brightred black
+color indicator black white
+color tree white black
+color normal white black
+color markers blue black
+color search white black
+color tilde brightmagenta black
+color index red black ~F
+color index brightwhite black "~N|~O"
+
+color body brightwhite black '\*+[^*]+\*+'
+color body brightwhite black '_+[^_]+_+'
+
+
+#default mailbox
+source ~/.mutt/gmail.com
diff --git a/qutebrowser/.config/qutebrowser/autoconfig.yml b/qutebrowser/.config/qutebrowser/autoconfig.yml
index 399a94d..e7b017b 100644
--- a/qutebrowser/.config/qutebrowser/autoconfig.yml
+++ b/qutebrowser/.config/qutebrowser/autoconfig.yml
@@ -3,4 +3,11 @@
 
 config_version: 1
 global:
+  bindings.commands:
+    normal:
+      M: hint links spawn mpv {hint-url} --autofit 1120x840
+      gT: tab-prev
+      gt: tab-next
+      m: spawn mpv {url} --autofit 640x480
+      x: tab-close
   zoom.default: '150'
diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py
index ec0d52a..745255a 100644
--- a/qutebrowser/.config/qutebrowser/config.py
+++ b/qutebrowser/.config/qutebrowser/config.py
@@ -9,3 +9,5 @@ config.load_autoconfig()
 config.bind('gt', 'tab-next')
 config.bind('gT', 'tab-prev')
 config.bind('x', 'tab-close')
+
+c.aliases['r'] = 'open'
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 7b574db..90ed13c 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -12,3 +12,6 @@ bind j select-pane -D
 bind k select-pane -U
 bind h select-pane -L
 bind l select-pane -R
+
+
+set -g status-bg magenta
diff --git a/vim/.vim/after/asm.vim b/vim/.vim/after/asm.vim
deleted file mode 100644
index 3202f68..0000000
--- a/vim/.vim/after/asm.vim
+++ /dev/null
@@ -1 +0,0 @@
-set nospell
diff --git a/vim/.vim/after/c.vim b/vim/.vim/after/c.vim
deleted file mode 100644
index d1aafd8..0000000
--- a/vim/.vim/after/c.vim
+++ /dev/null
@@ -1 +0,0 @@
-set tw=0
diff --git a/vim/.vim/after/ftplugin/asm.vim b/vim/.vim/after/ftplugin/asm.vim
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vim/.vim/after/ftplugin/asm.vim
diff --git a/vim/.vim/after/by.vim b/vim/.vim/after/ftplugin/by.vim
index 7f2b61c..7f2b61c 100644
--- a/vim/.vim/after/by.vim
+++ b/vim/.vim/after/ftplugin/by.vim
diff --git a/vim/.vim/after/ftplugin/c.vim b/vim/.vim/after/ftplugin/c.vim
new file mode 100644
index 0000000..736e482
--- /dev/null
+++ b/vim/.vim/after/ftplugin/c.vim
@@ -0,0 +1,2 @@
+set tw=0
+set cindent
diff --git a/vim/.vim/after/ftplugin/go.vim b/vim/.vim/after/ftplugin/go.vim
new file mode 100644
index 0000000..736e482
--- /dev/null
+++ b/vim/.vim/after/ftplugin/go.vim
@@ -0,0 +1,2 @@
+set tw=0
+set cindent
diff --git a/vim/.vim/after/ftplugin/java.vim b/vim/.vim/after/ftplugin/java.vim
new file mode 100644
index 0000000..736e482
--- /dev/null
+++ b/vim/.vim/after/ftplugin/java.vim
@@ -0,0 +1,2 @@
+set tw=0
+set cindent
diff --git a/vim/.vim/after/tex.vim b/vim/.vim/after/ftplugin/tex.vim
index 87f4512..87f4512 100644
--- a/vim/.vim/after/tex.vim
+++ b/vim/.vim/after/ftplugin/tex.vim
diff --git a/vim/.vim/after/tr.vim b/vim/.vim/after/ftplugin/tr.vim
index 87f4512..87f4512 100644
--- a/vim/.vim/after/tr.vim
+++ b/vim/.vim/after/ftplugin/tr.vim
diff --git a/vim/.vim/after/txt.vim b/vim/.vim/after/ftplugin/txt.vim
index 87f4512..7dcafeb 100644
--- a/vim/.vim/after/txt.vim
+++ b/vim/.vim/after/ftplugin/txt.vim
@@ -1 +1,2 @@
 set spell
+set tw=70
diff --git a/vim/.vim/after/go.vim b/vim/.vim/after/go.vim
deleted file mode 100644
index d1aafd8..0000000
--- a/vim/.vim/after/go.vim
+++ /dev/null
@@ -1 +0,0 @@
-set tw=0
diff --git a/vim/.vim/after/java.vim b/vim/.vim/after/java.vim
deleted file mode 100644
index d1aafd8..0000000
--- a/vim/.vim/after/java.vim
+++ /dev/null
@@ -1 +0,0 @@
-set tw=0
diff --git a/vim/.vim/pack/tje/start/wordCount.vim b/vim/.vim/pack/tje/start/wordCount.vim
new file mode 160000
+Subproject c8f8f3cc66270fe0dff7de738280d049632ceae
diff --git a/vim/.vimrc b/vim/.vimrc
index 29c7e9f..9077239 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -6,10 +6,9 @@ set lazyredraw
 set incsearch
 set hlsearch
 set autoindent
-set cindent
 set scrolloff=3
 set spelllang=en
-"set spell
+set spell
 set tw=70
 set ruler
 
@@ -17,8 +16,10 @@ set list
 set listchars=eol:\ ,tab:\|\ ,trail:~,extends:>,precedes:<,space:·
 
 map K i<enter><esc>
+map W <esc>:WordCount<enter>
 
 colorscheme default
 
 au BufRead,BufNewFile *.go set filetype=go
 
+set statusline+=%{WordCount#WordCount()}