From 0e4c7d40eaaffc5308c93129bcb97eea523aed1c Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Sat, 12 Feb 2022 02:19:07 -0500
Subject: [PATCH] Tokyo Night for nvim

---
 configs/init.vim | 39 ++-------------------------------------
 home/neovim.nix  |  2 +-
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/configs/init.vim b/configs/init.vim
index f0dcee4..674c634 100644
--- a/configs/init.vim
+++ b/configs/init.vim
@@ -14,8 +14,6 @@ command Mks NERDTreeClose | mksession!
 command Term split | term
 command Vterm vsplit | term
 
-"command Hsfmt mark H | %!./styler.sh | if v:shell_error | undo | else | `H | delm H | endif
-
 "save readonly
 cmap w!! w !sudo tee >/dev/null %
 "terminal exit
@@ -23,9 +21,8 @@ tnoremap <Esc> <C-\><C-n><CR>
 "nohl
 nnoremap <silent> ,<space> :nohlsearch<CR>
 
-colorscheme Tomorrow-Night-Eighties
-
-let g:lightline = {'colorscheme': 'jellybeans'}
+colorscheme tokyonight
+let g:lightline = {'colorscheme': 'tokyonight'}
 
 "cursor saving
 autocmd BufReadPost * if @% !~# '\.git[\/\\]COMMIT_EDITMSG$' && line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
@@ -41,35 +38,3 @@ let NERDTreeShowHidden=1
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
 "show/hide nerdtree
 nnoremap <silent> <c-b> :NERDTreeToggle<CR>
-
-"LSP support
-"set hidden
-"let g:LanguageClient_rootMarkers = ['*.cabal', 'stack.yaml']
-"let g:LanguageClient_serverCommands = {
-"      \ 'haskell': ['ghcide', '--lsp'],
-"      \ }
-"let g:LanguageClient_preferredMarkupKind = ['plaintext']
-"let g:LanguageClient_completionPreferTextEdit = 1
-"nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
-"nnoremap <silent> f :call LanguageClient#textDocument_rangeFormatting()<CR>
-"nnoremap <silent> F :call LanguageClient#textDocument_formatting()<CR>
-"nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
-"nnoremap <silent> gr :call LanguageClient#textDocument_references()<CR>
-"set cmdheight=2
-"set updatetime=300
-"set signcolumn=yes
-"
-""NCM2
-"autocmd bufenter * call ncm2#enable_for_buffer()
-"au User Ncm2PopupOpen set completeopt=noinsert,menuone,noselect
-"au User Ncm2PopupClose set completeopt=menuone
-"set shortmess+=c
-"" CTRL-C doesn't trigger the InsertLeave autocmd . map to <ESC> instead.
-"inoremap <c-c> <ESC>
-"" When the <Enter> key is pressed while the popup menu is visible, it only
-"" hides the menu. Use this mapping to close the menu and also start a new
-"" line.
-"inoremap <expr> <CR> (pumvisible() ? "\<c-y>\<cr>" : "\<CR>")
-"" Use <TAB> to select the popup menu:
-"inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
-"inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
diff --git a/home/neovim.nix b/home/neovim.nix
index 4fc2ed5..c333b41 100644
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -41,7 +41,7 @@ in
     tabular
     vim-commentary
     vim-surround
-    vim-colorschemes
+    tokyonight-nvim
     lightline-vim
     vim-fish
     vim-nix