mainly lsp changes

5 files changed, 13 insertions, 22 deletions

diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua
index e668ad2..c9b6ac3 100644
--- a/lua/user/lsp/handlers.lua
+++ b/lua/user/lsp/handlers.lua
@@ -91,6 +91,10 @@ M.on_attach = function(client, bufnr)
     client.resolved_capabilities.document_formatting = false
   end
   lsp_keymaps(bufnr)
+  if client.name == "stylelint_lsp" then
+    client.resolved_capabilities.document_formatting = false
+  end
+  lsp_keymaps(bufnr)
   lsp_highlight_document(client)
 end
 
diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua
index 731644e..b8f9018 100644
--- a/lua/user/lsp/null-ls.lua
+++ b/lua/user/lsp/null-ls.lua
@@ -14,6 +14,9 @@ null_ls.setup{
 		formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }),
 		formatting.black.with({ extra_args = { "--fast" } }),
 		formatting.stylua,
-    diagnostics.flake8
+		formatting.shfmt,
+    diagnostics.flake8,
+    diagnostics.eslint,
+    diagnostics.shellcheck
 	},
 }
diff --git a/lua/user/orgmode.lua b/lua/user/orgmode.lua
index fded63b..7c0443e 100644
--- a/lua/user/orgmode.lua
+++ b/lua/user/orgmode.lua
@@ -1,22 +1,9 @@
-local status_ok, orgmode = pcall(require, "orgmode")
-if not status_ok then
+local orgmode_status_ok = pcall(require, "orgmode")
+if not orgmode_status_ok then
 	return
 end
 
-require('orgmode').setup_ts_grammer()
--- Tree-sitter configuration
-
-require'nvim-treesitter.configs'.setup {
-  -- If TS highlights are not enabled at all, or disabled via 
-  -- `disable` prop, highlighting will fallback to default Vim syntax highlighting
-  highlight = {
-    enable = true,
-    additional_vim_regex_highlighting = {'org'}, -- Required for spellcheck, some LaTex highlights and 
-                                                 -- code block highlights that do not have ts grammar
-  },
-  ensure_installed = {'org'},                    -- Or run :TSUpdate org
-}
-
+require("orgmode").setup_ts_grammer()
 require("orgmode").setup({
   org_agenda_files = {'~/org/**/*'},
   org_default_notes_files = {'~/org/refile.org'}
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index 3206e87..29e5dfa 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -58,10 +58,7 @@ return packer.startup(function(use)
   use {"windwp/nvim-autopairs", commit = ""} -- Autopairs, integrates with both cmp and treesitter
   use {"vimwiki/vimwiki", commit = ""}
   use {"zane-/howdoi.nvim", commit = ""}
-  use {'nvim-orgmode/orgmode', config = function()
-        require('orgmode').setup{}
-        end
-      }
+  use {'nvim-orgmode/orgmode'}
 
   -- Colorschemes
   use {"lunarvim/colorschemes", commit = ""} -- A bunch of colorschemes you can try out
diff --git a/lua/user/treesitter.lua b/lua/user/treesitter.lua
index 47ae33a..99fa7ec 100644
--- a/lua/user/treesitter.lua
+++ b/lua/user/treesitter.lua
@@ -14,7 +14,7 @@
 
 local configs = require("nvim-treesitter.configs")
 configs.setup {
-  ensure_installed = {"python","lua","json"},
+  ensure_installed = {"python","lua","json","org"},
   sync_install = false, 
   ignore_install = { "" }, -- List of parsers to ignore installing
   autopairs = {