From 0127a5db075dcf237486f18af260631814142c58 Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Sat, 25 Feb 2023 17:16:51 +0100
Subject: [PATCH] nvim: Switch from neorg to zk-nvim

Neorg is fine but not for me right now (especially with its own syntax
spec). zk seems to fit my workflow much better, this is the beginning of
trying it out.
---
 nvim/.config/nvim/lua/plug/_neorg.lua |  8 -----
 nvim/.config/nvim/lua/plugins.lua     | 50 +++++++++++++++------------
 2 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100644 nvim/.config/nvim/lua/plug/_neorg.lua

diff --git a/nvim/.config/nvim/lua/plug/_neorg.lua b/nvim/.config/nvim/lua/plug/_neorg.lua
deleted file mode 100644
index 90cb520..0000000
--- a/nvim/.config/nvim/lua/plug/_neorg.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-require("neorg").setup {
-    load = {
-        ["core.defaults"] = {},
-        ["core.norg.concealer"] = {},
-        ["core.norg.completion"] = { config = { engine = "nvim-cmp" } },
-        ["core.norg.qol.toc"] = {}
-    }
-}
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 7068891..f557fba 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -67,10 +67,15 @@ return {
         requires = { 'kyazdani42/nvim-web-devicons', opt = true },
         config = function() require('plug._lualine') end
     }, -- writing
-    { 'vim-pandoc/vim-pandoc-syntax', ft = writing_ft },
-    { 'vim-pandoc/vim-criticmarkup',  ft = writing_ft }, {
+    { 'vim-pandoc/vim-criticmarkup',   ft = writing_ft }, {
+    'mickael-menu/zk-nvim',
+    config = function() require('zk').setup({ picker = "telescope" }) end
+}, {
     'quarto-dev/quarto-nvim',
-    dependencies = { 'jmbuhr/otter.nvim', 'neovim/nvim-lspconfig' },
+    dependencies = {
+        'jmbuhr/otter.nvim', 'neovim/nvim-lspconfig',
+        'vim-pandoc/vim-pandoc-syntax'
+    },
     config = function()
         require 'quarto'.setup {
             lspFeatures = {
@@ -115,14 +120,7 @@ return {
     {
         "folke/which-key.nvim",
         config = function() require("which-key").setup {} end
-    }, {
-    "nvim-neorg/neorg",
-    config = function() require("plug._neorg") end,
-    dependencies = { "nvim-lua/plenary.nvim" },
-    version = "*",
-    ft = "norg"
-}, -- extensive organization plugin mimicking orgmode
-    -- fuzzy matching
+    }, -- fuzzy matching
     { "nvim-telescope/telescope-fzf-native.nvim", build = 'make' }, {
     "nvim-telescope/telescope.nvim",
     dependencies = { "nvim-lua/popup.nvim", "nvim-lua/plenary.nvim" },
@@ -180,15 +178,23 @@ return {
     config = function() require('plug._lsp') end,
     event = "VeryLazy"
 }, -- and completion
-    {
-        "jghauser/papis.nvim",
-        after = { "telescope.nvim", "nvim-cmp" },
-        dependencies = {
-            "kkharji/sqlite.lua", "nvim-lua/plenary.nvim",
-            "MunifTanjim/nui.nvim", "nvim-treesitter/nvim-treesitter"
-        },
-        ft = writing_ft,
-        rocks = { "lyaml" },
-        config = true
-    }
+    -- { -- REQUIRES custom `yay -S --asdeps lua51-lyaml invocation` AND is suuper slow
+    --     "jghauser/papis.nvim",
+    --     after = { "telescope.nvim", "nvim-cmp" },
+    --     dependencies = {
+    --         "kkharji/sqlite.lua", "nvim-lua/plenary.nvim",
+    --         "MunifTanjim/nui.nvim", "nvim-treesitter/nvim-treesitter"
+    --     },
+    --     ft = writing_ft,
+    --     rocks = { "lyaml" },
+    --     config = function()
+    --         require('papis').setup({
+    --             papis_python = {
+    --                 dir = "/home/marty/documents/library/academia",
+    --                 info_name = "info.yaml",
+    --                 notes_name = [[notes.qmd]]
+    --             }
+    --         })
+    --     end
+    -- }
 }