diff --git a/init.vim b/init.vim index f6f652d..60c3ac1 100644 --- a/init.vim +++ b/init.vim @@ -5,24 +5,25 @@ if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autolo silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/ silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim autocmd VimEnter * PlugInstall + autocmd VimEnter * CHADdeps endif let g:polyglot_disabled = ['markdown'] call plug#begin(stdpath('data') . '/plugged') -Plug 'rafi/awesome-vim-colorschemes' -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } +Plug 'rafi/awesome-vim-colorschemes' " Provides a number of pretty themes +Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } " Fast fuzzy file searching Plug 'junegunn/fzf.vim' -Plug 'tpope/vim-surround' -Plug 'tpope/vim-commentary' -Plug 'tpope/vim-unimpaired' -Plug 'jiangmiao/auto-pairs' -Plug 'pangloss/vim-javascript' -Plug 'mattn/emmet-vim' -Plug 'dylanaraps/wal.vim' -Plug 'godlygeek/tabular' -Plug 'plasticboy/vim-markdown' -Plug 'sheerun/vim-polyglot' +Plug 'tpope/vim-surround' " Adds motions for dealing with parentheses +Plug 'tpope/vim-commentary' " Easily comment/uncomment lines with `gc` +Plug 'tpope/vim-unimpaired' " A series of bindings for complementary actions [ and ] for adding lines before and after +Plug 'jiangmiao/auto-pairs' " Creates closing parentheses when writing the opening, use to wrap the next word/group, to disable +Plug 'mattn/emmet-vim' " Emmet support ,em to toggle it +Plug 'dylanaraps/wal.vim' " Set the theme to match the system colours +Plug 'godlygeek/tabular' " Easy alligning of code based on match, :Tab/| will line up markdown tables +Plug 'plasticboy/vim-markdown' " All markdown features (some are disabled by polyglot) +Plug 'sheerun/vim-polyglot' " Dynamically loads syntax hilighting from multiple packages +Plug 'ms-jpq/chadtree', { 'branch': 'chad', 'do': 'python3 -m chadtree deps' } " A file tree "Plug 'phpactor/phpactor', { 'do': 'composer install', 'for': 'php' } "Plug 'ncm2/ncm2' @@ -32,6 +33,10 @@ Plug 'sheerun/vim-polyglot' "set completeopt=noinsert,menuone,noselect "Plug 'phpactor/ncm2-phpactor' +" +" vim-devicons must be last plugin +" Plug 'ryanoasis/vim-devicons' " Icons for file tree + call plug#end() " }}} @@ -160,6 +165,37 @@ nnoremap em :call ToggleEmmet() " Conceal markdown text set conceallevel=3 +nnoremap d CHADopen " Open file draw with ,d + +let g:AutoPairsFlyMode = 1 +let g:AutoPairsShortcutBackInsert = '' " Use to insert the closing parentheses if it jumped ahead by mistake + +let g:chadtree_settings = { + \ 'theme': { + \ 'icon_glyph_set': 'devicons', + \ 'text_colour_set': 'env', + \ 'icon_colour_set': 'github', + \ "discrete_colour_map": { + \ "black": "#21222c", + \ "red": "#ff5555", + \ "green": "#50fa7b", + \ "yellow": "#f1fa8c", + \ "blue": "#bd93f9", + \ "magenta": "#ff79c6", + \ "cyan": "#8be9fd", + \ "white": "#f8f8f2", + \ "bright_black": "#6272a4", + \ "bright_red": "#ff6e6e", + \ "bright_green": "#69ff94", + \ "bright_yellow": "#ffffa5", + \ "bright_blue": "#d6acff", + \ "bright_magenta": "#ff92df", + \ "bright_cyan": "#a4ffff", + \ "bright_white": "#ffffff" + \ } + \ } +\ } + " }}} " Moving around --- {{{