diff --git a/init.lua b/init.lua index f92e4dc..f401ee9 100755 --- a/init.lua +++ b/init.lua @@ -2,9 +2,7 @@ require('settings') require('keymaps') require('colors') require('plugins/plugins') -require('plugins/indent-blankline') require('plugins/feline') ---require('plugins/nvim-cmp') require('plugins/nvim-lspconfig') require('plugins/nvim-treesitter') require('plugins/telescope') diff --git a/lua/plugins/nvim-cmp.lua b/lua/plugins/nvim-cmp.lua index 03dae4e..75002dc 100644 --- a/lua/plugins/nvim-cmp.lua +++ b/lua/plugins/nvim-cmp.lua @@ -73,7 +73,7 @@ cmp.setup { { name = 'luasnip' }, { name = 'path' }, { name = 'buffer' }, - { name = 'zsh' }, + { name = 'bash' }, }, } diff --git a/lua/plugins/nvim-lspconfig.lua b/lua/plugins/nvim-lspconfig.lua index 4d6adff..1f13f8b 100644 --- a/lua/plugins/nvim-lspconfig.lua +++ b/lua/plugins/nvim-lspconfig.lua @@ -39,7 +39,7 @@ vim.cmd([[ -- Add additional capabilities supported by nvim-cmp -- See: https://github.com/neovim/nvim-lspconfig/wiki/Autocompletion local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = cmp_nvim_lsp.update_capabilities(capabilities) +capabilities = cmp_nvim_lsp.default_capabilities(capabilities) capabilities.textDocument.completion.completionItem.documentationFormat = { 'markdown', 'plaintext' } capabilities.textDocument.completion.completionItem.snippetSupport = true diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index e3c3186..49302fe 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -55,20 +55,10 @@ return require'packer'.startup(function() -- General Functionality ------------------------------------------------------------ - -- Tmux Navigation - use({ - "aserowy/tmux.nvim", - config = function() require("tmux").setup() end -}) - -- Find & Search LSP Tags - use 'liuchengxu/vista.vim' -- Snippets use 'rafamadriz/friendly-snippets' - -- Rename and Work with Buffer & Tabs - use 'pacha/vem-tabline' - -- Trouble Shows Errors with Files. use { "folke/trouble.nvim", @@ -110,8 +100,6 @@ return require'packer'.startup(function() -- Text, Icons, Symbols ---------------------------------------------------------- - use 'lukas-reineke/indent-blankline.nvim' - use 'simrat39/symbols-outline.nvim' use 'kyazdani42/nvim-web-devicons' @@ -139,10 +127,8 @@ return require'packer'.startup(function() ----------------------------------------------------------- -- Various Color Schemes, Dashboard, etc ----------------------------------------------------------- - use 'tanvirtin/monokai.nvim' use 'Mofiqul/dracula.nvim' use 'lunarvim/colorschemes' - use { "catppuccin/nvim", as = "catppuccin" } use { 'feline-nvim/feline.nvim', requires = { 'kyazdani42/nvim-web-devicons' }, diff --git a/lua/settings/init.lua b/lua/settings/init.lua index 5e682cc..3434f62 100755 --- a/lua/settings/init.lua +++ b/lua/settings/init.lua @@ -19,7 +19,7 @@ opt.clipboard = 'unnamedplus' -- Copy/paste to system clipboard opt.swapfile = false -- Don't use swapfile opt.shadafile = "NONE" opt.shadafile = "" -opt.shell = "/bin/zsh" +opt.shell = "/bin/bash" opt.updatetime = 200 opt.cursorline = true g.markdown_folding = 1 @@ -48,7 +48,7 @@ opt.synmaxcol = 240 -- Max column for syntax highlight -- Colorscheme ----------------------------------------------------------- opt.termguicolors = true -- Enable 24-bit RGB colors -cmd [[colorscheme catppuccin-macchiato]] +cmd [[colorscheme dracula]] ----------------------------------------------------------- -- Tabs, indent ----------------------------------------------------------- diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index e2064a1..7f3c496 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -79,11 +79,6 @@ _G.packer_plugins = { path = "/root/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, - catppuccin = { - loaded = true, - path = "/root/.local/share/nvim/site/pack/packer/start/catppuccin", - url = "https://github.com/catppuccin/nvim" - }, ["cmp-buffer"] = { loaded = true, path = "/root/.local/share/nvim/site/pack/packer/start/cmp-buffer", @@ -134,11 +129,6 @@ _G.packer_plugins = { path = "/root/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", url = "https://github.com/lewis6991/gitsigns.nvim" }, - ["indent-blankline.nvim"] = { - loaded = true, - path = "/root/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim", - url = "https://github.com/lukas-reineke/indent-blankline.nvim" - }, ["mason-lspconfig.nvim"] = { loaded = true, path = "/root/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", @@ -149,11 +139,6 @@ _G.packer_plugins = { path = "/root/.local/share/nvim/site/pack/packer/start/mason.nvim", url = "https://github.com/williamboman/mason.nvim" }, - ["monokai.nvim"] = { - loaded = true, - path = "/root/.local/share/nvim/site/pack/packer/start/monokai.nvim", - url = "https://github.com/tanvirtin/monokai.nvim" - }, ["neoscroll.nvim"] = { loaded = true, path = "/root/.local/share/nvim/site/pack/packer/start/neoscroll.nvim", @@ -232,33 +217,17 @@ _G.packer_plugins = { path = "/root/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, - ["tmux.nvim"] = { - config = { "\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" }, - loaded = true, - path = "/root/.local/share/nvim/site/pack/packer/start/tmux.nvim", - url = "https://github.com/aserowy/tmux.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 = "/root/.local/share/nvim/site/pack/packer/start/trouble.nvim", url = "https://github.com/folke/trouble.nvim" }, - ["vem-tabline"] = { - loaded = true, - path = "/root/.local/share/nvim/site/pack/packer/start/vem-tabline", - url = "https://github.com/pacha/vem-tabline" - }, ["vim-wakatime"] = { loaded = true, path = "/root/.local/share/nvim/site/pack/packer/start/vim-wakatime", url = "https://github.com/wakatime/vim-wakatime" }, - ["vista.vim"] = { - loaded = true, - path = "/root/.local/share/nvim/site/pack/packer/start/vista.vim", - url = "https://github.com/liuchengxu/vista.vim" - }, ["which-key.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\14which-key\frequire\0" }, loaded = true, @@ -272,26 +241,22 @@ time([[Defining packer_plugins]], false) 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) --- 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: 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") time([[Config for telescope.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: 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\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: 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) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then