Browse Source

all: squashed some bugs

my-config
NTBBloodbath 4 years ago
parent
commit
aaa009b1bf
No known key found for this signature in database GPG Key ID: 18D6730BC846AAC5
  1. 6
      autoload/doom.vim
  2. 4
      autoload/doom/default.vim
  3. 3
      autoload/doom/system.vim
  4. 1
      config/keybindings.vim
  5. 16
      install.sh

6
autoload/doom.vim

@ -160,12 +160,12 @@ function! doom#end() abort
" Plugins, configs are loaded only if the plugin is enabled.
if index(g:doom_disabled_plugins, 'vista') == -1
call doom#system#grepconfig('config/plugins/', 'vista.vim', 1)
call doom#system#grepconfig('config/plugins', 'vista.vim', 1)
endif
if index(g:doom_disabled_plugins, 'neoformat') == -1
call doom#system#grepconfig('config/plugins/', 'neoformat.vim', 1)
call doom#system#grepconfig('config/plugins', 'neoformat.vim', 1)
endif
call doom#system#grepconfig('config/plugins/', 'leader-mapper.vim', 1)
call doom#system#grepconfig('config/plugins', 'leader-mapper.vim', 1)
" Check updates
call doom#logging#init()

4
autoload/doom/default.vim

@ -60,7 +60,7 @@ endfunction
function doom#default#loadGlob()
" Set a custom command to update Doom Nvim
" can be called by using :DoomUpdate
command DoomUpdate !git -C g:doom_root pull
command DoomUpdate !git -C ~/.config/doom-nvim/ pull
" Set SPC as the mapleader
let mapleader = ' '
@ -68,6 +68,8 @@ function doom#default#loadGlob()
" Indent Lines
let g:indent_blankline_enabled = g:doom_show_indent
let g:indent_blankline_char_list = ['|', '¦', '┆', '┊']
" Disable indent lines on dashboard and help
let g:indent_blankline_filetype_exclude = ['help', 'dashboard']
" If treesitter is not disabled, then ...
if index(g:doom_disabled_plugins, 'treesitter') == -1
" When on, use treesitter to determine the current context. Then show

3
autoload/doom/system.vim

@ -34,8 +34,9 @@ endfunction
function! doom#system#grepconfig(folder, filename, source) abort
" Source file or returns the full path
let fullpath = g:doom_root . a:folder . g:doom_separator . a:filename
let fullpath = g:doom_root . g:doom_separator . a:folder . g:doom_separator . a:filename
echo fullpath
if filereadable(fullpath)
if a:source ==# 1
try

1
config/keybindings.vim

@ -57,6 +57,7 @@ if index(g:doom_disabled_plugins, 'vista') == -1
endif
if index(g:doom_disabled_plugins, 'tree') == -1
nnoremap <F3> :NvimTreeToggle<CR>
endif
if index(g:doom_disabled_plugins, 'minimap') == -1
nnoremap <F4> :MinimapToggle<CR>
endif

16
install.sh

@ -115,7 +115,7 @@ check_requirements() {
log_success "Check requirements : nvim"
else
log_warn "Check requirements : nvim"
fi
fi
# Check if lua is installed again
if hash "lua" &> /dev/null; then
@ -123,6 +123,20 @@ check_requirements() {
else
log_warn "Check requirements : lua"
fi
# Check if nodejs and npm are installed again,
# we do not check only nodejs because some Linux distributions
# installs nodejs but not also npm
if hash "node" &> /dev/null; then
log_success "Check requirements : node"
else
log_warn "Check requirements : node (optional, required to use LSP)"
fi
if hash "npm" &> /dev/null; then
log_success "Check requirements : npm"
else
log_warn "Check requirements : npm (optional, required to use LSP)"
fi
}
# }}}

Loading…
Cancel
Save