Add keyboard shortcuts for toggle autoformat

ginit.vim

@@ -1,7 +1,7 @@
 let s:fontsize = 10
 function! AdjustFontSize(amount)
   let s:fontsize = s:fontsize+a:amount
-  :execute "GuiFont! Source\ Code\ Pro:h" . s:fontsize
+  :execute "GuiFont! Hack:h" . s:fontsize
 endfunction
 
 noremap <C-ScrollWheelUp> :call AdjustFontSize(1)<CR>
@@ -17,6 +17,6 @@ noremap <kMinus> :call AdjustFontSize(-1)<CR>
 inoremap <C-kPlus> <Esc>:call AdjustFontSize(1)<CR>a
 inoremap <C-kMinus> <Esc>:call AdjustFontSize(-1)<CR>a
 
-GuiFont! Source\ Code\ Pro:h10
+GuiFont! Hack:h11
 
 set mouse=a

gui.vim

@@ -1,5 +1,4 @@
 set background=dark
 set termguicolors
 set t_Co=256
-let ayucolor='mirage'
+colorscheme catppuccin-mocha
-colorscheme moonlight

init.vim

@@ -37,8 +37,8 @@ set ignorecase
 set smartcase
 
 "Informative statusline
-set statusline=%F%m%r%h%w\ [TYPE=%Y\ %{&ff}]\ [%02l:%02v\ (%p%%)\ %L\ Lines]\ [ASCII=\%03.3b]\ [HEX=\%02.2B]
+"set statusline=%F%m%r%h%w\ [TYPE=%Y\ %{&ff}]\ [%02l:%02v\ (%p%%)\ %L\ Lines]\ [ASCII=\%03.3b]\ [HEX=\%02.2B]
-set laststatus=2
+"set laststatus=2
 
 " Beautify the look and feel
 syntax on
@@ -69,7 +69,7 @@ source ~/.config/nvim/wiki.vim
 source ~/.config/nvim/rainbow.vim
 source ~/.config/nvim/neomake.vim
 source ~/.config/nvim/keymap.vim
-source ~/.config/nvim/timestamp.vim
+" source ~/.config/nvim/timestamp.vim
 source ~/.config/nvim/html.vim
 source ~/.config/nvim/vim-lsp.vim
 source ~/.config/nvim/python.vim

keymap.vim

@@ -4,8 +4,8 @@
 noremap <F8> :bnext <CR>
 noremap <S-F8> :bprevious <CR>
 
-" Define a shortcut to turn on NERDTree
+" Define a shortcut to toggle the Neotree
-map <C-n> :NERDTreeToggle <CR>
+map <C-n> :NeoTreeShowToggle <CR>
 
 " Copy to clipboard with Ctrl+C when in visual mode
 vnoremap <C-c> "+y
@@ -28,3 +28,11 @@ nmap <silent> <C-j> <Plug>(LspNextDiagnostic)
 
 " Map vim-grammarous to <F6>
 nmap <F6> :GrammarousCheck <CR>
+
+" Map the esc key to close a terminal
+tnoremap <ESC> <C-\><C-n>:bd!<CR>
+
+" Map a key to toggle vim-pencil's auto formatting
+noremap <silent> <F12> :<C-u>PFormatToggle<cr>
+inoremap <silent> <F12> <C-o>:PFormatToggle<cr>
+

latex.vim

@@ -10,11 +10,22 @@ function! SetServerName()
     call system(cmd)
 endfunction
 
+" Disable automatic folding in LaTeX
+let Tex_FoldedSections=""
+let Tex_FoldedEnvironments=""
+let Tex_FoldedMisc=""
+
+" Change the leading character for shortcuts, to free the '`' for UK-style
+" quotes.
+let Tex_Leader="~"
+
 set grepprg=grep\ -nH\ $*
 let g:tex_flavor='latex'
 set iskeyword+=:
-autocmd BufRead *.tex set tw=100
+let g:pencil#textwidth=100
+let g:pencil#conceallevel=0
 autocmd BufRead *.tex set spell
 autocmd BufRead,BufEnter *.tex nnoremap <F9> :w <CR> :!/usr/bin/waf configure build <CR>
 autocmd BufRead,BufEnter *.tex let b:AutoPairs = {'(':')', '[':']', '{':'}'}
 autocmd FileType tex call SetServerName()
+autocmd FileType tex call pencil#init({'wrap': 'hard', 'autoformat': 1})

lilypond.vim

@@ -0,0 +1,6 @@
+highlight Keyword cterm=bold ctermfg=yellow
+highlight Tag ctermfg=blue
+highlight Label ctermfg=lightyellow
+highlight StorageClass cterm=bold ctermfg=lightgreen
+highlight SpecialComment ctermfg=lightcyan
+highlight PreCondit ctermfg=cyan

markdown.vim

@@ -1,5 +1,7 @@
 " Settings for markdown
 set grepprg=grep\ -nH\ $*
-autocmd BufRead *.md set tw=80
+let g:pencil#textwidth=80
+let g:pencil#conceallevel=0
 autocmd BufRead *.md set spell
+autocmd FileType markdown call pencil#init({'wrap': 'hard', 'autoformat': 1})
 

plug.vim

@@ -1,15 +1,18 @@
 " Specify a directory for plugins
 call plug#begin(stdpath('data') . '/plugged')
 " Colourthemes
-Plug 'kyoz/purify', { 'rtp': 'vim' }
+Plug 'Rigellute/shades-of-purple.vim'
-Plug 'joshdick/onedark.vim'
+Plug 'catppuccin/nvim', {'as': 'catppuccin'}
-Plug 'ayu-theme/ayu-vim'
-Plug 'Brettm12345/moonlight.vim'
 
 " Editor extensions
 Plug 'neomake/neomake'
-Plug 'preservim/nerdtree'
+Plug 'nvim-lua/plenary.nvim'
-Plug 'zhaocai/timestamp.vim' 
+Plug 'nvim-tree/nvim-web-devicons'
+Plug 'MunifTanjim/nui.nvim'
+Plug 'preservim/vim-pencil'
+
+Plug 'nvim-neo-tree/neo-tree.nvim'
+"Plug 'zhaocai/timestamp.vim' 
 Plug 'vim-airline/vim-airline'
 Plug 'bling/vim-bufferline'
 Plug 'junegunn/fzf.vim'
@@ -17,6 +20,7 @@ Plug 'tpope/vim-commentary'
 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 Plug 'lighttiger2505/deoplete-vim-lsp'
 Plug 'machakann/vim-highlightedyank'
+Plug 'nvim-treesitter/nvim-treesitter', { 'do': ':UpdateRemotePlugins' }
 
 " Use rainbow parenthesis and automatic closing parens
 Plug 'luochen1990/rainbow'
@@ -26,6 +30,9 @@ Plug 'jiangmiao/auto-pairs'
 Plug 'prabirshrestha/vim-lsp'
 Plug 'mattn/vim-lsp-settings'
 
+" Support for various git things
+Plug 'airblade/vim-gitgutter'
+
 " Language support for LaTeX
 Plug 'vim-latex/vim-latex'
 Plug 'rhysd/vim-grammarous'
@@ -35,7 +42,6 @@ Plug 'chikamichi/mediawiki.vim'
 
 " Syntaxhighlighting for .toml files
 " Extras for rust
-
 Plug 'cespare/vim-toml'
 Plug 'racer-rust/vim-racer'
 
@@ -47,4 +53,5 @@ Plug 'zchee/deoplete-jedi'
 Plug 'davidhalter/jedi-vim'
 Plug 'HiPhish/jinja.vim'
 
+
 call plug#end()

timestamp.vim

@@ -1,2 +0,0 @@
-autocmd VimEnter * EnableTimestamp
-