Major cleanup for macOS developmentneorg

9 files changed, 60 insertions, 116 deletions

diff --git a/lua/ben/plugins/fugitive.lua b/lua/ben/plugins/fugitive.lua
index 4b73c42..051a983 100644
--- a/lua/ben/plugins/fugitive.lua
+++ b/lua/ben/plugins/fugitive.lua
@@ -17,20 +17,20 @@ return {
 	},
 	config = function()
 		-- Use > and < to fix merge conflicts (keep the cursor in the middle of the screen)
-		vim.api.nvim_set_keymap("n", ">", "<cmd>diffg //2<cr><cmd>diffupdate<cr>", { noremap = true, silent = true })
-		vim.api.nvim_set_keymap("n", "<", "<cmd>diffg //3<cr><cmd>diffupdate<cr>", { noremap = true, silent = true })
+		-- vim.api.nvim_set_keymap("n", ">", "<cmd>diffg //2<cr><cmd>diffupdate<cr>", { noremap = true, silent = true })
+		-- vim.api.nvim_set_keymap("n", "<", "<cmd>diffg //3<cr><cmd>diffupdate<cr>", { noremap = true, silent = true })
 		-- Use } and { to force the entire file
-		vim.api.nvim_set_keymap(
-			"n",
-			"}",
-			"<C-w>h<cmd>Gwrite!<cr><cmd>diffupdate<cr>",
-			{ noremap = true, silent = true }
-		)
-		vim.api.nvim_set_keymap(
-			"n",
-			"{",
-			"<C-w>l<cmd>Gwrite!<cr><cmd>diffupdate<cr>",
-			{ noremap = true, silent = true }
-		)
+		-- vim.api.nvim_set_keymap(
+		-- 	"n",
+		-- 	"}",
+		-- 	"<C-w>h<cmd>Gwrite!<cr><cmd>diffupdate<cr>",
+		-- 	{ noremap = true, silent = true }
+		-- )
+		-- vim.api.nvim_set_keymap(
+		-- 	"n",
+		-- 	"{",
+		-- 	"<C-w>l<cmd>Gwrite!<cr><cmd>diffupdate<cr>",
+		-- 	{ noremap = true, silent = true }
+		-- )
 	end,
 }
diff --git a/lua/ben/plugins/gitignore.lua b/lua/ben/plugins/gitignore.lua
index 0a657d9..08188a3 100644
--- a/lua/ben/plugins/gitignore.lua
+++ b/lua/ben/plugins/gitignore.lua
@@ -1,18 +1,7 @@
 return {
-	"theniceboy/fzf-gitignore",
+	"antonk52/gitignore-grabber.nvim",
 	dependencies = {
-		{
-			"junegunn/fzf",
-			build = function()
-				vim.fn["fzf#install"]()
-			end,
-		},
+		{ "nvim-telescope/telescope.nvim" },
 	},
-	cond = function()
-		return vim.fn.executable("python3") == 1
-	end,
-	build = function()
-		vim.cmd([[UpdateRemotePlugins]])
-	end,
-	ft = "gitignore",
+  cmd = "Gitignore",
 }
diff --git a/lua/ben/plugins/linting.lua b/lua/ben/plugins/linting.lua
index a5be347..3f28b53 100644
--- a/lua/ben/plugins/linting.lua
+++ b/lua/ben/plugins/linting.lua
@@ -7,7 +7,7 @@ return {
       css = { "stylelint" },
       markdown = { "markdownlint" },
       python = { "pylint" },
-      go = { "golangci_lint" },
+      -- go = { "golangci_lint" },
       sh = { "shellcheck" },
     }
 
diff --git a/lua/ben/plugins/lsp/mason.lua b/lua/ben/plugins/lsp/mason.lua
index 121509d..e352a6e 100644
--- a/lua/ben/plugins/lsp/mason.lua
+++ b/lua/ben/plugins/lsp/mason.lua
@@ -24,49 +24,16 @@ return {
     })
     mason_lspconfig.setup({
       -- list of servers for mason to install
-      ensure_installed = {
-        "bashls",
-        "cssls",
-        "diagnosticls",
-        "dockerls",
-        "docker_compose_language_service",
-        "gopls",
-        "lua_ls",
-        "texlab",
-        "zk",
-        "pyright",
-        "r_language_server",
-        "sqls",
-      },
+      ensure_installed = {},
       -- auto-install configured servers (with lspconfig)
       automatic_installation = true, -- not the same as ensure_installed
     })
 
     mason_tool_installer.setup({
       ensure_installed = {
-        "mutt-language-server",
-        "emmet-ls",
-        -- Linters:
-        "prettier",
-        "bibtex-tidy",
-        "goimports",
-        "gci",
-        "golines",
-        "shfmt",
-        "latexindent",
-        "sql-formatter",
-        "isort",
-        "black",
-        "yamlfix",
-        "stylua",
-        -- Formatters:
-        "stylelint",
-        "markdownlint",
-        "pylint",
         "golangci-lint",
         "shellcheck",
       },
     })
-
   end,
 }
diff --git a/lua/ben/plugins/lualine.lua b/lua/ben/plugins/lualine.lua
index 0cecbf4..ebd4734 100644
--- a/lua/ben/plugins/lualine.lua
+++ b/lua/ben/plugins/lualine.lua
@@ -11,8 +11,10 @@ return {
         -- component_separators = { left = "", right = "" },
         -- component_separators = { left = "", right = "" },
         -- section_separators = { left = "", right = "" },
-        section_separators = { left = "▓", right = "▓" },
-        component_separators = { left = "░", right = "░" },
+        -- section_separators = { left = "▓", right = "▓" },
+        -- component_separators = { left = "░", right = "░" },
+        section_separators = { left = "", right = "" },
+        component_separators = { left = "", right = "" },
         globalstatus = false,
         ignore_focus = {},
         always_divide_middle = true,
diff --git a/lua/ben/plugins/neorg.lua b/lua/ben/plugins/neorg.lua
index ece2a53..7a18c00 100644
--- a/lua/ben/plugins/neorg.lua
+++ b/lua/ben/plugins/neorg.lua
@@ -1,39 +1,34 @@
 return {
-  "nvim-neorg/neorg",
-  build = ":Neorg sync-parsers",
+  'nvim-orgmode/orgmode',
   dependencies = {
-    "nvim-lua/plenary.nvim",
-    "nvim-neorg/neorg-telescope",
+    { -- Nicely formatted bullet Headings
+      "akinsho/org-bullets.nvim",
+      dependencies = "nvim-treesitter/nvim-treesitter",
+      config = true,
+    },
   },
+  event = 'VeryLazy',
+  ft = { 'org' },
   config = function()
-    require("neorg").setup({
-      load = {
-        ["core.defaults"] = {}, -- Loads default behaviour
-        ["core.export"] = {}, -- Loads default behaviour
-        ["core.concealer"] = {
-          config = {
-            icons = {
-              heading = {
-                icons = {
-                  "",
-                  "",
-                  "",
-                  "",
-                },
-              },
-            },
-          },
-        }, -- Adds pretty icons to your documents
-        ["core.integrations.telescope"] = {},
-        ["core.dirman"] = { -- Manages Neorg workspaces
-          config = {
-            workspaces = {
-              notes = "~/Dropbox/org",
-            },
-            default_workspace = "notes",
-          },
-        },
+    -- This is bound to org-modern:
+    -- local Menu = require("org-modern.menu")
+    -- Setup orgmode
+    require('orgmode').setup({
+      org_agenda_files = '~/Dropbox/org/**/*',
+      org_default_notes_file = '~/Dropbox/org/index.org',
+      emacs_config = {
+        executable_path = '/opt/homebrew/bin/emacs',
+        config_path = '$HOME/.config/emacs/early-init.el',
       },
     })
+    vim.opt.conceallevel = 2
+    vim.opt.concealcursor = 'v'
+
+    -- NOTE: If you are using nvim-treesitter with `ensure_installed = "all"` option
+    -- add `org` to ignore_install
+    -- require('nvim-treesitter.configs').setup({
+    --   ensure_installed = 'all',
+    --   ignore_install = { 'org' },
+    -- })
   end,
 }
diff --git a/lua/ben/plugins/smoothie.lua b/lua/ben/plugins/smoothie.lua
deleted file mode 100644
index 3afb796..0000000
--- a/lua/ben/plugins/smoothie.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
-	"psliwka/vim-smoothie",
-	event = "CursorMoved",
-}
diff --git a/lua/ben/plugins/treesitter.lua b/lua/ben/plugins/treesitter.lua
index 279fa1a..9315bdf 100644
--- a/lua/ben/plugins/treesitter.lua
+++ b/lua/ben/plugins/treesitter.lua
@@ -33,9 +33,6 @@ return {
 					"gomod",
 					"gowork",
 					"gosum",
-					"latex",
-					"bibtex",
-					"rnoweb",
 					"org",
 					"rust",
 					"c",
@@ -51,8 +48,6 @@ return {
 					"awk",
 					"sql",
 					"ssh_config",
-					"sxhkdrc",
-					"nix",
 					"xml",
 					"csv",
 					"dockerfile",
diff --git a/lua/ben/plugins/yadm.lua b/lua/ben/plugins/yadm.lua
index de6389e..7d6440b 100644
--- a/lua/ben/plugins/yadm.lua
+++ b/lua/ben/plugins/yadm.lua
@@ -1,13 +1,13 @@
 return {
-	"robstumborg/yadm.nvim",
-	dependencies = "tpope/vim-fugitive",
-	-- Only load if yadm is installed
-	cond = function()
-		return vim.fn.executable("yadm") == 1
-	end,
-	config = function()
-		require("yadm").setup({
-			yadm_dir = vim.fn.expand("$HOME/.local/share/yadm/repo.git"),
-		})
-	end,
+  "takinoy/yadm.nvim",
+  dependencies = "tpope/vim-fugitive",
+  -- Only load if yadm is installed
+  cond = function()
+    return vim.fn.executable("yadm") == 1
+  end,
+  config = function()
+    require("yadm").setup({
+      yadm_dir = vim.fn.expand("$HOME/.local/share/yadm/repo.git"),
+    })
+  end,
 }