From c26f6a6bf5de292edf47bfb366935558a4b38cb3 Mon Sep 17 00:00:00 2001
From: "Andrew R. M." <nixy@nixy.moe>
Date: Tue, 6 Feb 2024 18:29:51 -0500
Subject: [PATCH] More neovim testing

---
 .gitmodules                           |  3 ++
 vim/.config/nvim/init.lua             |  0
 vim/.config/nvim/init.vim             | 70 +++++++++++++++++++++++++++
 vim/.vim/nvim-bundle/indent-blankline |  1 +
 vim/.vimrc                            |  7 +--
 5 files changed, 78 insertions(+), 3 deletions(-)
 delete mode 100644 vim/.config/nvim/init.lua
 create mode 160000 vim/.vim/nvim-bundle/indent-blankline

diff --git a/.gitmodules b/.gitmodules
index 9c666e7..47067ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
 [submodule "vim/.vim/nvim-bundle/nvim-lspconfig"]
 	path = vim/.vim/nvim-bundle/nvim-lspconfig
 	url = https://github.com/neovim/nvim-lspconfig.git
+[submodule "vim/.vim/nvim-bundle/indent-blankline"]
+	path = vim/.vim/nvim-bundle/indent-blankline
+	url = https://github.com/lukas-reineke/indent-blankline.nvim.git
diff --git a/vim/.config/nvim/init.lua b/vim/.config/nvim/init.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/vim/.config/nvim/init.vim b/vim/.config/nvim/init.vim
index 58dddd4..82134b8 100644
--- a/vim/.config/nvim/init.vim
+++ b/vim/.config/nvim/init.vim
@@ -2,8 +2,78 @@ set runtimepath^=~/.vim runtimepath+=~/.vim/after
 let &packpath = &runtimepath
 source ~/.vimrc
 
+lua <<EOF
+vim.g.mapleader = ','
+
+-- print('Hello from lua')
+require'lspconfig'.pylsp.setup{}
+require'lspconfig'.solargraph.setup{}
+
+-- Configure the 'indent-blankline' plugin
+-- Look at configuring this for rainbow blocks at some point
+require('ibl').setup{
+  enabled = false,
+  indent = {
+    char = '|'
+  }
+}
+
+-- Setup LSP bindings
+vim.api.nvim_create_autocmd('LspAttach', {
+  desc = 'LSP actions',
+  callback = function()
+    local bufmap = function(mode, lhs, rhs)
+      local opts = {buffer = true}
+      vim.keymap.set(mode, lhs, rhs, opts)
+    end
+
+    -- Displays hover information about the symbol under the cursor
+    bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
+
+    -- Jump to the definition
+    bufmap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>')
+
+    -- Jump to declaration
+    bufmap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
+
+    -- Lists all the implementations for the symbol under the cursor
+    bufmap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>')
+
+    -- Jumps to the definition of the type symbol
+    bufmap('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
+
+    -- Lists all the references 
+    bufmap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>')
+
+    -- Displays a function's signature information
+    bufmap('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
+
+    -- Renames all references to the symbol under the cursor
+    bufmap('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>')
+
+    -- Selects a code action available at the current cursor position
+    bufmap('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>')
+
+    -- Show diagnostics in a floating window
+    bufmap('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<cr>')
+
+    -- Move to the previous diagnostic
+    bufmap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
+
+    -- Move to the next diagnostic
+    bufmap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
+  end
+})
+EOF
+
+nnoremap <leader>ib <cmd>IBLToggle<cr>
+
 " Beginner keybinds for telescope
 nnoremap <leader>ff <cmd>Telescope find_files<cr>
 nnoremap <leader>fg <cmd>Telescope live_grep<cr>
 nnoremap <leader>fb <cmd>Telescope buffers<cr>
 nnoremap <leader>fh <cmd>Telescope help_tags<cr>
+
+" lua print('this also works')
+
+command! LuaRuntimePath lua print(vim.inspect(vim.api.nvim_list_runtime_paths()))
diff --git a/vim/.vim/nvim-bundle/indent-blankline b/vim/.vim/nvim-bundle/indent-blankline
new file mode 160000
index 0000000..12e9204
--- /dev/null
+++ b/vim/.vim/nvim-bundle/indent-blankline
@@ -0,0 +1 @@
+Subproject commit 12e92044d313c54c438bd786d11684c88f6f78cd
diff --git a/vim/.vimrc b/vim/.vimrc
index c944871..d128b31 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -6,7 +6,7 @@ set nocompatible
 "{- PLUGIN MANAGER -}"
   " Load pathogen, the plugin manager, which then loads all plugins "
     runtime bundle/pathogen/autoload/pathogen.vim
-    execute pathogen#infect()
+    execute pathogen#infect('bundle/{}', 'nvim-bundle/{}')
 
 "{- COMMANDS -}"
 
@@ -31,7 +31,7 @@ set nocompatible
 "{- INTERFACE -}"
 
   " Colors and syntax highlighting "
-    colorscheme dim
+    colorscheme halfdab
     set background=dark
     filetype plugin on
     syntax on
@@ -103,7 +103,8 @@ set nocompatible
     set complete+=kspell
 
   " Match the longest completion option then display menu
-    set completeopt=menuone,longest
+    "set completeopt=menuone,longest
+    set completeopt=menu,menuone,noselect
 
   " Use UTF-8 "
     set encoding=utf-8