From 6aee2316636b81ec78570cb3f504f6d53b7e7dd7 Mon Sep 17 00:00:00 2001 From: Bas Grolleman Date: Tue, 10 Jun 2025 08:43:51 +0200 Subject: [PATCH] Changes on Mac --- nvim/.gitignore => .gitignore | 1 + nvim/lazyvim.json | 2 + .../{plugins => plugins.disable}/chatgpt.lua | 0 nvim/lua/plugins/copilot.lua | 3 - nvim/lua/plugins/journal.lua | 10 +-- nvim/lua/plugins/kiwi.lua | 13 ++++ nvim/lua/plugins/neorg.lua | 66 ------------------- 7 files changed, 21 insertions(+), 74 deletions(-) rename nvim/.gitignore => .gitignore (60%) rename nvim/lua/{plugins => plugins.disable}/chatgpt.lua (100%) delete mode 100644 nvim/lua/plugins/copilot.lua create mode 100644 nvim/lua/plugins/kiwi.lua delete mode 100644 nvim/lua/plugins/neorg.lua diff --git a/nvim/.gitignore b/.gitignore similarity index 60% rename from nvim/.gitignore rename to .gitignore index e033bc6..78f465c 100644 --- a/nvim/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +.DS_Store lazy-lock.json diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json index 75de891..9e0700b 100644 --- a/nvim/lazyvim.json +++ b/nvim/lazyvim.json @@ -18,9 +18,11 @@ "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/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/copilot.lua deleted file mode 100644 index eda7b1a..0000000 --- a/nvim/lua/plugins/copilot.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - { "zbirenbaum/copilot.lua", opts = { suggestion = { enabled = false } } }, -} diff --git a/nvim/lua/plugins/journal.lua b/nvim/lua/plugins/journal.lua index 4037f1b..b0e241e 100644 --- a/nvim/lua/plugins/journal.lua +++ b/nvim/lua/plugins/journal.lua @@ -3,21 +3,21 @@ return { config = function() require("journal").setup({ filetype = "md", -- Filetype to use for new journal entries - root = "~/Notes/Personal/journals", -- Root directory for journal entries - date_format = "%Y-%m-%d", -- Date format for `:Journal ` - autocomplete_date_modifier = "end", -- "always"|"never"|"end". Enable date modifier autocompletion + root = "~/Notes/Journal", -- Root directory for journal entries + date_format = "%Y%m%d", -- Date format for `:Journal ` + autocomplete_date_modifier = "always", -- "always"|"never"|"end". Enable date modifier autocompletion -- Configuration for journal entries journal = { -- Default configuration for `:Journal ` - format = "%Y_%m_%d", + format = "%Y%m%d", template = "# %A %B %d %Y\n", frequency = { day = 1 }, -- Nested configurations for `:Journal ... ` entries = { day = { - format = "%Y_%m_%d", -- Format of the journal entry in the filesystem. + format = "%Y%m%d", -- Format of the journal entry in the filesystem. template = "# %A %B %d %Y\n", -- Optional. Template used when creating a new journal entry frequency = { day = 1 }, -- Optional. The frequency of the journal entry. Used for `:Journal next`, `:Journal -2` etc }, diff --git a/nvim/lua/plugins/kiwi.lua b/nvim/lua/plugins/kiwi.lua new file mode 100644 index 0000000..df676f9 --- /dev/null +++ b/nvim/lua/plugins/kiwi.lua @@ -0,0 +1,13 @@ +return { + "serenevoid/kiwi.nvim", + opts = { + { + name = "notes", + path = "Notes", + }, + }, + keys = { + { "T", ':lua require("kiwi").todo.toggle()', desc = "Toggle Markdown Task" }, + }, + lazy = true, +} 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, -}