From 12bf31273c83142c9ef45ba4b2f3daea304e45da Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Tue, 20 Dec 2022 22:39:38 -0500
Subject: [PATCH] neovim changes

---
 config/nvim/.config/nvim/init.lua                    | 12 +++++++++---
 config/nvim/.config/nvim/lua/{core => }/keymaps.lua  |  0
 config/nvim/.config/nvim/lua/plugin-config/init.lua  |  2 ++
 config/nvim/.config/nvim/lua/plugin-config/lsp.lua   |  7 ++-----
 config/nvim/.config/nvim/lua/{core => }/plugins.lua  |  4 ++--
 .../nvim/lua/{core/options.lua => settings.lua}      | 10 ++++------
 6 files changed, 19 insertions(+), 16 deletions(-)
 rename config/nvim/.config/nvim/lua/{core => }/keymaps.lua (100%)
 rename config/nvim/.config/nvim/lua/{core => }/plugins.lua (98%)
 rename config/nvim/.config/nvim/lua/{core/options.lua => settings.lua} (93%)

diff --git a/config/nvim/.config/nvim/init.lua b/config/nvim/.config/nvim/init.lua
index 5ebfd7d..3a4f9ca 100644
--- a/config/nvim/.config/nvim/init.lua
+++ b/config/nvim/.config/nvim/init.lua
@@ -1,8 +1,14 @@
 -- init.lua --
 
-require('core.options')
-require('core.plugins')
-require('core.keymaps')
+-- general vim settings
+require('settings')
+
+-- vim keymaps
+require('keymaps')
+
+-- package manager (packer.nvim)
+require('plugins')
+
 
 require('plugin-config')
 
diff --git a/config/nvim/.config/nvim/lua/core/keymaps.lua b/config/nvim/.config/nvim/lua/keymaps.lua
similarity index 100%
rename from config/nvim/.config/nvim/lua/core/keymaps.lua
rename to config/nvim/.config/nvim/lua/keymaps.lua
diff --git a/config/nvim/.config/nvim/lua/plugin-config/init.lua b/config/nvim/.config/nvim/lua/plugin-config/init.lua
index 896ee4f..51f496c 100644
--- a/config/nvim/.config/nvim/lua/plugin-config/init.lua
+++ b/config/nvim/.config/nvim/lua/plugin-config/init.lua
@@ -1,3 +1,5 @@
+-- plugin-config/init.lua
+
 -- lsp
 require('plugin-config.lsp')
 
diff --git a/config/nvim/.config/nvim/lua/plugin-config/lsp.lua b/config/nvim/.config/nvim/lua/plugin-config/lsp.lua
index 8df3e67..0ed9953 100644
--- a/config/nvim/.config/nvim/lua/plugin-config/lsp.lua
+++ b/config/nvim/.config/nvim/lua/plugin-config/lsp.lua
@@ -45,7 +45,7 @@ end
 
 -- mason - package manager for lsp servers
 require('mason').setup()
-local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'gopls', 'bashls'}
+local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'gopls', 'bashls' }
 require('mason-lspconfig').setup {
   ensure_installed = servers,
 }
@@ -66,9 +66,7 @@ end
 require('fidget').setup()
 
 
-
 -- lua lsp config
-
 -- Make runtime files discoverable to the server
 local runtime_path = vim.split(package.path, ';')
 table.insert(runtime_path, 'lua/?.lua')
@@ -88,10 +86,9 @@ require('lspconfig').sumneko_lua.setup {
       diagnostics = {
         globals = { 'vim' },
       },
-      workspace = { library = vim.api.nvim_get_runtime_file('', true) },
+      workspace = { library = vim.api.nvim_get_runtime_file('', true), checkThirdParty = false, },
       -- Do not send telemetry data containing a randomized but unique identifier
       telemetry = { enable = false },
     },
   },
 }
-
diff --git a/config/nvim/.config/nvim/lua/core/plugins.lua b/config/nvim/.config/nvim/lua/plugins.lua
similarity index 98%
rename from config/nvim/.config/nvim/lua/core/plugins.lua
rename to config/nvim/.config/nvim/lua/plugins.lua
index 496a591..20c579e 100644
--- a/config/nvim/.config/nvim/lua/core/plugins.lua
+++ b/config/nvim/.config/nvim/lua/plugins.lua
@@ -5,7 +5,8 @@
 local install_path = vim.fn.stdpath 'data' .. '/site/pack/packer/start/packer.nvim'
 if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
   vim.fn.execute('!git clone https://github.com/wbthomason/packer.nvim ' .. install_path)
-  vim.cmd [[packadd packer.nvim]]
+
+  vim.cmd('packadd packer.nvim')
 end
 
 require('packer').startup(function(use)
@@ -45,7 +46,6 @@ require('packer').startup(function(use)
     tag = 'nightly'
   }
 
-
   -- * vanilla vim plugins * -- 
 
   -- normal mode keybinds
diff --git a/config/nvim/.config/nvim/lua/core/options.lua b/config/nvim/.config/nvim/lua/settings.lua
similarity index 93%
rename from config/nvim/.config/nvim/lua/core/options.lua
rename to config/nvim/.config/nvim/lua/settings.lua
index e8271df..fe3f76d 100644
--- a/config/nvim/.config/nvim/lua/core/options.lua
+++ b/config/nvim/.config/nvim/lua/settings.lua
@@ -2,6 +2,10 @@
 -- general settings
 --
 
+-- vim cmds
+vim.cmd('syntax enable')
+vim.cmd('filetype plugin indent on')
+
 -- encoding/format
 vim.opt.encoding = 'utf-8'
 vim.opt.fileformats = 'unix,dos,mac'
@@ -46,9 +50,3 @@ vim.opt.termguicolors = true
 vim.opt.number = true
 vim.opt.wrap = true
 vim.opt.listchars = {eol = '↲', tab = '▸ ', trail = '·'}
-
--- vim cmds
-vim.cmd [[
-  syntax enable
-  filetype plugin indent on
-]]