From 416c3c69dc9fd0ade67942a130ca09450914fcf3 Mon Sep 17 00:00:00 2001
From: Jordan Orelli <jordanorelli@gmail.com>
Date: Sat, 4 Mar 2023 12:50:55 -0600
Subject: [PATCH] neovim terminal colors

---
 config.ini           | 10 +++++++---
 nvim/init.vim        | 41 +++++++++++++++++++++--------------------
 nvim/lua/plugins.lua |  3 ---
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/config.ini b/config.ini
index 1da3311..d4e5985 100644
--- a/config.ini
+++ b/config.ini
@@ -8,7 +8,7 @@ files:
   .bashrc
 
 [home vim]
-when: host.has('vim')
+when: host.has('vim') or host.has('nvim')
 files:
   vim/ftplugin > .vim/ftplugin
   vim/pack     > .vim/pack
@@ -23,10 +23,14 @@ when: host.is_windows and host.has('nvim')
 target_root: ~/AppData/Local
 files:
   nvim/lua
-  vim/ftplugin > nvim/ftplugin
-  vimrc        > nvim/init.vim
+  nvim/init.vim
   Vundle.vim   > nvim/bundle/Vundle.vim
 
+[git vundle]
+when: host.has('vim') or host.has('nvim')
+repo: https://github.com/VundleVim/Vundle.vim.git
+target: ~/.vim/bundle/Vundle.vim
+
 [git packer-posix]
 when: not host.is_windows
 repo: https://github.com/wbthomason/packer.nvim
diff --git a/nvim/init.vim b/nvim/init.vim
index 86e1c57..9bff50a 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,22 +1,23 @@
-set nocompatible
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc
 
-map <F12> :source $MYVIMRC<CR>
+" no line numbers in terminal windows please
+au TermOpen * setlocal nonumber
 
-" Plugins -------------------------------------------------------------------{{{
-" set the runtime path to include Vundle and initialize
-if has('win32')
-  set rtp+=~/AppData/Local/nvim/bundle/Vundle.vim
-else
-  set rtp+=~/.vim/bundle/Vundle.vim
-endif
-
-filetype off
-call vundle#begin()
-  Plugin 'VundleVim/Vundle.vim'
-  Plugin 'nanotech/jellybeans.vim'
-  Plugin 'itchyny/lightline.vim'    " fancy status line
-call vundle#end()
-
-" enable the filetype plugin
-filetype plugin indent on
-" ---------------------------------------------------------------------------}}}
+let g:terminal_color_0 = '#929292'
+let g:terminal_color_1 = '#e27373'
+let g:terminal_color_2 = '#94b979'
+let g:terminal_color_3 = '#ffba7b'
+let g:terminal_color_4 = '#97bedc'
+let g:terminal_color_5 = '#e1c0fa'
+let g:terminal_color_6 = '#00988e'
+let g:terminal_color_7 = '#dedede'
+let g:terminal_color_8 = '#bdbdbd'
+let g:terminal_color_9 = '#ffa1a1'
+let g:terminal_color_10 = '#bddeab'
+let g:terminal_color_11 = '#ffdca0'
+let g:terminal_color_12 = '#b1d8f6'
+let g:terminal_color_13 = '#fbdaff'
+let g:terminal_color_14 = '#1ab2a8'
+let g:terminal_color_15 = '#ffffff'
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index ca5fa75..6d69e20 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -3,12 +3,9 @@ function packer_startup(use)
   use 'wbthomason/packer.nvim'
 
   -- lsp manager
-  -- use 'williamboman/mason.nvim'
-  -- use 'williamboman/mason-lspconfig.nvim'
   use 'neovim/nvim-lspconfig'
 end
 
 require('packer').startup(packer_startup)
--- require('mason').setup()
 
 require('lspconfig').rust_analyzer.setup({})