mutt/msmtp/mbsync setting for multiple accounts

Also made minor changes to other configs.
Added .gitignore for qutebrowser file

11 files changed, 257 insertions, 43 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index c5d7852..2dd8f61 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -7,7 +7,7 @@ source ~/.pass_completion
 [[ $- != *i* ]] && return
 
 alias ls='ls --color=auto'
-alias ll='ls -la'
+alias ll='ls -laF'
 alias school='cd /home/tje/Documents/landmark'
 alias embed='school && cd CS2771'
 alias os='school && cd CS3871'
@@ -19,7 +19,11 @@ alias art='school && cd HIS1031'
 alias xcopy='xclip -selection clipboard'
 alias xpaste='xclip -selection clipboard -o'
 
+alias sloc='sloccount'
+
 PS1='[\u@\h \W]\$ '
 
+export GPG_TTY=$(tty)
+
 MAIL=/var/spool/mail/tje && export MAIL
 export EDITOR=vi
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index f18f5fc..b069769 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -30,7 +30,7 @@ font pango:Courier Prime 14
 floating_modifier $mod
 
 # start a terminal
- bindsym $mod+Return exec uxterm
+ bindsym $mod+Return exec xterm tmux
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -187,5 +187,5 @@ bindsym XF86AudioPrev exec playerctl previous
 exec --no-startup-id synclient NaturalScrolling=1  VertScrollDelta=-113
 exec --no-startup-id /home/tje/i3-battery-popup -N
 
-bindsym $mod+b exec firefox
-
+bindsym $mod+b exec qutebrowser
+bindsym $mod+p exec passmenu
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
deleted file mode 100644
index 399a94d..0000000
--- a/qutebrowser/.config/qutebrowser/autoconfig.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# DO NOT edit this file by hand, qutebrowser will overwrite it.
-# Instead, create a config.py - see :help for details.
-
-config_version: 1
-global:
-  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'