From 1ee43ea0ae0c295d17b48d9d2c511699073b3f86 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Wed, 30 Aug 2023 17:10:04 -0400 Subject: [PATCH] removed neorg in favor of a more robust mkdnflow. Improved/updated nvim-tree --- nvim/.config/nvim/init.lua | 1 - nvim/.config/nvim/lazy-lock.json | 14 +++--- nvim/.config/nvim/lua/plugins/init.lua | 34 +++++++-------- nvim/.config/nvim/lua/plugins/mkdnflow.lua | 41 ++++++++++++++++++ nvim/.config/nvim/lua/plugins/neorg.lua | 9 +--- nvim/.config/nvim/spell/en.utf-8.add | 2 + nvim/.config/nvim/spell/en.utf-8.add.spl | Bin 3360 -> 3360 bytes nvim/.config/nvim/templates/norg/meeting.norg | 16 ------- 8 files changed, 66 insertions(+), 51 deletions(-) create mode 100644 nvim/.config/nvim/lua/plugins/mkdnflow.lua delete mode 100644 nvim/.config/nvim/templates/norg/meeting.norg diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 963dfa6..8c90f6a 100755 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -17,4 +17,3 @@ vim.g.localmapleader = ',' require('lazy').setup('plugins') require('core/keymaps') require('core/settings') - diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index d02ec85..a6c1978 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -16,10 +16,10 @@ "diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" }, "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" }, "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" }, - "f-string-toggle.nvim": { "branch": "main", "commit": "8dcf24593bfa4507e9b705e671b37d37c74f30c7" }, + "f-string-toggle.nvim": { "branch": "main", "commit": "383ca5c08ed001f7c1632ba752c14e7bb88ce6ed" }, "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, - "gitsigns.nvim": { "branch": "main", "commit": "d8590288417fef2430f85bc8b312fae8b1cf2c40" }, + "gitsigns.nvim": { "branch": "main", "commit": "d8b52fc95e3d424e5c09b287ee2c293dcb4e26fb" }, "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" }, "headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" }, "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, @@ -28,7 +28,7 @@ "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, - "mason.nvim": { "branch": "main", "commit": "c811fbf09c7642eebb37d6694f1a016a043f6ed3" }, + "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" }, "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, "mini.fuzzy": { "branch": "stable", "commit": "295763d73cbf580c27a4419364c47b09fc82e0f4" }, "mini.move": { "branch": "main", "commit": "3afd39873eb9171684e554a214c055482444a47d" }, @@ -53,7 +53,7 @@ "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-tree.lua": { "branch": "master", "commit": "00741206c2df9c4b538055def19b99790f0c95c8" }, - "nvim-treesitter": { "branch": "master", "commit": "d94e1ad9575cc211b5726f09b28ca9454aba22fe" }, + "nvim-treesitter": { "branch": "master", "commit": "920b37260ebc720b0399bd12954fd2bf8bd18242" }, "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, @@ -65,11 +65,11 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, + "tmux.nvim": { "branch": "main", "commit": "cb12b31a6b8aea1b39e4735ed70f7c73c2a938b0" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "toggleterm.nvim": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" }, - "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, - "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, + "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" }, + "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" }, "vim-arduino": { "branch": "master", "commit": "111db616db21d4f925691f1517792953f7671647" }, "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 972a850..f03debd 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -65,6 +65,20 @@ return { options = { theme = 'palenight' } } end, }, + +-- Nvim Tree File Manager on the Left +{ + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + config = function() + require("nvim-tree").setup {} + end, +}, + -- Tmux Navigation { "aserowy/tmux.nvim", @@ -89,8 +103,6 @@ return { version = '^1.0.0', -- optional: only update when a new 1.x version is released }, - -- Nvim Tree File Manager on the Left - 'nvim-tree/nvim-tree.lua', -- Trouble Shows Errors with Files. { @@ -189,23 +201,6 @@ return { vim.g.mkdp_page_title = "${name}" end, }, - { - 'jakewvincent/mkdnflow.nvim', - config = function() - require('mkdnflow').setup({ - mappings = { - MkdnToggleToDo = {{'i', 'n'}, ''}, - MkdnNewListItem = {{'i'}, ''}, - MkdnEnter = {{'n'}, ''}, - MkdnTableNextCell = false, - MkdnTab = {{'i',}, ''}, - MkdnSTab = {{'i'}, ''}, - MkdnFollowLink = {'n', 'p'} - }, - wrap = true - }) - end - }, --[[ { 'toppair/peek.nvim', build = 'deno task --quiet build:fast', @@ -287,6 +282,7 @@ return { -- signs = false, -- configure signs for some keywords individually }, DONE = { icon = " ", color = "info" }, + IN_PROG = { icon = "󰇘", color = "default" }, FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } }, WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } }, TODO = { icon = " ", color = "hint", alt = { "TASK", "TBD" } }, diff --git a/nvim/.config/nvim/lua/plugins/mkdnflow.lua b/nvim/.config/nvim/lua/plugins/mkdnflow.lua new file mode 100644 index 0000000..84c1a72 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/mkdnflow.lua @@ -0,0 +1,41 @@ +return { + 'jakewvincent/mkdnflow.nvim', + config = function() + require('mkdnflow').setup({ + mappings = { + MkdnToggleToDo = {{'i', 'n'}, ''}, + MkdnNewListItem = {{'i'}, ''}, + MkdnEnter = {{'n'}, ''}, + MkdnTableNextCell = false, + MkdnTab = {{'i',}, ''}, + MkdnSTab = {{'i'}, ''}, + MkdnFollowLink = {{'n'}, 'p'} + }, + links = { + name_is_source = true, + conceal = true, + }, + new_file_template = { + use_template = true, + template = [[ +# {{ title }} + * Date: {{ date }} + * Customer: {{ customer }} + +## Meeting Notes:]], + placeholders = { + before = { + date = function() + return os.date("%A, %B %d, %Y") -- Wednesday, March 1, 2023 + end + }, + after = { + customer = function() + return vim.fn.expand('%:p:h:t') + end + } + } + }, + }) + end, + } diff --git a/nvim/.config/nvim/lua/plugins/neorg.lua b/nvim/.config/nvim/lua/plugins/neorg.lua index 67652e2..59a298b 100644 --- a/nvim/.config/nvim/lua/plugins/neorg.lua +++ b/nvim/.config/nvim/lua/plugins/neorg.lua @@ -13,17 +13,10 @@ ["core.concealer"] = {}, ["core.integrations.nvim-cmp"] = {}, ["core.integrations.treesitter"] = {}, - ["external.templates"] = {}, ["core.highlights"] = {}, + ["core.export"] = {}, ["core.mode"] = {}, ["core.itero"] = {}, - ["core.journal"] = { - config = { - template_name = "template.norg", - use_template = "true", - workspace = "customer_notes", - } - }, ["core.keybinds"] = { config = { hook = function(keybinds) diff --git a/nvim/.config/nvim/spell/en.utf-8.add b/nvim/.config/nvim/spell/en.utf-8.add index dee09cc..321d029 100644 --- a/nvim/.config/nvim/spell/en.utf-8.add +++ b/nvim/.config/nvim/spell/en.utf-8.add @@ -316,3 +316,5 @@ accomodate Ines distrcits suggstions +Chek's +COO diff --git a/nvim/.config/nvim/spell/en.utf-8.add.spl b/nvim/.config/nvim/spell/en.utf-8.add.spl index 4a7279d1fe9fb9819a9a65ad3a7425bacf7353d7..8b83699feb68993d216e0c641012d3d411f47407 100644 GIT binary patch delta 297 zcmZ1=wLofvA`@435fc*=BLl-y_08%`cNrOHOlD=#W@Thx>@S&Y$zlWKm$7IuzM8y{ z#gg&IWo*?6DA?#%u$2PFMtvLc5FW7A|a4pqj^$uS&#;^qa+ zAPtEb`HUc#1H?deZzeNxD)2X@0C@#KgVR7_{gVwir}3HRG9{)mCuf4Zz~sL93TG%I LMn)NTzoy>|0wh z%d9%S`PTAL@|zW7nfL6~%}L+XXE;hyMCbzs6|q$OL`bEZPi?Kr5FP18qMRTU{lfRQ zFSsxJ8dJ`k3!;L5o#*w3017c$+PbTdAQVi9Oj2y08fgTnse&$@Wg=+Iua)h}N2J#! z*W7swc*9-7B_Fz13(cOX4XV|Jj!07OrVMX!Zg3*1C*V`fDR|AhnQeAR1?F+6U!a|Q M;_U