aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkatherine <shmibs@shmibbles.me>2018-03-23 01:02:37 -0700
committerkatherine <shmibs@shmibbles.me>2018-03-23 01:02:37 -0700
commitc1ae87dad90093c1ba5a4c9d4d5e3a1579335c21 (patch)
treea0deb204b7b0a73380c84aad9474a10686add28c
parent9292bc1c6bb5ab1bc4f2b67d43c6709859506392 (diff)
parent3cd47f896413887fe6abad014d22d9f60173278b (diff)
downloaddotfiles-c1ae87dad90093c1ba5a4c9d4d5e3a1579335c21.tar.gz
Merge branch 'master' of github.com:shmibs/dotfiles
-rw-r--r--.muttrc46
-rw-r--r--.vimrc15
2 files changed, 49 insertions, 12 deletions
diff --git a/.muttrc b/.muttrc
index 357c56a..5f23ced 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,4 +1,7 @@
-# settings
+############
+# settings #
+############
+
set sort=threads
set strict_threads=yes
@@ -9,22 +12,45 @@ source ~/.mail_aliases
alternative_order text/plain text/html
auto_view text/html
-# mappings
-bind index \Cu half-up
-bind index \Cd half-down
+set menu_scroll
+
+set send_charset="utf-8"
+set content_type="text/plain; charset=UTF-8"
+
+my_hdr X-Operating-System: `uname -sr`
+
+############
+# mappings #
+############
+
+bind attach,index,pager \Cu half-up
+bind attach,index,pager \Cd half-down
bind index \Cb previous-page
bind index \Cf next-page
-bind index D delete-thread
-bind index U undelete-thread
+bind index,pager D delete-thread
+bind index,pager U undelete-thread
+
+bind pager g top
+bind pager G bottom
+
+bind attach,index g first-entry
+bind attach,index G last-entry
+
+bind index l display-message
+
+bind index H top-page
+bind index L bottom-page
+
+bind index \Cg group-reply
+bind index R list-reply
-bind index g first-entry
-bind index G last-entry
-bind index \cg group-reply
+###########
+# colours #
+###########
-# colours
color attachment brightmagenta default
color error brightred default
color hdrdefault red default
diff --git a/.vimrc b/.vimrc
index 658a5bc..486664b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -149,8 +149,8 @@ set title
set spelllang=en_gb
"visual marker for overflowing the 80th column
-highlight Column81 ctermbg=8
-call matchadd('Column81', '\%81v', 100)
+highlight Overwide ctermbg=8
+call matchadd('Overwide', '\%81v', 100)
"highlight space before tab
highlight SpaceBeforeTab ctermbg=red
@@ -160,6 +160,9 @@ call matchadd('SpaceBeforeTab', '\ \t')
"that neovim sets as default
set nohlsearch
+set encoding=utf-8
+set fileencoding=utf-8
+
"""""""""""""
" ALIASES "
@@ -254,6 +257,7 @@ autocmd FileType haskell call Settings_haskell()
autocmd FileType html call Settings_html()
autocmd FileType xhtml call Settings_html()
autocmd FileType make call Settings_script()
+autocmd FileType mail call Settings_mail()
autocmd FileType markdown call Settings_markdown()
autocmd FileType matlab call Settings_matlab()
autocmd FileType mips call Settings_mips()
@@ -385,6 +389,13 @@ function! Settings_markdown()
nnoremap <buffer> <Leader>w :call Settings_sub_wmodetoggle()<CR>
endfunction
+function! Settings_mail()
+ "settings
+ setlocal spell
+ "mappings
+ nnoremap <buffer> <Leader>w :call Settings_sub_wmodetoggle()<CR>
+endfunction
+
function! Settings_matlab()
"settings
setlocal shiftwidth=4