Updated Neovim Rice

11 files changed, 92 insertions, 46 deletions

diff --git a/neovim/.config/nvim/confs/bufferline.vim b/neovim/.config/nvim/confs/bufferline.vim
index e0313fe..c8f243f 100644
--- a/neovim/.config/nvim/confs/bufferline.vim
+++ b/neovim/.config/nvim/confs/bufferline.vim
@@ -1,5 +1,30 @@
 lua << EOF
-	require("bufferline").setup{}
+	require("bufferline").setup
+	{
+		options =
+		{
+			separator_style = "thick",
+			always_show_bufferline = false,
+			show_close_icon = false,
+			diagnostics = "nvim_lsp",
+	      		indicator_icon = "",
+
+			offsets =
+			{
+				{
+					filetype = "NvimTree",
+					text = "File Explorer",
+					highlight = "Directory",
+					text_align = "center"
+				}
+			},
+
+			diagnostics_indicator = function(count, level, diagnostics_dict, context)
+							local icon = level:match("error") and " " or " "
+							return " " .. icon .. count
+						end
+		},
+	}
 EOF
 
 nnoremap <silent>[b :BufferLineCycleNext<CR>
diff --git a/neovim/.config/nvim/confs/generic.vim b/neovim/.config/nvim/confs/generic.vim
index e9fadcc..7cd4027 100644
--- a/neovim/.config/nvim/confs/generic.vim
+++ b/neovim/.config/nvim/confs/generic.vim
@@ -15,6 +15,8 @@ set relativenumber
 set termguicolors
 set completeopt=menuone,noselect
 
+" Leader Key
+let mapleader=","
 
 " Remove trailing whitespace on save
 autocmd BufWritePre * %s/\s\+$//e
diff --git a/neovim/.config/nvim/confs/gitgutter.vim b/neovim/.config/nvim/confs/gitgutter.vim
index ae24c10..91367c4 100644
--- a/neovim/.config/nvim/confs/gitgutter.vim
+++ b/neovim/.config/nvim/confs/gitgutter.vim
@@ -1,4 +1,6 @@
 set updatetime=100
-map <C-l> :GitGutterLineHighlightsToggle<CR>
-map <C-h> :GitGutterPreviewHunk<CR>
-map <C-g> :GitGutterToggle<CR>
+let g:gitgutter_highlight_lines = 1
+
+map <leader>h :GitGutterLineHighlightsToggle<CR>
+map <leader>c :GitGutterPreviewHunk<CR>
+map <leader>g :GitGutterToggle<CR>
diff --git a/neovim/.config/nvim/confs/gitmessenger.vim b/neovim/.config/nvim/confs/gitmessenger.vim
index 0b15db6..4935a7e 100644
--- a/neovim/.config/nvim/confs/gitmessenger.vim
+++ b/neovim/.config/nvim/confs/gitmessenger.vim
@@ -1,2 +1,4 @@
 let g:git_messenger_floating_win_opts = { 'border': 'single' }
 let g:git_messenger_popup_content_margins = v:false
+
+nmap <leader>m <plug>(git-messenger)
diff --git a/neovim/.config/nvim/confs/hexokinase.vim b/neovim/.config/nvim/confs/hexokinase.vim
new file mode 100644
index 0000000..4f1c7ae
--- /dev/null
+++ b/neovim/.config/nvim/confs/hexokinase.vim
@@ -0,0 +1 @@
+let g:Hexokinase_highlighters = ['backgroundfull']
diff --git a/neovim/.config/nvim/confs/lualine.vim b/neovim/.config/nvim/confs/lualine.vim
index 93d98ff..b348e75 100644
--- a/neovim/.config/nvim/confs/lualine.vim
+++ b/neovim/.config/nvim/confs/lualine.vim
@@ -1,3 +1,11 @@
-lua << END
-require('lualine').setup()
-END
+lua << EOF
+	require('lualine').setup
+	{
+		options =
+		{
+			section_separators = { left = '', right = '' },
+			component_separators = { left = '', right = '' },
+			theme = 'pywal'
+		}
+	}
+EOF
diff --git a/neovim/.config/nvim/confs/nvimtree.vim b/neovim/.config/nvim/confs/nvimtree.vim
index 625721d..5938fd0 100644
--- a/neovim/.config/nvim/confs/nvimtree.vim
+++ b/neovim/.config/nvim/confs/nvimtree.vim
@@ -1,5 +1,5 @@
 lua << EOF
-require'nvim-tree'.setup()
+	require'nvim-tree'.setup()
 EOF
 
 " vimrc
@@ -15,11 +15,11 @@ let g:nvim_tree_respect_buf_cwd = 1 "0 by default, will change cwd of nvim-tree
 let g:nvim_tree_create_in_closed_folder = 1 "0 by default, When creating files, sets the path of a file when cursor is on a closed folder to the parent folder when 0, and inside the folder when 1.
 let g:nvim_tree_special_files = { 'README.md': 1, 'Makefile': 1, 'MAKEFILE': 1 } " List of filenames that gets highlighted with NvimTreeSpecialFile
 let g:nvim_tree_show_icons = {
-    \ 'git': 1,
-    \ 'folders': 0,
-    \ 'files': 0,
-    \ 'folder_arrows': 0,
-    \ }
+			\ 'git': 1,
+			\ 'folders': 0,
+			\ 'files': 0,
+			\ 'folder_arrows': 0,
+			\ }
 "If 0, do not show the icons for one of 'git' 'folder' and 'files'
 "1 by default, notice that if 'files' is 1, it will only display
 "if nvim-web-devicons is installed and on your runtimepath.
@@ -29,32 +29,32 @@ let g:nvim_tree_show_icons = {
 " default will show icon by default if no icon is provided
 " default shows no icon by default
 let g:nvim_tree_icons = {
-    \ 'default': '',
-    \ 'symlink': '',
-    \ 'git': {
-    \   'unstaged': "✗",
-    \   'staged': "✓",
-    \   'unmerged': "",
-    \   'renamed': "➜",
-    \   'untracked': "★",
-    \   'deleted': "",
-    \   'ignored': "◌"
-    \   },
-    \ 'folder': {
-    \   'arrow_open': "",
-    \   'arrow_closed': "",
-    \   'default': "",
-    \   'open': "",
-    \   'empty': "",
-    \   'empty_open': "",
-    \   'symlink': "",
-    \   'symlink_open': "",
-    \   }
-    \ }
+			\ 'default': '',
+			\ 'symlink': '',
+			\ 'git': {
+				\   'unstaged': "✗",
+				\   'staged': "✓",
+				\   'unmerged': "",
+				\   'renamed': "➜",
+				\   'untracked': "★",
+				\   'deleted': "",
+				\   'ignored': "◌"
+				\   },
+				\ 'folder': {
+					\   'arrow_open': "",
+					\   'arrow_closed': "",
+					\   'default': "",
+					\   'open': "",
+					\   'empty': "",
+					\   'empty_open': "",
+					\   'symlink': "",
+					\   'symlink_open': "",
+					\   }
+					\ }
 
-nnoremap <C-n> :NvimTreeToggle<CR>
+nnoremap <leader>n :NvimTreeToggle<CR>
 nnoremap <leader>r :NvimTreeRefresh<CR>
-nnoremap <leader>n :NvimTreeFindFile<CR>
+nnoremap <leader>f :NvimTreeFindFile<CR>
 " More available functions:
 " NvimTreeOpen
 " NvimTreeClose
diff --git a/neovim/.config/nvim/confs/treesitter.vim b/neovim/.config/nvim/confs/treesitter.vim
new file mode 100644
index 0000000..74718e1
--- /dev/null
+++ b/neovim/.config/nvim/confs/treesitter.vim
@@ -0,0 +1,10 @@
+lua <<EOF
+	require'nvim-treesitter.configs'.setup
+	{
+		highlight =
+		{
+			enable = true,
+			additional_vim_regex_highlighting = false,
+		},
+	}
+EOF
diff --git a/neovim/.config/nvim/confs/trouble.vim b/neovim/.config/nvim/confs/trouble.vim
deleted file mode 100644
index 4f3bfce..0000000
--- a/neovim/.config/nvim/confs/trouble.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-lua << EOF
-  require("trouble").setup()
-EOF
diff --git a/neovim/.config/nvim/confs/whichkey.vim b/neovim/.config/nvim/confs/whichkey.vim
index 796894c..7525815 100644
--- a/neovim/.config/nvim/confs/whichkey.vim
+++ b/neovim/.config/nvim/confs/whichkey.vim
@@ -1,3 +1,3 @@
 lua << EOF
-  require("which-key").setup()
+	require("which-key").setup()
 EOF
diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim
index 44db641..35619ca 100644
--- a/neovim/.config/nvim/init.vim
+++ b/neovim/.config/nvim/init.vim
@@ -12,9 +12,6 @@ Plug 'nvim-lualine/lualine.nvim'
 Plug 'kyazdani42/nvim-web-devicons'
 " TreeSitter
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-" Trouble
-Plug 'kyazdani42/nvim-web-devicons'
-Plug 'folke/trouble.nvim'
 " GitGutter
 Plug 'airblade/vim-gitgutter'
 " GitMessenger
@@ -48,8 +45,8 @@ source ~/.config/nvim/confs/generic.vim
 source ~/.config/nvim/confs/completion.vim
 " LuaLine
 source ~/.config/nvim/confs/lualine.vim
-" Trouble
-source ~/.config/nvim/confs/trouble.vim
+" Treesitter
+source ~/.config/nvim/confs/treesitter.vim
 " GitGutter
 source ~/.config/nvim/confs/gitgutter.vim
 " GitMessenger
@@ -62,3 +59,5 @@ source ~/.config/nvim/confs/nvimtree.vim
 source ~/.config/nvim/confs/whichkey.vim
 " Bufferline
 source ~/.config/nvim/confs/bufferline.vim
+" Hexokinase
+source ~/.config/nvim/confs/hexokinase.vim