diff --git a/init.lua b/init.lua index 20119b7..d8a4361 100755 --- a/init.lua +++ b/init.lua @@ -13,6 +13,5 @@ require('plugins/symbols-outline') require('plugins/mason-lspconfig') require('plugins/snippets') require('plugins/neoscroll') -require('plugins/marks') require('plugins/null-ls') require('plugins/nvim-mapper') diff --git a/lua/plugins/headlines.lua b/lua/plugins/headlines.lua deleted file mode 100644 index 6c3aed1..0000000 --- a/lua/plugins/headlines.lua +++ /dev/null @@ -1,124 +0,0 @@ -require("headlines").setup { - markdown = { - query = vim.treesitter.parse_query( - "markdown", - [[ - (atx_heading [ - (atx_h1_marker) - (atx_h2_marker) - (atx_h3_marker) - (atx_h4_marker) - (atx_h5_marker) - (atx_h6_marker) - ] @headline) - - (thematic_break) @dash - - (fenced_code_block) @codeblock - - (block_quote_marker) @quote - (block_quote (paragraph (inline (block_continuation) @quote))) - ]] - ), - headline_highlights = { "Headline" }, - codeblock_highlight = "CodeBlock", - dash_highlight = "Dash", - dash_string = "-", - quote_highlight = "Quote", - quote_string = "┃", - fat_headlines = true, - }, - rmd = { - query = vim.treesitter.parse_query( - "markdown", - [[ - (atx_heading [ - (atx_h1_marker) - (atx_h2_marker) - (atx_h3_marker) - (atx_h4_marker) - (atx_h5_marker) - (atx_h6_marker) - ] @headline) - - (thematic_break) @dash - - (fenced_code_block) @codeblock - - (block_quote_marker) @quote - (block_quote (paragraph (inline (block_continuation) @quote))) - ]] - ), - treesitter_language = "markdown", - headline_highlights = { "Headline" }, - codeblock_highlight = "CodeBlock", - dash_highlight = "Dash", - dash_string = "-", - quote_highlight = "Quote", - quote_string = "┃", - fat_headlines = true, - }, - norg = { - query = vim.treesitter.parse_query( - "norg", - [[ - [ - (heading1_prefix) - (heading2_prefix) - (heading3_prefix) - (heading4_prefix) - (heading5_prefix) - (heading6_prefix) - ] @headline - - (weak_paragraph_delimiter) @dash - (strong_paragraph_delimiter) @doubledash - - ((ranged_tag - name: (tag_name) @_name - (#eq? @_name "code") - ) @codeblock (#offset! @codeblock 0 0 1 0)) - - (quote1_prefix) @quote - ]] - ), - headline_highlights = { "Headline" }, - codeblock_highlight = "CodeBlock", - dash_highlight = "Dash", - dash_string = "-", - doubledash_highlight = "DoubleDash", - doubledash_string = "=", - quote_highlight = "Quote", - quote_string = "┃", - fat_headlines = true, - }, - org = { - query = vim.treesitter.parse_query( - "org", - [[ - (headline (stars) @headline) - - ( - (expr) @dash - (#match? @dash "^-----+$") - ) - - (block - name: (expr) @_name - (#eq? @_name "SRC") - ) @codeblock - - (paragraph . (expr) @quote - (#eq? @quote ">") - ) - ]] - ), - headline_highlights = { "Headline" }, - codeblock_highlight = "CodeBlock", - dash_highlight = "Dash", - dash_string = "-", - quote_highlight = "Quote", - quote_string = "┃", - fat_headlines = true, - }, -} diff --git a/lua/plugins/marks.lua b/lua/plugins/marks.lua deleted file mode 100644 index b217b0a..0000000 --- a/lua/plugins/marks.lua +++ /dev/null @@ -1,31 +0,0 @@ -require'marks'.setup { - -- whether to map keybinds or not. default true - default_mappings = true, - -- which builtin marks to show. default {} - builtin_marks = { ".", "<", ">", "^" }, - -- whether movements cycle back to the beginning/end of buffer. default true - cyclic = true, - -- whether the shada file is updated after modifying uppercase marks. default false - force_write_shada = false, - -- how often (in ms) to redraw signs/recompute mark positions. - -- higher values will have better performance but may cause visual lag, - -- while lower values may cause performance penalties. default 150. - refresh_interval = 250, - -- sign priorities for each type of mark - builtin marks, uppercase marks, lowercase - -- marks, and bookmarks. - -- can be either a table with all/none of the keys, or a single number, in which case - -- the priority applies to all marks. - -- default 10. - sign_priority = { lower=10, upper=15, builtin=8, bookmark=20 }, - -- disables mark tracking for specific filetypes. default {} - excluded_filetypes = {}, - -- marks.nvim allows you to configure up to 10 bookmark groups, each with its own - -- sign/virttext. Bookmarks can be used to group together positions and quickly move - -- across multiple buffers. default sign is '!@#$%^&*()' (from 0 to 9), and - -- default virt_text is "". - bookmark_0 = { - sign = "⚑", - virt_text = "hello world" - }, - mappings = {} -} diff --git a/lua/plugins/nvim-lspconfig.lua b/lua/plugins/nvim-lspconfig.lua index e989aaa..4d6adff 100644 --- a/lua/plugins/nvim-lspconfig.lua +++ b/lua/plugins/nvim-lspconfig.lua @@ -127,7 +127,7 @@ end -- Use a loop to conveniently call 'setup' on multiple servers and -- map buffer local keybindings when the language server attaches. -- Add your language server below: -local servers = { 'bashls', 'pyright', 'clangd', 'html', 'cssls', 'tsserver', 'jedi-language-server' } +local servers = { 'bashls', 'pyright', 'yamlls', 'sumneko_lua' } -- Call setup for _, lsp in ipairs(servers) do diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua deleted file mode 100644 index df90ada..0000000 --- a/lua/plugins/nvim-tree.lua +++ /dev/null @@ -1,30 +0,0 @@ ------------------------------------------------------------ --- File manager configuration file ------------------------------------------------------------ - --- Plugin: nvim-tree --- url: https://github.com/kyazdani42/nvim-tree.lua - ---- Keybindings are defined in `keymapping.lua`: ---- https://github.com/kyazdani42/nvim-tree.lua#keybindings - ---- Note: options under the g: command should be set BEFORE running the ---- setup function: https://github.com/kyazdani42/nvim-tree.lua#setup ---- See: `help NvimTree` -local g = vim.g - -require('nvim-tree').setup { - open_on_setup = true, - update_cwd = true, - filters = { - dotfiles = true, - custom = { '.git', 'node_modules', '.cache', '.bin' }, - }, - git = { - enable = true, - ignore = true, - }, - view = { - width = 37, - }, -} diff --git a/lua/plugins/nvim-treesitter.lua b/lua/plugins/nvim-treesitter.lua index ad145f6..79666a3 100644 --- a/lua/plugins/nvim-treesitter.lua +++ b/lua/plugins/nvim-treesitter.lua @@ -15,8 +15,7 @@ end nvim_treesitter.setup { -- A list of parser names, or "all" ensure_installed = { - 'bash', 'css', 'html', 'javascript', 'json', 'lua', 'python', - 'vim', 'yaml', 'typescript', + 'bash', 'json', 'lua', 'python', 'vim', 'yaml', 'typescript', 'gitcommit', 'dockerfile', 'regex', }, -- Install parsers synchronously (only applied to `ensure_installed`) sync_install = false, diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index f938c5a..e3c3186 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -36,7 +36,7 @@ return require'packer'.startup(function() } use ({ - 'L3MON4D3/LuaSnip', tag = "v.*", + 'L3MON4D3/LuaSnip', tag = "v1.1.0", requires = { 'saadparwaiz1/cmp_luasnip' } @@ -69,9 +69,6 @@ return require'packer'.startup(function() -- Rename and Work with Buffer & Tabs use 'pacha/vem-tabline' - -- Nvim Tree File Manager on the Left - use 'kyazdani42/nvim-tree.lua' - -- Trouble Shows Errors with Files. use { "folke/trouble.nvim", diff --git a/lua/plugins/prettier.lua b/lua/plugins/prettier.lua deleted file mode 100644 index 817da0c..0000000 --- a/lua/plugins/prettier.lua +++ /dev/null @@ -1,38 +0,0 @@ -local prettier = require("prettier") - -prettier.setup({ - bin = 'prettier', -- or `prettierd` - filetypes = { - "css", - "graphql", - "html", - "javascript", - "javascriptreact", - "json", - "less", - "markdown", - "scss", - "typescript", - "typescriptreact", - "yaml", - "python", - }, - - -- 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 b314bd9..76999dc 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -191,11 +191,6 @@ _G.packer_plugins = { path = "/root/.local/share/nvim/site/pack/packer/start/nvim-notify", url = "https://github.com/rcarriga/nvim-notify" }, - ["nvim-tree.lua"] = { - loaded = true, - path = "/root/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", - url = "https://github.com/kyazdani42/nvim-tree.lua" - }, ["nvim-treesitter"] = { loaded = true, path = "/root/.local/share/nvim/site/pack/packer/start/nvim-treesitter", @@ -273,10 +268,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\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) +-- Config for: tmux.nvim +time([[Config for tmux.nvim]], true) +try_loadstring("\27LJ\2\n2\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\ttmux\frequire\0", "config", "tmux.nvim") +time([[Config for tmux.nvim]], false) -- Config for: which-key.nvim time([[Config for which-key.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\14which-key\frequire\0", "config", "which-key.nvim") time([[Config for which-key.nvim]], false) +-- Config for: nvim-mapper +time([[Config for nvim-mapper]], 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\16nvim-mapper\frequire\0", "config", "nvim-mapper") +time([[Config for nvim-mapper]], false) -- Config for: telescope.nvim time([[Config for telescope.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\14telescope\frequire\0", "config", "telescope.nvim") @@ -285,18 +292,6 @@ time([[Config for telescope.nvim]], false) 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\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") -time([[Config for nvim-autopairs]], false) --- Config for: nvim-mapper -time([[Config for nvim-mapper]], 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\16nvim-mapper\frequire\0", "config", "nvim-mapper") -time([[Config for nvim-mapper]], false) --- Config for: tmux.nvim -time([[Config for tmux.nvim]], true) -try_loadstring("\27LJ\2\n2\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\ttmux\frequire\0", "config", "tmux.nvim") -time([[Config for tmux.nvim]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then