@@ -1,9 +1,9 @@ 
-[c3f]
-source            = imaps://j3s@mail.c3f.net:993
+[Personal]
+source            = imaps://j3s@c3f.net@imap.migadu.com
 source-cred-cmd   = pash show c3f
-outgoing          = smtp+plain://j3s@mail.c3f.net:587
+outgoing          = smtps+plain://j3s@c3f.net@smtp.migadu.com
 outgoing-cred-cmd = pash show c3f
 default           = INBOX
-smtp-starttls     = yes
-from              = j3s <j3s@c3f.net>
+from              = Jes <j3s@c3f.net>
 copy-to           = Sent
+

@@ -31,8 +31,8 @@ [user]
 	name = j3s
 	email = j3s@c3f.net
 [sendemail]
-	smtpserver = mail.c3f.net
-	smtpuser = j3s
+	smtpserver = smtp.migadu.com
+	smtpuser = j3s@c3f.net
 	smtpencryption = tls
 	smtpserverport = 587
 	annotate = yes

@@ -2,13 +2,16 @@ export ENV=~/.shinit
 
 export PATH="$HOME/bin:$PATH"
 alias vi=nvim
-alias startx='x'
+alias startx='ssh-agent startx'
 
 export ENV=~/.shinit
 
 if [ "$(uname -s)" != "Darwin" ]; then
-  read -rp "start X?" && [ -z "$DISPLAY" ] && {
-    export DISPLAY=:0
-    x
-  }
+  if [ -z "$DISPLAY" ]; then
+    printf "start X?"
+    read -r && {
+      export DISPLAY=:0
+      startx
+    }
+  fi
 fi

@@ -1,63 +1,181 @@ 
-syntax on
-colors patine
-set list lcs=tab:▸\ ,trail:·,nbsp:_
+set nocompatible
+filetype off
 
-" weird defaults
-set expandtab
-set autoindent
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+" Bundles
+" Actual plugins
+Plugin 'VundleVim/Vundle.vim'
+Plugin 'tpope/vim-fugitive'
+Plugin 'kien/ctrlp.vim'
+Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-repeat'
+Plugin 'editorconfig/editorconfig-vim'
+Plugin 'gerw/vim-HiLinkTrace'
+" Meta plugins
+Plugin 'vim-scripts/ingo-library'
+Plugin 'vim-scripts/SyntaxRange'
+" Syntax highlighting
+Plugin 'plasticboy/vim-markdown'
+Plugin 'cespare/vim-toml'
+Plugin 'rust-lang/rust.vim'
+Plugin 'mxw/vim-jsx'
+Plugin 'pangloss/vim-javascript'
+Plugin 'kchmck/vim-coffee-script'
+Plugin 'google/vim-jsonnet'
+Plugin 'sirtaj/vim-openscad'
+Plugin 'leafgarland/typescript-vim'
+Plugin 'beyondmarc/glsl.vim'
+Plugin 'vim-scripts/scons.vim'
+Plugin 'calviken/vim-gdscript3'
+Plugin 'wannesm/wmgraphviz.vim'
+Plugin 'sotte/presenting.vim'
+Plugin 'ziglang/zig.vim'
+Plugin 'gpanders/vim-scdoc'
+" /Bundles
+
+call vundle#end()
+
+filetype plugin indent on
+
+set laststatus=2
+set t_Co=256
+
+let g:vim_markdown_folding_disabled=1
+let g:vim_markdown_frontmatter=1
+let g:jsx_ext_required = 0
+
+set encoding=utf-8
 set tabstop=4
 set shiftwidth=4
-set scrolloff=10
-set hlsearch
+set autoindent
+set magic " unbreak vim's regex implementation
+
+set number
+set scrolloff=3
+set sidescroll=3
+
+set ruler
+set cc=80
+set nowrap
+
+set ignorecase
 set smartcase
-set timeoutlen=1000 ttimeoutlen=0 " esc is immediate
-set t_Co=256 " it's 2019 ffs
-set backspace=indent,eol,start
-set wildmode=longest,list,full
-map <F1> <Esc>
-imap <F1> <Esc>
 
-" Protect changes between writes. Default values of
-" updatecount (200 keystrokes) and updatetime
-" (4 seconds) are fine
-set swapfile
-set directory^=~/.vim/swap//
+set splitbelow
+set hidden
+set notimeout
 
-" protect against crash-during-write
-set writebackup
-" but do not persist backup after successful write
-set nobackup
-" use rename-and-write-new method whenever safe
-set backupcopy=auto
-" patch required to honor double slash at end
-set backupdir^=~/.vim/backup//
+" Search as you type, highlight results
+set incsearch
+set showmatch
+set hlsearch
 
-" persist the undo tree for each file
-set undofile
-set undodir^=~/.vim/undo//
+" eff mouz
+set mouse=a
 
-" quickfix shortcuts
-nmap ]q :cnext<cr>
-nmap ]Q :clast<cr>
-nmap [q :cprev<cr>
-nmap [Q :cfirst<cr>
+" Don't litter swp files everywhere
+set backupdir=~/.cache
+set directory=~/.cache
 
-" shortcutz
-nnoremap <CR> :nohlsearch<CR><CR> " enter clears hl
-map <silent> <F4> :make<cr><cr><cr> " make all the things
-set pastetoggle=<C-p> " control+p to toggle pasting
+set nofoldenable
+set lazyredraw
 
-" mail
-autocmd FileType mail setlocal tw=72 spell spelllang=en
+set tags=./tags;
 
-" markdown
-autocmd FileType markdown setlocal noruler spell spelllang=en
+set printheader=\
 
-" ruby
-autocmd FileType ruby setlocal ts=8 sw=2 sts=2
+syntax on
+let mapleader = "\<space>"
+nnoremap \\ :noh<cr> " Clear higlighting
+nnoremap <silent> <F5> :let _s=@/<Bar>:%s/\s\+$//e<Bar>:let @/=_s<Bar>:nohl<CR> " Trim trailing spaces
+nnoremap Y y$
+nnoremap cc :center<cr>
+inoremap <C-c> <ESC>
+" Ex mode is fucking dumb
+nnoremap Q <Nop>
 
-" yaml
-autocmd FileType yaml setlocal ts=2 sts=2 sw=2
+command Jp e ++enc=euc-jp
 
-" golang
-autocmd FileType go setlocal noexpandtab
+" Preferences for various file formats
+autocmd FileType c setlocal noet ts=4 sw=4 tw=80
+autocmd FileType h setlocal noet ts=4 sw=4 tw=80
+autocmd FileType cpp setlocal noet ts=4 sw=4 tw=80
+autocmd FileType s setlocal noet ts=4 sw=4
+autocmd FileType go setlocal noet ts=4 sw=4
+autocmd FileType hy setlocal filetype=lisp
+autocmd FileType sh setlocal noet ts=4 sw=4
+autocmd BufRead,BufNewFile *.js setlocal et ts=2 sw=2
+autocmd FileType html setlocal et ts=2 sw=2
+autocmd FileType htmldjango setlocal et ts=2 sw=2
+autocmd FileType ruby setlocal et ts=2 sw=2
+autocmd FileType scss setlocal et ts=2 sw=2
+autocmd FileType yaml setlocal et ts=2 sw=2
+autocmd FileType markdown setlocal tw=80 et ts=2 sw=2
+autocmd FileType text setlocal tw=80
+autocmd FileType meson setlocal noet ts=2 sw=2
+autocmd FileType bzl setlocal et ts=2 sw=2
+autocmd FileType typescript setlocal et ts=2 sw=2
+autocmd FileType python setlocal et ts=4 sw=4
+autocmd BufNewFile,BufRead *.ms set syntax=python ts=4 sw=4 noet
+autocmd FileType tex hi Error ctermbg=NONE
+autocmd FileType mail setlocal noautoindent
+augroup filetypedetect
+  autocmd BufRead,BufNewFile *mutt-*              setfiletype mail
+augroup filetypedetect
+  autocmd BufRead,BufNewFile *qutebrowser-editor-* set ts=4 sw=4 et
+autocmd BufNewFile,BufRead * if expand('%:t') == 'APKBUILD' | set ft=sh | endif
+autocmd BufNewFile,BufRead * if expand('%:t') == 'PKGBUILD' | set ft=sh | endif
+
+set guioptions-=m
+set guioptions-=T
+set guioptions-=r
+set guioptions-=e
+
+nmap <leader>l :set list!<CR>
+set listchars=tab:▸\ ,eol:¬,space:.
+
+syntax enable
+colorscheme ron
+highlight Search ctermbg=12
+highlight NonText ctermfg=darkgrey
+highlight SpecialKey ctermfg=darkgrey
+highlight clear SignColumn
+highlight Comment cterm=bold ctermfg=none
+highlight StatusLine cterm=none ctermbg=none ctermfg=darkgrey
+highlight StatusLineNC cterm=none ctermbg=none ctermfg=darkgrey
+highlight Title cterm=none ctermfg=darkgrey
+highlight TabLineFill cterm=none
+highlight TabLine cterm=none ctermfg=darkgrey ctermbg=none
+highlight ColorColumn ctermbg=darkgrey guibg=lightgrey
+highlight jsParensError ctermbg=NONE
+highlight Todo ctermbg=NONE ctermfg=red cterm=bold
+highlight PreProc ctermfg=grey
+highlight String ctermfg=darkblue cterm=italic
+highlight Type ctermfg=darkblue
+highlight lineNr ctermfg=grey cterm=italic
+highlight cIncluded ctermfg=NONE cterm=bold
+highlight pythonInclude ctermfg=blue
+highlight pythonConditional ctermfg=darkcyan
+highlight pythonBuiltin ctermfg=darkcyan
+highlight Pmenu ctermbg=white ctermfg=black
+highlight PmenuSel ctermbg=darkcyan ctermfg=black
+
+" Transparent editing of gpg encrypted files.
+" By Wouter Hanegraaff
+augroup encrypted
+  au!
+  autocmd BufReadPre,FileReadPre *.gpg set viminfo=
+  autocmd BufReadPre,FileReadPre *.gpg set noswapfile noundofile nobackup
+  autocmd BufReadPre,FileReadPre *.gpg set bin
+  autocmd BufReadPre,FileReadPre *.gpg let ch_save = &ch|set ch=2
+  autocmd BufReadPost,FileReadPost *.gpg '[,']!gpg --decrypt 2> /dev/null
+  autocmd BufReadPost,FileReadPost *.gpg set nobin
+  autocmd BufReadPost,FileReadPost *.gpg let &ch = ch_save|unlet ch_save
+  autocmd BufReadPost,FileReadPost *.gpg execute ":doautocmd BufReadPost " . expand("%:r")
+  autocmd BufWritePre,FileWritePre *.gpg '[,']!gpg --default-recipient-self -ae 2>/dev/null
+  autocmd BufWritePost,FileWritePost *.gpg u
+augroup END
+
+let g:presenting_top_margin = 2

@@ -1,5 +1,9 @@ 
 #!/bin/sh
 
-bud ~/pix/wallpapers
+bud ~/Pictures/wallpapers
 setxkbmap -layout us -option ctrl:nocaps
-exec sowm
+#exec sowm
+
+2bwm &
+
+exec st

@@ -1,5 +0,0 @@ 
-#!/bin/sh
-#
-# start x with some custom configz
-
-ssh-agent startx