Merge commit '7ed2303648bf83bb081d9bd863660ebf2344ce47'

4 files changed, 63 insertions, 1 deletions

diff --git a/common/config/nvim/after/ftplugin/c.lua b/common/config/nvim/after/ftplugin/c.lua
new file mode 100755
index 0000000..6af8a5c
--- /dev/null
+++ b/common/config/nvim/after/ftplugin/c.lua
@@ -0,0 +1,9 @@
+-- Fix C filetype comments
+vim.api.nvim_create_autocmd("Filetype", {
+  pattern = "c",
+  callback = function()
+    vim.bo.commentstring = "//%s"
+  end,
+  group = comment_augroup,
+})
+
diff --git a/common/config/nvim/after/ftplugin/lua.lua.bak b/common/config/nvim/after/ftplugin/lua.lua.bak
new file mode 100755
index 0000000..fe9587b
--- /dev/null
+++ b/common/config/nvim/after/ftplugin/lua.lua.bak
@@ -0,0 +1,35 @@
+local lspconfig = require("lspconfig")
+
+if lspconfig.lua_ls then
+  lspconfig.lua_ls.setup({
+    settings = {
+      Lua = {
+        diagnostics = {
+          -- This is the Lua table for diagnostics settings
+          globals = { "vim", "use", "_G", "packer_plugins", "P" },
+          disable = {
+            "undefined-global",
+            "lowercase-global",
+            "unused-local",
+            "unused-vararg",
+            "trailing-space"
+          },
+        },
+        workspace = {
+          -- Points the language server to Neovim's runtime files for auto-completion
+          library = {
+            --vim.api.nvim_get_runtime_path(),
+            --checkThirdParty = false,
+            vim.env.VIMRUNTIME,
+            -- Depending on the usage, you might want to add additional paths here.
+            "${3rd}/luv/library",
+            "${3rd}/busted/library",
+          },
+        },
+        telemetry = {
+          enable = false,
+        },
+      },
+    },
+  })
+end
diff --git a/common/config/nvim/after/ftplugin/markdown.lua b/common/config/nvim/after/ftplugin/markdown.lua
index 9a6427f..5941402 100644..100755
--- a/common/config/nvim/after/ftplugin/markdown.lua
+++ b/common/config/nvim/after/ftplugin/markdown.lua
@@ -4,7 +4,7 @@ vim.wo.wrap = true
 vim.wo.linebreak = true
 vim.wo.breakindent = true
 vim.wo.colorcolumn = "0"
-vim.wo.conceallevel = 3
+--vim.wo.conceallevel = 3
 vim.opt.softtabstop = 2 -- Tab key indents by 2 spaces.
 vim.opt.shiftwidth = 2  -- >> indents by 2 spaces.
 -- vim.g.markdown_recommended_style = 0 -- prevents markdown from changing tabs to 4 spaces
diff --git a/common/config/nvim/after/ftplugin/vim.lua b/common/config/nvim/after/ftplugin/vim.lua
new file mode 100755
index 0000000..7823f73
--- /dev/null
+++ b/common/config/nvim/after/ftplugin/vim.lua
@@ -0,0 +1,18 @@
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.softtabstop = 4
+vim.opt_local.expandtab = true
+vim.opt_local.autoindent = true
+vim.opt_local.smartindent = true
+
+--vim.api.nvim_create_autocmd("FileType", {
+--  pattern = "vim",
+--  callback = function()
+--    vim.opt_local.tabstop = 4
+--    vim.opt_local.shiftwidth = 4
+--    vim.opt_local.softtabstop = 4
+--    vim.opt_local.expandtab = true
+--    vim.opt_local.autoindent = true
+--    vim.opt_local.smartindent = true
+--  end,
+--})