diff --git a/init.lua b/init.lua index ce9756e..356d969 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/prettier') require('plugins/nvim-treesitter') require('plugins/alpha-nvim') require('plugins/symbols-outline') @@ -15,5 +15,4 @@ require('plugins/nvim-lsp-installer') require('plugins/neoscroll') require('plugins/marks') require('plugins/toggleterm') -require('plugins/_mkdx') ---require('plugins/mkdnflow') +require('plugins/null-ls') diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 45966ef..bcdf082 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -15,11 +15,12 @@ map('n', '', 'j', default_opts) map('n', '', 'k', default_opts) map('n', '', 'l', default_opts) --- Neovim Tab Navigation +-- Neovim Tab Navgation via Vem-Tabline map('n', 't', ':tabnew', default_opts) -map('n', 'w', ':-tabnext', default_opts) -map('n', 'e', ':+tabnext', default_opts) -map('n', 'r', ':tabclose', default_opts) +map('n', 'e', ':bnext', default_opts) +map('n', 'w', ':bprev', default_opts) +map('n', 'r', 'vem_move_buffer_right', default_opts) +map('n', 'q', 'vem_move_buffer_left', default_opts) ----------------------------------------------------------- -- Applications and Plugins shortcuts diff --git a/lua/plugins/_mkdx.lua b/lua/plugins/_mkdx.lua deleted file mode 100644 index f2fe74e..0000000 --- a/lua/plugins/_mkdx.lua +++ /dev/null @@ -1,17 +0,0 @@ -local cmd = vim.cmd -local g = vim.g - -g['mkdx#settings.highlight.enable'] = 1 - -cmd [[ - let g:mkdx#settings = { - \ 'highlight': { 'enable': 1 }, - \ 'map': { 'prefix': '<=>' }, - \ 'enter': { 'shift': 1, 'enable': 1 }, - \ 'links': { 'external': { 'enable': 1 }, 'fragment': { 'jumplist': 1 } }, - \ 'toc': { 'text': 'Table of Contents', 'update_on_write': 1}, - \ 'fold': { 'enable': 1 }, - \ 'checkbox': { 'toggles': [' ', '-', 'X' ] }, - \ } -]] - diff --git a/lua/plugins/null-ls.lua b/lua/plugins/null-ls.lua new file mode 100644 index 0000000..d375d63 --- /dev/null +++ b/lua/plugins/null-ls.lua @@ -0,0 +1,15 @@ +local null_ls = require("null-ls") + +null_ls.setup({ + on_attach = function(client, bufnr) + if client.resolved_capabilities.document_formatting then + vim.cmd("nnoremap f :lua vim.lsp.buf.formatting()") + -- format on save + vim.cmd("autocmd BufWritePost lua vim.lsp.buf.formatting()") + end + + if client.resolved_capabilities.document_range_formatting then + vim.cmd("xnoremap f :lua vim.lsp.buf.range_formatting({})") + end + end, +}) diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index ca75f75..ffd33ea 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -11,17 +11,6 @@ return require'packer'.startup(function() -- Nvim Tree File Manager on the Left use 'kyazdani42/nvim-tree.lua' - -- Markdown Extension for Customizable Keymappings - use 'SidOfc/mkdx' - - -- Markdown Flow - --[[use { - "jakewvincent/mkdnflow.nvim", - config = function() - require('mkdnflow').setup() - end - }]]-- - use({ 'jakewvincent/mkdnflow.nvim', config = function() @@ -34,7 +23,6 @@ return require'packer'.startup(function() end }) -- Headlines Extension - use 'lukas-reineke/headlines.nvim' -- Follow MD Links @@ -45,19 +33,25 @@ return require'packer'.startup(function() -- Treesitter Language Stuff use 'nvim-treesitter/nvim-treesitter' - - -- 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' + + -- Null-LS + use'jose-elias-alvarez/null-ls.nvim' - use 'tjdevries/colorbuddy.nvim' - - use 'bkegley/gloombuddy' - - use {'prettier/vim-prettier', run = 'yarn install' } + -- Prettier Plugin for Neovim specifically + use'MunifTanjim/prettier.nvim' + -- Trouble Shows Errors with Files. + use { + "folke/trouble.nvim", + requires = "kyazdani42/nvim-web-devicons", + config = function() + require("trouble").setup { + } + end +} use 'lukas-reineke/indent-blankline.nvim' use 'simrat39/symbols-outline.nvim' @@ -72,7 +66,12 @@ return require'packer'.startup(function() -- Allow Popups for Telescope etc use 'nvim-lua/popup.nvim' - -- Various Color Schemes + +----------------------------------------------------------- +-- Various Color Schemes +----------------------------------------------------------- + use 'tjdevries/colorbuddy.nvim' + use 'bkegley/gloombuddy' use 'tanvirtin/monokai.nvim' use 'Mofiqul/dracula.nvim' use 'lunarvim/colorschemes' diff --git a/lua/plugins/prettier.lua b/lua/plugins/prettier.lua new file mode 100644 index 0000000..3193925 --- /dev/null +++ b/lua/plugins/prettier.lua @@ -0,0 +1,37 @@ +local prettier = require("prettier") + +prettier.setup({ + bin = 'prettier', -- or `prettierd` + filetypes = { + "css", + "graphql", + "html", + "javascript", + "javascriptreact", + "json", + "less", + "markdown", + "scss", + "typescript", + "typescriptreact", + "yaml", + }, + + -- prettier format options (you can use config files too. ex: `.prettierrc`) + arrow_parens = "always", + bracket_spacing = true, + embedded_language_formatting = "auto", + end_of_line = "lf", + html_whitespace_sensitivity = "css", + jsx_bracket_same_line = false, + jsx_single_quote = false, + print_width = 80, + prose_wrap = "preserve", + quote_props = "as-needed", + semi = true, + single_quote = false, + tab_width = 2, + trailing_comma = "es5", + use_tabs = false, + vue_indent_script_and_style = false, +}) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 444bc96..f39ca26 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -190,16 +190,11 @@ _G.packer_plugins = { url = "https://github.com/chentoast/marks.nvim" }, ["mkdnflow.nvim"] = { - 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" }, + 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\17MkdnNextLink\1\17MkdnPrevLink\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" }, - mkdx = { - loaded = true, - path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/mkdx", - url = "https://github.com/SidOfc/mkdx" - }, ["monokai.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/monokai.nvim", @@ -210,6 +205,11 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/neoscroll.nvim", url = "https://github.com/karb94/neoscroll.nvim" }, + ["null-ls.nvim"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/null-ls.nvim", + url = "https://github.com/jose-elias-alvarez/null-ls.nvim" + }, ["nvim-autopairs"] = { config = { "\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\0\1\0\nsetup\19nvim-autopairs\frequire\0" }, loaded = true, @@ -261,6 +261,11 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/popup.nvim", url = "https://github.com/nvim-lua/popup.nvim" }, + ["prettier.nvim"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/prettier.nvim", + url = "https://github.com/MunifTanjim/prettier.nvim" + }, ["rose-pine"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/rose-pine", @@ -282,16 +287,17 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/tokyonight.nvim", url = "https://github.com/folke/tokyonight.nvim" }, + ["trouble.nvim"] = { + config = { "\27LJ\2\n9\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\ftrouble\frequire\0" }, + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/trouble.nvim", + url = "https://github.com/folke/trouble.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", - url = "https://github.com/prettier/vim-prettier" - }, ["vim-tmux-navigator"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator", @@ -310,18 +316,22 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: nvim-autopairs -time([[Config for nvim-autopairs]], true) -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\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") -time([[Config for nvim-autopairs]], false) -- Config for: toggleterm.nvim time([[Config for toggleterm.nvim]], true) 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Ā\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") +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\17MkdnNextLink\1\17MkdnPrevLink\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) +-- Config for: trouble.nvim +time([[Config for trouble.nvim]], true) +try_loadstring("\27LJ\2\n9\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\ftrouble\frequire\0", "config", "trouble.nvim") +time([[Config for trouble.nvim]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +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\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) if should_profile then save_profiles() end end)