my dotz
IMPORTANT UPDATES
author
j3s
date
(May 22, 2020, 2:16 PM -0500)
commit
c0ce2401
c0ce2401f2b9d5064799cc0481d89e2b722df0e8
parent
f5d86dc4
f5d86dc42eb5dfe9c768e0ab3a49e0f2f156df88
+188
-68
+5
-5
.config/aerc/accounts.conf
+5
-5
.config/aerc/accounts.conf
···
1
-
[c3f]
2
-
source = imaps://j3s@mail.c3f.net:993
1
+
[Personal]
2
+
source = imaps://j3s@c3f.net@imap.migadu.com
3
3
source-cred-cmd = pash show c3f
4
-
outgoing = smtp+plain://j3s@mail.c3f.net:587
4
+
outgoing = smtps+plain://j3s@c3f.net@smtp.migadu.com
5
5
outgoing-cred-cmd = pash show c3f
6
6
default = INBOX
7
-
smtp-starttls = yes
8
-
from = j3s <j3s@c3f.net>
7
+
from = Jes <j3s@c3f.net>
9
8
copy-to = Sent
9
+
+2
-2
.config/git/config
+2
-2
.config/git/config
+8
-5
.profile
+8
-5
.profile
···
2
2
3
3
export PATH="$HOME/bin:$PATH"
4
4
alias vi=nvim
5
-
alias startx='x'
5
+
alias startx='ssh-agent startx'
6
6
7
7
export ENV=~/.shinit
8
8
9
9
if [ "$(uname -s)" != "Darwin" ]; then
10
-
read -rp "start X?" && [ -z "$DISPLAY" ] && {
11
-
export DISPLAY=:0
12
-
x
13
-
}
10
+
if [ -z "$DISPLAY" ]; then
11
+
printf "start X?"
12
+
read -r && {
13
+
export DISPLAY=:0
14
+
startx
15
+
}
16
+
fi
14
17
fi
+167
-49
.vimrc
+167
-49
.vimrc
···
1
-
syntax on
2
-
colors patine
3
-
set list lcs=tab:▸\ ,trail:·,nbsp:_
1
+
set nocompatible
2
+
filetype off
4
3
5
-
" weird defaults
6
-
set expandtab
7
-
set autoindent
4
+
set rtp+=~/.vim/bundle/Vundle.vim
5
+
call vundle#begin()
6
+
7
+
" Bundles
8
+
" Actual plugins
9
+
Plugin 'VundleVim/Vundle.vim'
10
+
Plugin 'tpope/vim-fugitive'
11
+
Plugin 'kien/ctrlp.vim'
12
+
Plugin 'tpope/vim-surround'
13
+
Plugin 'tpope/vim-repeat'
14
+
Plugin 'editorconfig/editorconfig-vim'
15
+
Plugin 'gerw/vim-HiLinkTrace'
16
+
" Meta plugins
17
+
Plugin 'vim-scripts/ingo-library'
18
+
Plugin 'vim-scripts/SyntaxRange'
19
+
" Syntax highlighting
20
+
Plugin 'plasticboy/vim-markdown'
21
+
Plugin 'cespare/vim-toml'
22
+
Plugin 'rust-lang/rust.vim'
23
+
Plugin 'mxw/vim-jsx'
24
+
Plugin 'pangloss/vim-javascript'
25
+
Plugin 'kchmck/vim-coffee-script'
26
+
Plugin 'google/vim-jsonnet'
27
+
Plugin 'sirtaj/vim-openscad'
28
+
Plugin 'leafgarland/typescript-vim'
29
+
Plugin 'beyondmarc/glsl.vim'
30
+
Plugin 'vim-scripts/scons.vim'
31
+
Plugin 'calviken/vim-gdscript3'
32
+
Plugin 'wannesm/wmgraphviz.vim'
33
+
Plugin 'sotte/presenting.vim'
34
+
Plugin 'ziglang/zig.vim'
35
+
Plugin 'gpanders/vim-scdoc'
36
+
" /Bundles
37
+
38
+
call vundle#end()
39
+
40
+
filetype plugin indent on
41
+
42
+
set laststatus=2
43
+
set t_Co=256
44
+
45
+
let g:vim_markdown_folding_disabled=1
46
+
let g:vim_markdown_frontmatter=1
47
+
let g:jsx_ext_required = 0
48
+
49
+
set encoding=utf-8
8
50
set tabstop=4
9
51
set shiftwidth=4
10
-
set scrolloff=10
11
-
set hlsearch
52
+
set autoindent
53
+
set magic " unbreak vim's regex implementation
54
+
55
+
set number
56
+
set scrolloff=3
57
+
set sidescroll=3
58
+
59
+
set ruler
60
+
set cc=80
61
+
set nowrap
62
+
63
+
set ignorecase
12
64
set smartcase
13
-
set timeoutlen=1000 ttimeoutlen=0 " esc is immediate
14
-
set t_Co=256 " it's 2019 ffs
15
-
set backspace=indent,eol,start
16
-
set wildmode=longest,list,full
17
-
map <F1> <Esc>
18
-
imap <F1> <Esc>
19
65
20
-
" Protect changes between writes. Default values of
21
-
" updatecount (200 keystrokes) and updatetime
22
-
" (4 seconds) are fine
23
-
set swapfile
24
-
set directory^=~/.vim/swap//
66
+
set splitbelow
67
+
set hidden
68
+
set notimeout
25
69
26
-
" protect against crash-during-write
27
-
set writebackup
28
-
" but do not persist backup after successful write
29
-
set nobackup
30
-
" use rename-and-write-new method whenever safe
31
-
set backupcopy=auto
32
-
" patch required to honor double slash at end
33
-
set backupdir^=~/.vim/backup//
70
+
" Search as you type, highlight results
71
+
set incsearch
72
+
set showmatch
73
+
set hlsearch
34
74
35
-
" persist the undo tree for each file
36
-
set undofile
37
-
set undodir^=~/.vim/undo//
75
+
" eff mouz
76
+
set mouse=a
38
77
39
-
" quickfix shortcuts
40
-
nmap ]q :cnext<cr>
41
-
nmap ]Q :clast<cr>
42
-
nmap [q :cprev<cr>
43
-
nmap [Q :cfirst<cr>
78
+
" Don't litter swp files everywhere
79
+
set backupdir=~/.cache
80
+
set directory=~/.cache
44
81
45
-
" shortcutz
46
-
nnoremap <CR> :nohlsearch<CR><CR> " enter clears hl
47
-
map <silent> <F4> :make<cr><cr><cr> " make all the things
48
-
set pastetoggle=<C-p> " control+p to toggle pasting
82
+
set nofoldenable
83
+
set lazyredraw
49
84
50
-
" mail
51
-
autocmd FileType mail setlocal tw=72 spell spelllang=en
85
+
set tags=./tags;
52
86
53
-
" markdown
54
-
autocmd FileType markdown setlocal noruler spell spelllang=en
87
+
set printheader=\
55
88
56
-
" ruby
57
-
autocmd FileType ruby setlocal ts=8 sw=2 sts=2
89
+
syntax on
90
+
let mapleader = "\<space>"
91
+
nnoremap \\ :noh<cr> " Clear higlighting
92
+
nnoremap <silent> <F5> :let _s=@/<Bar>:%s/\s\+$//e<Bar>:let @/=_s<Bar>:nohl<CR> " Trim trailing spaces
93
+
nnoremap Y y$
94
+
nnoremap cc :center<cr>
95
+
inoremap <C-c> <ESC>
96
+
" Ex mode is fucking dumb
97
+
nnoremap Q <Nop>
58
98
59
-
" yaml
60
-
autocmd FileType yaml setlocal ts=2 sts=2 sw=2
99
+
command Jp e ++enc=euc-jp
61
100
62
-
" golang
63
-
autocmd FileType go setlocal noexpandtab
101
+
" Preferences for various file formats
102
+
autocmd FileType c setlocal noet ts=4 sw=4 tw=80
103
+
autocmd FileType h setlocal noet ts=4 sw=4 tw=80
104
+
autocmd FileType cpp setlocal noet ts=4 sw=4 tw=80
105
+
autocmd FileType s setlocal noet ts=4 sw=4
106
+
autocmd FileType go setlocal noet ts=4 sw=4
107
+
autocmd FileType hy setlocal filetype=lisp
108
+
autocmd FileType sh setlocal noet ts=4 sw=4
109
+
autocmd BufRead,BufNewFile *.js setlocal et ts=2 sw=2
110
+
autocmd FileType html setlocal et ts=2 sw=2
111
+
autocmd FileType htmldjango setlocal et ts=2 sw=2
112
+
autocmd FileType ruby setlocal et ts=2 sw=2
113
+
autocmd FileType scss setlocal et ts=2 sw=2
114
+
autocmd FileType yaml setlocal et ts=2 sw=2
115
+
autocmd FileType markdown setlocal tw=80 et ts=2 sw=2
116
+
autocmd FileType text setlocal tw=80
117
+
autocmd FileType meson setlocal noet ts=2 sw=2
118
+
autocmd FileType bzl setlocal et ts=2 sw=2
119
+
autocmd FileType typescript setlocal et ts=2 sw=2
120
+
autocmd FileType python setlocal et ts=4 sw=4
121
+
autocmd BufNewFile,BufRead *.ms set syntax=python ts=4 sw=4 noet
122
+
autocmd FileType tex hi Error ctermbg=NONE
123
+
autocmd FileType mail setlocal noautoindent
124
+
augroup filetypedetect
125
+
autocmd BufRead,BufNewFile *mutt-* setfiletype mail
126
+
augroup filetypedetect
127
+
autocmd BufRead,BufNewFile *qutebrowser-editor-* set ts=4 sw=4 et
128
+
autocmd BufNewFile,BufRead * if expand('%:t') == 'APKBUILD' | set ft=sh | endif
129
+
autocmd BufNewFile,BufRead * if expand('%:t') == 'PKGBUILD' | set ft=sh | endif
130
+
131
+
set guioptions-=m
132
+
set guioptions-=T
133
+
set guioptions-=r
134
+
set guioptions-=e
135
+
136
+
nmap <leader>l :set list!<CR>
137
+
set listchars=tab:▸\ ,eol:¬,space:.
138
+
139
+
syntax enable
140
+
colorscheme ron
141
+
highlight Search ctermbg=12
142
+
highlight NonText ctermfg=darkgrey
143
+
highlight SpecialKey ctermfg=darkgrey
144
+
highlight clear SignColumn
145
+
highlight Comment cterm=bold ctermfg=none
146
+
highlight StatusLine cterm=none ctermbg=none ctermfg=darkgrey
147
+
highlight StatusLineNC cterm=none ctermbg=none ctermfg=darkgrey
148
+
highlight Title cterm=none ctermfg=darkgrey
149
+
highlight TabLineFill cterm=none
150
+
highlight TabLine cterm=none ctermfg=darkgrey ctermbg=none
151
+
highlight ColorColumn ctermbg=darkgrey guibg=lightgrey
152
+
highlight jsParensError ctermbg=NONE
153
+
highlight Todo ctermbg=NONE ctermfg=red cterm=bold
154
+
highlight PreProc ctermfg=grey
155
+
highlight String ctermfg=darkblue cterm=italic
156
+
highlight Type ctermfg=darkblue
157
+
highlight lineNr ctermfg=grey cterm=italic
158
+
highlight cIncluded ctermfg=NONE cterm=bold
159
+
highlight pythonInclude ctermfg=blue
160
+
highlight pythonConditional ctermfg=darkcyan
161
+
highlight pythonBuiltin ctermfg=darkcyan
162
+
highlight Pmenu ctermbg=white ctermfg=black
163
+
highlight PmenuSel ctermbg=darkcyan ctermfg=black
164
+
165
+
" Transparent editing of gpg encrypted files.
166
+
" By Wouter Hanegraaff
167
+
augroup encrypted
168
+
au!
169
+
autocmd BufReadPre,FileReadPre *.gpg set viminfo=
170
+
autocmd BufReadPre,FileReadPre *.gpg set noswapfile noundofile nobackup
171
+
autocmd BufReadPre,FileReadPre *.gpg set bin
172
+
autocmd BufReadPre,FileReadPre *.gpg let ch_save = &ch|set ch=2
173
+
autocmd BufReadPost,FileReadPost *.gpg '[,']!gpg --decrypt 2> /dev/null
174
+
autocmd BufReadPost,FileReadPost *.gpg set nobin
175
+
autocmd BufReadPost,FileReadPost *.gpg let &ch = ch_save|unlet ch_save
176
+
autocmd BufReadPost,FileReadPost *.gpg execute ":doautocmd BufReadPost " . expand("%:r")
177
+
autocmd BufWritePre,FileWritePre *.gpg '[,']!gpg --default-recipient-self -ae 2>/dev/null
178
+
autocmd BufWritePost,FileWritePost *.gpg u
179
+
augroup END
180
+
181
+
let g:presenting_top_margin = 2
+6
-2
.xinitrc
+6
-2
.xinitrc