diff --git a/init.lua b/init.lua index eaba5b9..ce9756e 100755 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ require('plugins/indent-blankline') require('plugins/feline') require('plugins/vista') require('plugins/nvim-cmp') -require('plugins/nvim-lspconfig') +--require('plugins/nvim-lspconfig') require('plugins/nvim-treesitter') require('plugins/alpha-nvim') require('plugins/symbols-outline') @@ -16,4 +16,4 @@ require('plugins/neoscroll') require('plugins/marks') require('plugins/toggleterm') require('plugins/_mkdx') -require('plugins/mkdnflow') +--require('plugins/mkdnflow') diff --git a/lua/keymaps.lua b/lua/keymaps.lua index f3df427..45966ef 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -42,6 +42,8 @@ map('n', '', '- [ ] ', default_opts) --map('n','x', '~~~', default_opts) -- Vim Tmux Navigator +-- Not necessary as Ctrl+b and Arrow Keys lets you move between panes +--map('n', '+', ':TmuxNavigateUp', default_opts) --map('n', '-', ':TmuxNavigateDown', default_opts) -map('n', '[', ':TmuxNavigateLeft', default_opts) -map('n', ']', ':TmuxNavigateRight', default_opts) +--map('n', '[', ':TmuxNavigateLeft', default_opts) +--map('n', ']', ':TmuxNavigateRight', default_opts) diff --git a/lua/plugins/mkdnflow.lua b/lua/plugins/mkdnflow.lua deleted file mode 100644 index e83d8bb..0000000 --- a/lua/plugins/mkdnflow.lua +++ /dev/null @@ -1,71 +0,0 @@ --- ** DEFAULT SETTINGS; TO USE THESE, PASS AN EMPTY TABLE TO THE SETUP FUNCTION ** -require('mkdnflow').setup({ - filetypes = {md = true, rmd = true, markdown = true}, - create_dirs = true, - perspective = { - priority = 'first', - fallback = 'current', - root_tell = false, - nvim_wd_heel = true - }, - wrap = false, - bib = { - default_path = nil, - find_in_root = true - }, - silent = false, - links = { - style = 'markdown', - conceal = false, - implicit_extension = nil, - transform_implicit = false, - transform_explicit = function(text) - text = text:gsub(" ", "-") - text = text:lower() - text = os.date('%Y-%m-%d_')..text - return(text) - end - }, - to_do = { - symbols = {' ', '-', 'X'}, - update_parents = true, - not_started = ' ', - in_progress = '-', - complete = 'X' - }, - tables = { - trim_whitespace = true, - format_on_move = true - }, - use_mappings_table = true, - mappings = { - MkdnNextLink = {'n', ''}, - MkdnPrevLink = {'n', ''}, - MkdnNextHeading = {'n', ']'}, - MkdnPrevHeading = {'n', '['}, - MkdnGoBack = {'n', ''}, - MkdnGoForward = {'n', ''}, - MkdnFollowLink = {{'n', 'v'}, ''}, - MkdnDestroyLink = {'n', ''}, - MkdnMoveSource = {'n', ''}, - MkdnYankAnchorLink = {'n', 'ya'}, - MkdnYankFileAnchorLink = {'n', 'yfa'}, - MkdnIncreaseHeading = {'n', '+'}, - MkdnDecreaseHeading = {'n', '-'}, - MkdnToggleToDo = {{'n', 'v'}, ''}, - MkdnNewListItem = false, - MkdnExtendList = false, - MkdnUpdateNumbering = {'n', 'nn'}, - MkdnTableNextCell = {'i', 'nc'}, - MkdnTablePrevCell = {'i', 'pc'}, - MkdnTableNextRow = false, - MkdnTablePrevRow = {'i', ''}, - MkdnTableNewRowBelow = {{'n', 'i'}, 'ir'}, - MkdnTableNewRowAbove = {{'n', 'i'}, 'iR'}, - MkdnTableNewColAfter = {{'n', 'i'}, 'ic'}, - MkdnTableNewColBefore = {{'n', 'i'}, 'iC'}, - MkdnCR = false, - MkdnTab = false, - MkdnSTab = false - } -}) diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua index e85a82a..df90ada 100644 --- a/lua/plugins/nvim-tree.lua +++ b/lua/plugins/nvim-tree.lua @@ -25,7 +25,6 @@ require('nvim-tree').setup { ignore = true, }, view = { - width = 32, - auto_resize = true + width = 37, }, } diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index 7e1a21e..ca75f75 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -15,13 +15,26 @@ return require'packer'.startup(function() use 'SidOfc/mkdx' -- Markdown Flow - use { + --[[use { "jakewvincent/mkdnflow.nvim", config = function() require('mkdnflow').setup() end - } + }]]-- + + use({ + 'jakewvincent/mkdnflow.nvim', + config = function() + require('mkdnflow').setup({ + MkdnToggleToDo = {{'n', 'v'}, ''}, + MkdnNewListItem = {{'n','v'}, ''}, + MkdnNextLink = false, + MkdnPrevLink = false, + }) + end +}) -- Headlines Extension + use 'lukas-reineke/headlines.nvim' -- Follow MD Links @@ -35,7 +48,10 @@ return require'packer'.startup(function() -- I don't know what polygot does or if I need it. -- use 'sheerun/vim-polyglot' - + + -- Rename and Work with Buffer & Tabs + use 'pacha/vem-tabline' + use 'tjdevries/colorbuddy.nvim' use 'bkegley/gloombuddy' diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index d7aae7b..444bc96 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -190,7 +190,7 @@ _G.packer_plugins = { url = "https://github.com/chentoast/marks.nvim" }, ["mkdnflow.nvim"] = { - config = { "\27LJ\2\n:\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\rmkdnflow\frequire\0" }, + config = { "\27LJ\2\nĀ\1\0\0\5\0\n\0\0156\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\5\0005\3\4\0005\4\3\0>\4\1\3=\3\6\0025\3\b\0005\4\a\0>\4\1\3=\3\t\2B\0\2\1K\0\1\0\20MkdnNewListItem\1\3\0\0\0\n\1\3\0\0\6n\6v\19MkdnToggleToDo\1\0\2\17MkdnPrevLink\1\17MkdnNextLink\1\1\3\0\0\0\14\1\3\0\0\6n\6v\nsetup\rmkdnflow\frequire\0" }, loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/mkdnflow.nvim", url = "https://github.com/jakewvincent/mkdnflow.nvim" @@ -272,7 +272,7 @@ _G.packer_plugins = { url = "https://github.com/simrat39/symbols-outline.nvim" }, ["toggleterm.nvim"] = { - config = { "\27LJ\2\nY\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\nshell\24/usr/bin/local/fish\nsetup\15toggleterm\frequire\0" }, + config = { "\27LJ\2\nX\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\nshell\23/usr/bin/local/zsh\nsetup\15toggleterm\frequire\0" }, loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/toggleterm.nvim", url = "https://github.com/akinsho/toggleterm.nvim" @@ -282,6 +282,11 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/tokyonight.nvim", url = "https://github.com/folke/tokyonight.nvim" }, + ["vem-tabline"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/vem-tabline", + url = "https://github.com/pacha/vem-tabline" + }, ["vim-prettier"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/vim-prettier", @@ -311,11 +316,11 @@ try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K time([[Config for nvim-autopairs]], false) -- Config for: toggleterm.nvim time([[Config for toggleterm.nvim]], true) -try_loadstring("\27LJ\2\nY\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\nshell\24/usr/bin/local/fish\nsetup\15toggleterm\frequire\0", "config", "toggleterm.nvim") +try_loadstring("\27LJ\2\nX\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\nshell\23/usr/bin/local/zsh\nsetup\15toggleterm\frequire\0", "config", "toggleterm.nvim") time([[Config for toggleterm.nvim]], false) -- Config for: mkdnflow.nvim time([[Config for mkdnflow.nvim]], true) -try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") +try_loadstring("\27LJ\2\nĀ\1\0\0\5\0\n\0\0156\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\5\0005\3\4\0005\4\3\0>\4\1\3=\3\6\0025\3\b\0005\4\a\0>\4\1\3=\3\t\2B\0\2\1K\0\1\0\20MkdnNewListItem\1\3\0\0\0\n\1\3\0\0\6n\6v\19MkdnToggleToDo\1\0\2\17MkdnPrevLink\1\17MkdnNextLink\1\1\3\0\0\0\14\1\3\0\0\6n\6v\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") time([[Config for mkdnflow.nvim]], false) if should_profile then save_profiles() end