diff --git a/nvim/README.md b/nvim/README.md index 9b6b768..a27b384 100644 --- a/nvim/README.md +++ b/nvim/README.md @@ -21,9 +21,13 @@ u - UI Enable/Disable stuff Open the keymap.lua file, and add entries there +### Disable auto format + +uf + ### Mini file explores -SPACE f m +SPACE f m This allows you to use EDIT functions to create, rename, files Use = to commit and q to step out @@ -31,12 +35,18 @@ Use = to commit and q to step out ### TODO - [x] Play with GIT integration -- [ ] Figure out :terminal +- [x] Figure out :terminal (ft) - There seems to be a video dedicated on terminal usage in LazyVIM - [ ] Figure out how to disable auto complete for markdown +- Read up on omnicompletion ### Co-Pilot Seems to be working, but not sure how to use it yet. But in the base it's typing and then just pressing enter. If this thing does a co-pilot call whenever I'm typing, then I suddenly understand why we have such high energy bills. + +### Keyboard keys to remember + +- =g Cleanup code +- K Get hover definition diff --git a/nvim/init.lua b/nvim/init.lua index 96c5145..ae16150 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,3 +1,5 @@ +print("advent of neovim") + require("config.lazy") -- -- local o = vim.opt @@ -13,8 +15,10 @@ require("config.lazy") -- -- nvim_create_user_command("InsertTodayHeader", ':pu=strftime("# %a %d %b %Y")', {}) -- +vim.opt.compatible = false vim.opt.foldmethod = "expr" vim.opt.foldexpr = "v:lua.MyCustomFoldExpr()" +vim.diagnostic.config({ virtual_text = true }) function _G.MyCustomFoldExpr() local line = vim.fn.getline(vim.v.lnum) diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json index 75de891..4661934 100644 --- a/nvim/lazyvim.json +++ b/nvim/lazyvim.json @@ -12,15 +12,18 @@ "lazyvim.plugins.extras.editor.neo-tree", "lazyvim.plugins.extras.editor.outline", "lazyvim.plugins.extras.editor.snacks_explorer", + "lazyvim.plugins.extras.editor.telescope", "lazyvim.plugins.extras.lang.ansible", "lazyvim.plugins.extras.lang.clojure", "lazyvim.plugins.extras.lang.docker", "lazyvim.plugins.extras.lang.git", "lazyvim.plugins.extras.lang.helm", "lazyvim.plugins.extras.lang.json", + "lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.php", "lazyvim.plugins.extras.lang.python", "lazyvim.plugins.extras.lang.sql", + "lazyvim.plugins.extras.lang.toml", "lazyvim.plugins.extras.lang.yaml", "lazyvim.plugins.extras.util.dot", "lazyvim.plugins.extras.util.gitui", diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index 5ea8803..727a938 100644 --- a/nvim/lua/config/keymaps.lua +++ b/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", "", { noremap = false }) +-- vim.api.nvim_set_keymap("i", "jj", "", { noremap = false }) local wk = require("which-key") wk.add({ - { "N", group = "Neorg" }, - { "Nt", ":Neorg journal today", desc = "Today" }, + { "N", group = "Notes" }, + { "Nt", ":Journal", desc = "Today" }, }) diff --git a/nvim/lua/plugins/chatgpt.lua b/nvim/lua/plugins.disable/chatgpt.lua similarity index 100% rename from nvim/lua/plugins/chatgpt.lua rename to nvim/lua/plugins.disable/chatgpt.lua diff --git a/nvim/lua/plugins/copilot.lua b/nvim/lua/plugins.disable/copilot.lua similarity index 100% rename from nvim/lua/plugins/copilot.lua rename to nvim/lua/plugins.disable/copilot.lua diff --git a/nvim/lua/plugins.disable/neorg.lua b/nvim/lua/plugins.disable/neorg.lua index cd09521..d3a8d54 100644 --- a/nvim/lua/plugins.disable/neorg.lua +++ b/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 = "n", -- Change this to whatever you want + }, + }, + }, + }) + end, +} diff --git a/nvim/lua/plugins/toggleterm.nvim b/nvim/lua/plugins.disable/toggleterm.nvim similarity index 100% rename from nvim/lua/plugins/toggleterm.nvim rename to nvim/lua/plugins.disable/toggleterm.nvim diff --git a/nvim/lua/plugins/twilight.lua b/nvim/lua/plugins.disable/twilight.lua similarity index 100% rename from nvim/lua/plugins/twilight.lua rename to nvim/lua/plugins.disable/twilight.lua diff --git a/nvim/lua/plugins/blink.lua b/nvim/lua/plugins/blink.lua index 5e06f49..6877da9 100644 --- a/nvim/lua/plugins/blink.lua +++ b/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, }, }, }, diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua new file mode 100644 index 0000000..1c015b8 --- /dev/null +++ b/nvim/lua/plugins/lspconfig.lua @@ -0,0 +1,7 @@ +return { + "neovim/nvim-lspconfig", + config = function() + require("lspconfig").lua_ls.setup({}) + require("lspconfig").marksman.setup({}) + end, +} diff --git a/nvim/lua/plugins/neorg.lua b/nvim/lua/plugins/neorg.lua deleted file mode 100644 index d3a8d54..0000000 --- a/nvim/lua/plugins/neorg.lua +++ /dev/null @@ -1,66 +0,0 @@ -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 = "n", -- Change this to whatever you want - }, - }, - }, - }) - end, -} diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/lua/plugins/nvim-lspconfig.lua deleted file mode 100644 index 358ef22..0000000 --- a/nvim/lua/plugins/nvim-lspconfig.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - "neovim/nvim-lspconfig", - config = function() - - end, - } -}