Merge changes

nvim/lua/config/autocmds.lua

@@ -5,4 +5,3 @@
 -- with `vim.api.nvim_create_autocmd`
 --
 -- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults)
--- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell")

nvim/lua/config/keymaps.lua

@@ -2,11 +2,11 @@
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
 --
-vim.api.nvim_set_keymap("i", "jj", "<Esc>", { noremap = false })
+-- vim.api.nvim_set_keymap("i", "jj", "<Esc>", { noremap = false })
 
 local wk = require("which-key")
 
 wk.add({
-  { "<leader>N", group = "Neorg" },
-  { "<leader>Nt", ":Neorg journal today<CR>", desc = "Today" },
+  { "<leader>N", group = "Notes" },
+  { "<leader>Nt", ":Journal<CR>", desc = "Today" },
 })

nvim/lua/plugins.disable/copilot.lua

@@ -0,0 +1,3 @@
+return {
+  { "zbirenbaum/copilot.lua", opts = { suggestion = { enabled = false } } },
+}

nvim/lua/plugins.disable/neorg.lua

@@ -1,7 +1,66 @@
-require("neorg").setup({
-	load = {
-		["core.defaults"] = {},
-		["core.concealer"] = {},
-		["core.dirman"] = {},
-	}
-})
+return {
+  "nvim-neorg/neorg",
+  lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
+  version = "*", -- Pin Neorg to the latest stable release
+  config = function()
+    require("neorg").setup({
+      load = {
+        ["core.defaults"] = {}, -- Loads default behaviour
+        ["core.concealer"] = {}, -- Adds pretty icons to your documents
+        ["core.ui.calendar"] = {},
+        ["core.completion"] = { config = { engine = { module_name = "external.lsp-completion" }, name = "[Norg]" } },
+        ["core.esupports.metagen"] = { config = { type = "auto", update_date = true } },
+        ["core.qol.toc"] = {},
+        ["core.qol.todo_items"] = {},
+        ["core.looking-glass"] = {},
+        ["core.presenter"] = { config = { zen_mode = "zen-mode" } },
+        ["core.export"] = {},
+        ["core.export.markdown"] = { config = { extensions = "all" } },
+        ["core.summary"] = {},
+        ["core.tangle"] = { config = { report_on_empty = false } },
+        ["core.dirman"] = { -- Manages Neorg workspaces
+          config = {
+            workspaces = {
+              notes = "~/Notes.neorg",
+            },
+            default_workspace = "notes",
+          },
+        },
+        ["external.interim-ls"] = {
+          config = {
+            -- default config shown
+            completion_provider = {
+              -- Enable or disable the completion provider
+              enable = true,
+
+              -- Show file contents as documentation when you complete a file name
+              documentation = true,
+
+              -- Try to complete categories provided by Neorg Query. Requires `benlubas/neorg-query`
+              categories = false,
+
+              -- suggest heading completions from the given file for `{@x|}` where `|` is your cursor
+              -- and `x` is an alphanumeric character. `{@name}` expands to `[name]{:$/people:# name}`
+              people = {
+                enable = false,
+
+                -- path to the file you're like to use with the `{@x` syntax, relative to the
+                -- workspace root, without the `.norg` at the end.
+                -- ie. `folder/people` results in searching `$/folder/people.norg` for headings.
+                -- Note that this will change with your workspace, so it fails silently if the file
+                -- doesn't exist
+                path = "people",
+              },
+            },
+          },
+        },
+        ["core.keybinds"] = {
+          config = {
+            default_keybinds = true,
+            neorg_leader = "<Leader>n", -- Change this to whatever you want
+          },
+        },
+      },
+    })
+  end,
+}

nvim/lua/plugins/auto-session.lua

@@ -0,0 +1,7 @@
+return {
+  "rmagatti/auto-session",
+  lazy = false,
+  opts = {
+    suppressed_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
+  },
+}

nvim/lua/plugins/blink.lua

@@ -4,7 +4,7 @@ return {
     opts = {
       completion = {
         ghost_text = {
-          enabled = false,
+          enabled = true,
         },
         list = {
           selection = {
@@ -13,7 +13,7 @@ return {
           },
         },
         menu = {
-          auto_show = false,
+          auto_show = true,
         },
       },
     },

nvim/lua/plugins/lspconfig.lua

@@ -0,0 +1,11 @@
+return {
+  "neovim/nvim-lspconfig",
+  config = function()
+    require("lspconfig").lua_ls.setup({})
+    require("lspconfig").marksman.setup({
+      root_dir = require("lspconfig.util").root_pattern(".marksman.toml", ".git", "*.md"),
+    })
+    require("lspconfig").bashls.setup({})
+    require("lspconfig").yamlls.setup({})
+  end,
+}

nvim/lua/plugins/mkdnflow.lua

@@ -0,0 +1,38 @@
+-- Configuration Documentation https://github.com/jakewvincent/mkdnflow.nvim?tab=readme-ov-file#%EF%B8%8F-configuration
+return {
+  "jakewvincent/mkdnflow.nvim",
+  config = function()
+    require("mkdnflow").setup({
+      -- Config goes here; leave blank for defaults
+      perspective = {
+        priority = "first",
+        root_tell = false,
+      },
+      new_file_template = {
+        use_template = true,
+        placeholders = {
+          before = {
+            title = "link_title",
+            date = "os_date",
+          },
+          after = {},
+        },
+        template = "# {{ title }}",
+      },
+      links = {
+        style = "markdown",
+        name_is_source = false,
+        conceal = false,
+        context = 0,
+        implicit_extension = nil,
+        transform_implicit = false,
+        transform_explicit = function(text)
+          text = text:gsub(" ", "-")
+          text = text:lower()
+          return text
+        end,
+        create_on_follow_failure = true,
+      },
+    })
+  end,
+}

nvim/lua/plugins/nvim-lspconfig.lua

@@ -1,8 +0,0 @@
-return {
-    {
-        "neovim/nvim-lspconfig",
-        config = function()
-
-        end,
-    }
-}

nvim/lua/plugins/render-markdown.lua

@@ -15,6 +15,9 @@ return {
       checkbox = {
         enabled = true,
       },
+      wikilinks = {
+        enabled = true,
+      },
     })
   end,
 }