Several updates!

caf201ad891fc58c4abf232ddb476366ccf33525
Alexis Sellier committed ago 1 parent 52fb8204
.config/kitty/kitty.conf +3 -3
1 1
font_family               Victor Mono SemiBold
2 2
bold_font                 Victor Mono Bold
3 -
italic_font               Victor Mono SemiBold Italic
4 -
bold_italic_font          Victor Mono Bold Italic
5 -
font_size                 14.0
3 +
italic_font               Victor Mono SemiBold
4 +
bold_italic_font          Victor Mono Bold
5 +
font_size                 13.0
6 6
adjust_line_height       -3
7 7
enable_audio_bell         no
8 8
9 9
scrollback_lines          8192
10 10
input_delay               8
.ghci +1 -1
1 1
2 -
:set prompt "\ESC[0;34m> \ESC[m"
2 +
:set prompt "\ESC[0;34m>> \ESC[m"
3 3
:set prompt-cont "\ESC[0;34m| \ESC[m"
4 4
:set +m
5 5
:set -fbyte-code
6 6
:def hoogle \x -> pure $ ":!hoogle --color        \"" ++ x ++ "\""
7 7
:def doc    \x -> pure $ ":!hoogle --color --info \"" ++ x ++ "\""
.vimrc +7 -4
48 48
set virtualedit=block
49 49
set tags+=.tags
50 50
set tags+=codex.tags
51 51
set undofile
52 52
set gdefault                        " Always use /g with %s/
53 -
set colorcolumn=100
53 +
set colorcolumn=80
54 54
set list
55 55
set listchars=tab:·\ ,eol:¬,trail:█
56 56
set fillchars=diff:\ ,vert:│
57 57
set diffopt=filler,vertical,foldcolumn:0
58 58
set statusline=%<%f\ (%{gitbranch#name()})\ %h%m%r%=%y\ \ %-14(%{&sw}:%{&sts}:%{&ts}%)%-14.(%l,%c%V%)\ %P
90 90
" Markdown
91 91
let g:vim_markdown_auto_insert_bullets = 0
92 92
let g:vim_markdown_new_list_item_indent = 2
93 93
let g:vim_markdown_no_default_key_mappings = 1
94 94
95 +
" Latex
96 +
let g:vimtex_quickfix_mode = 0
97 +
95 98
" inccommand
96 99
if has("nvim")
97 100
  set inccommand=nosplit
98 101
endif
99 102
113 116
au FileType c,cpp,glsl  setlocal number ts=8  sw=8 noexpandtab
114 117
au FileType lua         setlocal number       sw=2 expandtab
115 118
au FileType sh,zsh      setlocal number sts=2 sw=2 expandtab
116 119
au FileType vim,ruby    setlocal number sts=2 sw=2 expandtab
117 120
au FileType help        setlocal number ts=4  sw=4 noexpandtab
118 -
au FileType rust        setlocal number signcolumn=yes nowrap
121 +
au FileType rust        setlocal number signcolumn=yes nowrap colorcolumn=100 textwidth=100
119 122
au FileType plain       setlocal nonumber noai nocin nosi inde= wrap linebreak textwidth=80
120 123
au FileType pandoc      setlocal nonumber
121 124
au FileType markdown    setlocal nonumber conceallevel=2
122 125
au FileType rst         setlocal nonumber sw=2 expandtab wrap linebreak textwidth=80
123 126
au FileType fountain    setlocal nonumber noai nocin nosi inde= wrap linebreak
126 129
au BufRead,BufNewFile *.md        setf markdown
127 130
au BufRead,BufNewFile *.tex       setf tex
128 131
au BufRead,BufNewFile *.todo      setf todo
129 132
au BufRead,BufNewFile *.tikz      setf tex
130 133
au BufRead,BufNewFile *.toml      setf toml
134 +
au BufRead,BufNewFile *.rs        setf rust
131 135
132 136
" If no file-type is detected, set to plain.
133 137
autocmd BufEnter * if &filetype == "" | setlocal ft=plain | endif
134 138
135 139
let c_no_curly_error = 1
317 321
  Plug 'hail2u/vim-css3-syntax'
318 322
  Plug 'lervag/vimtex'
319 323
  Plug 'vim-scripts/gnupg.vim'
320 324
  Plug 'itchyny/vim-gitbranch'
321 325
  Plug 'cespare/vim-toml'
322 -
  Plug 'rust-lang/rust.vim', { 'for': ['rust'] }
326 +
  Plug 'rust-lang/rust.vim'
323 327
  Plug 'neoclide/coc.nvim', {'branch': 'release', 'for': ['rust'] }
324 328
325 329
  call plug#end()
326 330
endif
327 331
361 365
if has("nvim")
362 366
  " Make sure we dont' load the rust cargo plugin from rust.vim!
363 367
  let g:loaded_rust_vim_plugin_cargo = 1
364 368
  " Don't add errors to quickfix if rustfmt fails.
365 369
  let g:rustfmt_fail_silently = 1
366 -
  autocmd BufWritePre *.rs :RustFmt
367 370
endif
368 371
369 372
" coc.vim
370 373
function! SetupCoc()
371 374
  nmap <silent> gd           <Plug>(coc-definition)