summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Holman <dholman@gymli.xyz>2020-10-26 11:26:46 -0500
committerDanny Holman <dholman@gymli.xyz>2020-10-26 11:26:46 -0500
commit2a713a6ab5140fab33e20afd208f62568785b543 (patch)
treec9bce3387d422f0b0c7fd6a4b0313b7742330179
parentfe225497c003f5273a15225c6d0d1bc750497df1 (diff)
General updates
-rw-r--r--.config/i3/config4
-rw-r--r--.mutt/gymli17
-rw-r--r--.mutt/tech17
-rw-r--r--.muttrc27
-rw-r--r--.ssh/config2
-rw-r--r--.vim/cscope.vim53
-rw-r--r--.vimrc16
7 files changed, 115 insertions, 21 deletions
diff --git a/.config/i3/config b/.config/i3/config
index 7df77ba..772a081 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -114,7 +114,7 @@ bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10%
bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10%
# Screenshot
-bindsym $mod+Print exec --no-startup-id scrot
+bindsym $mod+Print exec --no-startup-id "scrot -s"
# System menu
bindsym $mod+Shift+s mode "$mode_system"
@@ -139,7 +139,7 @@ gaps outer 15
# Start helpful programs
exec --no-startup-id wal -s -i "$HOME/Pictures/wal/"
exec --no-startup-id xautolock -time 5 -locker "i3lock -c 000000"
-exec --no-startup-id picom
+exec --no-startup-id picom -cCf -i 1 -m 1
exec --no-startup-id tilda
exec --no-startup-id polybar -r main0
exec --no-startup-id polybar -r main1
diff --git a/.mutt/gymli b/.mutt/gymli
new file mode 100644
index 0000000..04b49c4
--- /dev/null
+++ b/.mutt/gymli
@@ -0,0 +1,17 @@
+## IMAP
+set imap_user = dholman
+set imap_pass = `pass gymli.xyz/mail/dholman`
+set folder = imaps://mail.gymli.xyz
+set spoolfile = +INBOX
+set postponed = +Drafts
+set record = +Sent
+
+## SMTP
+set smtp_url = smtp://$imap_user:$imap_pass@mail.gymli.xyz
+set realname = "Danny Holman"
+set from = $imap_user@gymli.xyz
+set ssl_force_tls = yes
+set ssl_starttls
+
+## Hook
+account-hook $folder "set imap_user=dholman@gymli.xyz imap_pass=`pass gymli.xyz/mail/dholman`"
diff --git a/.mutt/tech b/.mutt/tech
new file mode 100644
index 0000000..1ed6028
--- /dev/null
+++ b/.mutt/tech
@@ -0,0 +1,17 @@
+## IMAP
+set imap_user = dsholman42@students.tntech.edu
+set imap_pass = `pass tntech.edu/dsholman42`
+set folder = imaps://outlook.office365.com
+set spoolfile = +INBOX
+set postponed = +Drafts
+set record = "+Sent Items"
+
+## SMTP
+set smtp_url = smtp://$imap_user:$imap_pass@smtp.office365.com
+set realname = "Danny Holman"
+set from = $imap_user
+set ssl_force_tls = yes
+set ssl_starttls
+
+## Hook
+account-hook $folder "set imap_user=dsholman42@students.tntech.edu imap_pass=`pass tntech.edu/dsholman42`"
diff --git a/.muttrc b/.muttrc
index c95612d..1ab5968 100644
--- a/.muttrc
+++ b/.muttrc
@@ -5,30 +5,19 @@ set sort=threads
set mailcap_path = ~/.mutt/mailcap
alternative_order text/enriched text/plain text/html text
auto_view text/html
-
-# IMAP
-set imap_user=dholman
-set imap_pass=`pass gymli.xyz/mail/dholman`
-set folder=imaps://mail.gymli.xyz
-set spoolfile=+INBOX
-set postponed=+Drafts
-set trash=+Trash
-set imap_check_subscribed
-mailboxes +INBOX
-
set header_cache = "~/.cache/mutt"
set message_cachedir = "~/.cache/mutt"
unset imap_passive
set imap_keepalive = 300
set mail_check = 120
-# SMTP
-set record=+Sent
-set smtp_url=smtp://$imap_user:$imap_pass@mail.gymli.xyz
-set realname=$my_name
-set from=$imap_user@gymli.xyz
-set ssl_force_tls = yes
-set ssl_starttls
+# Tennesee Tech Email
+source "~/.mutt/tech"
+folder-hook $folder 'source ~/.mutt/tech'
+
+# Gymli Email
+source "~/.mutt/gymli"
+folder-hook $folder 'source ~/.mutt/gymli'
# PGP
set pgp_replyencrypt
@@ -48,6 +37,8 @@ bind index _ collapse-all
macro index,pager A <pipe-message>'git am -s' 'Apply patch in git repo'
macro pager \cb <pipe-entry>'urlview'<enter> 'Follow links with urlview'
macro index,pager S ":set confirmappend=no resolve=no\n<clear-flag>N<tag-prefix><save-message>=Spam\n" 'Mark message as read and move into Spam folder'
+macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.mutt/gymli<enter><change-folder>!<enter>
+macro index,pager <f3> '<sync-mailbox><enter-command>source ~/.mutt/tech<enter><change-folder>!<enter>
# Hooks
folder-hook =INBOX 'push "<delete-pattern> ~d>30d\n"'
diff --git a/.ssh/config b/.ssh/config
index 0e9625b..ee12629 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -3,6 +3,8 @@ Host *
ControlMaster auto
ControlPath ~/.ssh/sockets/socket-%r@%h:%p
ControlPersist 1h
+ GSSAPIAuthentication yes
+ GSSAPIDelegateCredentials yes
Host Zeus
HostName www.gymli.xyz
Port 22
diff --git a/.vim/cscope.vim b/.vim/cscope.vim
new file mode 100644
index 0000000..53e4dd9
--- /dev/null
+++ b/.vim/cscope.vim
@@ -0,0 +1,53 @@
+if has("cscope")
+ set cscopetag
+ set csto=0
+ if $CSCOPE_DB != ""
+ cs add $CSCOPE_DB
+ else
+ let dirs = split($PWD, '/')
+ let paths = ['/']
+ for d in dirs
+ let paths = add(paths, paths[len(paths) - 1] . d . '/')
+ endfor
+
+ for d in reverse(paths)
+ let cscope_file = d . "/cscope.out"
+ if filereadable(cscope_file)
+ execute('cs add ' . cscope_file)
+ break
+ endif
+ endfor
+ endif
+
+ set cscopeverbose
+
+ nmap <C-\>s :cs find s <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-\>g :cs find g <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-\>c :cs find c <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-\>t :cs find t <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-\>e :cs find e <C-R>=expand("<cfile>")<CR><CR>
+ nmap <C-\>f :cs find f <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-\>i :cs find i ^<C-R>=expand("<cfile>")<CR>$<CR>
+ nmap <C-\>d :cs find d <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-\>S :cs find t struct <C-R>=expand("<cword>")<CR> {<CR>
+
+ nmap <C-@>s :vert scs find s <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@>g :vert scs find g <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@>c :vert scs find c <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@>t :vert scs find t <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@>e :vert scs find e <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@>f :vert scs find f <C-R>=expand("<cfile>")<CR><CR>
+ nmap <C-@>i :vert scs find i ^<C-R>=expand("<cfile>")<CR>$<CR>
+ nmap <C-@>d :vert scs find d <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@>S :vert scs find t struct <C-R>=expand("<cword>")<CR> {<CR>
+
+ nmap <C-@><C-@>s :scs find s <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@><C-@>g :scs find g <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@><C-@>c :scs find c <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@><C-@>t :scs find t <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@><C-@>e :scs find e <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@><C-@>f :scs find f <C-R>=expand("<cfile>")<CR><CR>
+ nmap <C-@><C-@>i :scs find i ^<C-R>=expand("<cfile>")<CR>$<CR>
+ nmap <C-@><C-@>d :scs find d <C-R>=expand("<cword>")<CR><CR>
+ nmap <C-@><C-@>S :scs find t struct <C-R>=expand("<cword>")<CR> {<CR>
+endif
diff --git a/.vimrc b/.vimrc
index 86f383d..6138962 100644
--- a/.vimrc
+++ b/.vimrc
@@ -65,6 +65,8 @@ set splitright
" NERDTree stuffs
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
+let g:NERDTreeDirArrowExpandable = ''
+let g:NERDTreeDirArrowCollapsible = ''
let NERDTreeIgnore = ['\.o$','\.so$','\.class$','\.png$','\.jpg$']
" Completion
@@ -78,6 +80,18 @@ set wildignore+=vendor/cache/**
set wildignore+=log/**
set wildignore+=tmp/**
set wildignore+=*.png,*.jpeg,*.gif
+set wildignore+=*/tmp/*,*.so,*.swp,*.zip
+
+" Ctrlp
+let g:ctrlp_map = '<c-p>'
+let g:ctrlp_cmd = 'CtrlP'
+let g:ctrlp_working_path_mode = 'ra'
+let g:ctrlp_user_command = 'find %s -type f'
+let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
+let g:ctrlp_custom_ignore = {
+ \'dir': '\v[\/]\.(git|hg|svn)$',
+ \'file': '\v\.(exe|so|dll)$',
+ \ }
" Scrolling
set scrolloff=8
@@ -101,11 +115,11 @@ vno <Left> <Nop>
vno <Right> <Nop>
vno <Delete> <Nop>
nmap <Leader>s :source ~/.vimrc<CR>
+vnoremap <C-X> <Esc>`.``gvP``P
nnoremap <C-J> <C-W><C-J>
nnoremap <C-K> <C-W><C-K>
nnoremap <C-L> <C-W><C-L>
nnoremap <C-H> <C-W><C-H>
-nnoremap <silent> <Leader>b :TagbarToggle<CR>
nnoremap <silent> <Leader>n :NERDTreeToggle<CR>
nnoremap <silent> <Leader>c :silent !ctags -R .<CR><C-L>
nnoremap <silent> <Leader>t :tag