b2adc29900245d9b997870cf039575744c51b774
- Author
- Pavle Portic <git@theedgeofrage.com>
- Committer
- Pavle Portic <git@theedgeofrage.com>
- Date
Message
Diff
This diff is truncated to protect this page.
1diff --git a/dot_spacevim b/dot_spacevim
2index 6d14f25103709efbc4ecbe6b549f23aa9f370c09..5efa87e55415ed2d76d58cfca1b4c206622b9fc0 100644
3--- a/dot_spacevim
4+++ b/dot_spacevim
5@@ -3,12 +3,16 @@
6 " e.g., Layer 'better-defaults', { 'exclude': 'itchyny/vim-cursorword' }
7 function! Layers()
8 let g:spacevim_lsp_engine = 'coc'
9+ let g:spacevim_speed_up_via_timer = 0
10+ let g:spacevim_enable_startify = 0
11+
12+ " Polyglot configuration
13+ let g:polyglot_disabled = ['systemd']
14
15 Layer 'airline'
16 Layer 'better-defaults', {'exclude': [
17 \ 'kshenoy/vim-signature',
18 \ 'google/vim-searchindex',
19- \ 'mhinz/vim-startify',
20 \ ] }
21 Layer 'docker'
22 Layer 'editing'
23@@ -77,7 +81,7 @@ function! UserConfig()
24 let g:email = 'pavle.portic@tilda.center'
25
26 " Set python path
27- let g:python_host_prog = '/usr/bin/python'
28+ " let g:python_host_prog = '/usr/bin/python'
29
30 " Backspace and Enter as G and gg
31 nnoremap <CR> G
32@@ -190,21 +194,13 @@ function! UserConfig()
33 " Signify settings
34 let g:signify_sign_delete_first_line = '-'
35
36- " Emmet settings
37- let g:user_emmet_mode='nv'
38- let g:user_emmet_leader_key='<Leader>e'
39-
40- " LSP configuration
41- let g:spacevim_lsp_engine = 'coc'
42-
43 " Per filetype indentation settings
44- let g:jsx_ext_required = 1
45 augroup filetypeDefinitions
46 autocmd Filetype i3 setl noet ts=2 sts=2 sw=2
47- autocmd Filetype html,jinja.html,blade setl noet ts=2 sts=2 sw=2
48- autocmd Filetype javascript,js,vue,jsx setl et ts=4 sts=4 sw=4
49+ autocmd Filetype html setl noet ts=2 sts=2 sw=2
50+ autocmd Filetype javascript,js setl et ts=4 sts=4 sw=4
51 autocmd Filetype typescript setl et ts=2 sts=2 sw=2
52- autocmd Filetype json setl et ts=4 sts=4 sw=4
53+ autocmd Filetype json,jsonnet setl et ts=4 sts=4 sw=4
54 autocmd Filetype python setl et ts=4 sw=4 sts=4 tw=0
55 autocmd Filetype php setl et ts=4 sw=4 sts=4 tw=0
56 autocmd Filetype c,cpp setl noet ts=4 sts=4 sw=4
57@@ -212,7 +208,6 @@ function! UserConfig()
58 autocmd Filetype tex setl et ts=4 sts=4 sw=4
59 autocmd Filetype nginx setl noet ts=4 sts=4 sw=4
60 autocmd Filetype terraform setl et ts=2 sts=2 sw=2
61- autocmd Filetype jsonnet setl et ts=2 sts=2 sw=2
62 augroup END
63
64 augroup filetypedetect
65@@ -225,13 +220,9 @@ function! UserConfig()
66 " Format files
67 command! FormatJSON %!python -m json.tool
68 command! FormatPython %!yapf
69-
70- " Format braces in C file
71- command! FormatBraces %s/\n\s*{/ {/g
72-
73 command! W :execute ':silent w !sudo tee % > /dev/null' | :edit!
74
75- autocmd! spacevimStart
76+ " autocmd! spacevimStart
77
78 " Strip trailing whitespaces on save
79 fun! <SID>StripTrailingWhitespaces()
80@@ -242,13 +233,6 @@ function! UserConfig()
81 endfun
82 autocmd FileType * autocmd BufWritePre <buffer> :call <SID>StripTrailingWhitespaces()
83
84- " Jedi completion settings
85- let g:jedi#completions_enabled = 0
86- let g:jedi#documentation_command = 'E'
87-
88- " Vue syntax highlight speedup
89- let g:vue_disable_pre_processors=1
90-
91 " JSON disable quote conceal
92 let g:vim_json_syntax_conceal = 0
93
94@@ -278,14 +262,7 @@ function! UserConfig()
95 \ 'spinner': ['fg', 'Statement'],
96 \ }
97
98- " Configure vim-template directory
99- let g:templates_directory = ['~/.local/share/nvim/templates']
100-
101 " NERDCommenter configuration
102 let g:NERDCustomDelimiters = { 'vue': { 'left': '//' }, 'systemd': { 'left': '#' } }
103 let g:NERDDefaultAlign = 'left'
104-