Skip to content

Commit

Permalink
update plugins - remember to run :TSUpdate if treesitter is updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@DivineGod
DivineGod committed Dec 7, 2022
1 parent 3ba4771 commit 1a83ef5
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 64 deletions.
2 changes: 1 addition & 1 deletion nvim/.config/nvim/lua/user/alpha.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dashboard.section.header.val = {
[[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]],
}
dashboard.section.buttons.val = {
dashboard.button("f", "" .. " Find file", ":Telescope find_files <CR>"),
dashboard.button("f", "" .. " Find file", ":Telescope find_files hidden=true<CR>"),
dashboard.button("e", "" .. " New file", ":ene <BAR> startinsert <CR>"),
dashboard.button("p", "" .. " Find project", ":lua require('telescope').extensions.projects.projects()<CR>"),
dashboard.button("r", "" .. " Recent files", ":Telescope oldfiles <CR>"),
Expand Down
2 changes: 1 addition & 1 deletion nvim/.config/nvim/lua/user/keymaps.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ keymap("v", ">", ">gv", opts)
keymap("n", "<leader>e", ":NvimTreeToggle<CR>", opts)

-- Telescope
keymap("n", "<leader>ff", ":Telescope find_files<CR>", opts)
keymap("n", "<leader>ff", ":Telescope find_files hidden=true<CR>", opts)
keymap("n", "<leader>ft", ":Telescope live_grep<CR>", opts)
keymap("n", "<leader>fp", ":Telescope projects<CR>", opts)
keymap("n", "<leader>fb", ":Telescope buffers<CR>", opts)
Expand Down
2 changes: 1 addition & 1 deletion nvim/.config/nvim/lua/user/lsp/handlers.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ end

M.capabilities = vim.lsp.protocol.make_client_capabilities()
M.capabilities.textDocument.completion.completionItem.snippetSupport = true
M.capabilities = cmp_nvim_lsp.update_capabilities(M.capabilities)
M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities)

M.setup = function()
local signs = {
Expand Down
79 changes: 38 additions & 41 deletions nvim/.config/nvim/lua/user/plugins.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,64 +44,61 @@ packer.init {
-- Install your plugins here
return packer.startup(function(use)
-- My plugins here
use { "wbthomason/packer.nvim", commit = "6afb67460283f0e990d35d229fd38fdc04063e0a" } -- Have packer manage itself
use { "nvim-lua/plenary.nvim", commit = "4b7e52044bbb84242158d977a50c4cbcd85070c7" } -- Useful lua functions used by lots of plugins
use { "windwp/nvim-autopairs", commit = "4fc96c8f3df89b6d23e5092d31c866c53a346347" } -- Autopairs, integrates with both cmp and treesitter
use { "numToStr/Comment.nvim", commit = "97a188a98b5a3a6f9b1b850799ac078faa17ab67" }
use { "JoosepAlviste/nvim-ts-context-commentstring", commit = "32d9627123321db65a4f158b72b757bcaef1a3f4" }
use { "kyazdani42/nvim-web-devicons", commit = "563f3635c2d8a7be7933b9e547f7c178ba0d4352" }
use { "kyazdani42/nvim-tree.lua", commit = "7282f7de8aedf861fe0162a559fc2b214383c51c" }
use { "akinsho/bufferline.nvim", commit = "83bf4dc7bff642e145c8b4547aa596803a8b4dc4" }
use { "moll/vim-bbye", commit = "25ef93ac5a87526111f43e5110675032dbcacf56" }
use { "nvim-lualine/lualine.nvim", commit = "a52f078026b27694d2290e34efa61a6e4a690621" }
use { "akinsho/toggleterm.nvim", commit = "2a787c426ef00cb3488c11b14f5dcf892bbd0bda" }
use { "ahmedkhalf/project.nvim", commit = "685bc8e3890d2feb07ccf919522c97f7d33b94e4" }
use { "lewis6991/impatient.nvim", commit = "b842e16ecc1a700f62adb9802f8355b99b52a5a6" }
use { "lukas-reineke/indent-blankline.nvim", commit = "db7cbcb40cc00fc5d6074d7569fb37197705e7f6" }
use { "goolord/alpha-nvim", commit = "0bb6fc0646bcd1cdb4639737a1cee8d6e08bcc31" }
use { "wbthomason/packer.nvim" } -- , commit = "6afb67460283f0e990d35d229fd38fdc04063e0a" } -- Have packer manage itself
use { "nvim-lua/plenary.nvim" } -- , commit = "4b7e52044bbb84242158d977a50c4cbcd85070c7" } -- Useful lua functions used by lots of plugins
use { "windwp/nvim-autopairs" } -- , commit = "4fc96c8f3df89b6d23e5092d31c866c53a346347" } -- Autopairs, integrates with both cmp and treesitter
use { "numToStr/Comment.nvim" } -- , commit = "97a188a98b5a3a6f9b1b850799ac078faa17ab67" }
use { "JoosepAlviste/nvim-ts-context-commentstring" } -- , commit = "32d9627123321db65a4f158b72b757bcaef1a3f4" }
use { "kyazdani42/nvim-web-devicons" } -- , commit = "563f3635c2d8a7be7933b9e547f7c178ba0d4352" }
use { "kyazdani42/nvim-tree.lua" } -- , commit = "7282f7de8aedf861fe0162a559fc2b214383c51c" }
use { "akinsho/bufferline.nvim" } -- , commit = "83bf4dc7bff642e145c8b4547aa596803a8b4dc4" }
use { "moll/vim-bbye" } -- , commit = "25ef93ac5a87526111f43e5110675032dbcacf56" }
use { "nvim-lualine/lualine.nvim" } -- , commit = "a52f078026b27694d2290e34efa61a6e4a690621" }
use { "akinsho/toggleterm.nvim" } -- , commit = "2a787c426ef00cb3488c11b14f5dcf892bbd0bda" }
use { "ahmedkhalf/project.nvim" } -- , commit = "685bc8e3890d2feb07ccf919522c97f7d33b94e4" }
use { "lewis6991/impatient.nvim" } -- , commit = "b842e16ecc1a700f62adb9802f8355b99b52a5a6" }
use { "lukas-reineke/indent-blankline.nvim" } -- , commit = "db7cbcb40cc00fc5d6074d7569fb37197705e7f6" }
use { "goolord/alpha-nvim" } -- , commit = "0bb6fc0646bcd1cdb4639737a1cee8d6e08bcc31" }

-- Colorschemes
use { "folke/tokyonight.nvim", commit = "66bfc2e8f754869c7b651f3f47a2ee56ae557764" }
use { "lunarvim/darkplus.nvim", commit = "13ef9daad28d3cf6c5e793acfc16ddbf456e1c83" }
use { "ellisonleao/gruvbox.nvim", commit = "9ec1d44d8485e9d4f615bdc41e164169564e9f89" }
use { "folke/tokyonight.nvim" } -- , commit = "66bfc2e8f754869c7b651f3f47a2ee56ae557764" }
use { "lunarvim/darkplus.nvim" } -- , commit = "13ef9daad28d3cf6c5e793acfc16ddbf456e1c83" }
use { "ellisonleao/gruvbox.nvim" } -- , commit = "9ec1d44d8485e9d4f615bdc41e164169564e9f89" }

-- cmp plugins
use { "hrsh7th/nvim-cmp", commit = "b0dff0ec4f2748626aae13f011d1a47071fe9abc" } -- The completion plugin
use { "hrsh7th/cmp-buffer", commit = "3022dbc9166796b644a841a02de8dd1cc1d311fa" } -- buffer completions
use { "hrsh7th/cmp-path", commit = "447c87cdd6e6d6a1d2488b1d43108bfa217f56e1" } -- path completions
use { "saadparwaiz1/cmp_luasnip", commit = "a9de941bcbda508d0a45d28ae366bb3f08db2e36" } -- snippet completions
use { "hrsh7th/cmp-nvim-lsp", commit = "affe808a5c56b71630f17aa7c38e15c59fd648a8" }
use { "hrsh7th/cmp-nvim-lua", commit = "d276254e7198ab7d00f117e88e223b4bd8c02d21" }
use { "hrsh7th/nvim-cmp" } -- , commit = "b0dff0ec4f2748626aae13f011d1a47071fe9abc" } -- The completion plugin
use { "hrsh7th/cmp-buffer" } -- , commit = "3022dbc9166796b644a841a02de8dd1cc1d311fa" } -- buffer completions
use { "hrsh7th/cmp-path" } -- , commit = "447c87cdd6e6d6a1d2488b1d43108bfa217f56e1" } -- path completions
use { "saadparwaiz1/cmp_luasnip" } -- , commit = "a9de941bcbda508d0a45d28ae366bb3f08db2e36" } -- snippet completions
use { "hrsh7th/cmp-nvim-lsp" } -- , commit = "affe808a5c56b71630f17aa7c38e15c59fd648a8" }
use { "hrsh7th/cmp-nvim-lua" } -- , commit = "d276254e7198ab7d00f117e88e223b4bd8c02d21" }

-- snippets
use { "L3MON4D3/LuaSnip", commit = "8f8d493e7836f2697df878ef9c128337cbf2bb84" } --snippet engine
use { "rafamadriz/friendly-snippets", commit = "2be79d8a9b03d4175ba6b3d14b082680de1b31b1" } -- a bunch of snippets to use
use { "L3MON4D3/LuaSnip" } -- , commit = "8f8d493e7836f2697df878ef9c128337cbf2bb84" } --snippet engine
use { "rafamadriz/friendly-snippets" } -- , commit = "2be79d8a9b03d4175ba6b3d14b082680de1b31b1" } -- a bunch of snippets to use

-- LSP
-- use { "williamboman/nvim-lsp-installer", commit = "e9f13d7acaa60aff91c58b923002228668c8c9e6" } -- simple to use language server installer
use { "neovim/nvim-lspconfig", commit = "f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda" } -- enable LSP
use { "williamboman/mason.nvim", commit = "bfc5997e52fe9e20642704da050c415ea1d4775f"}
use { "williamboman/mason-lspconfig.nvim", commit = "0eb7cfefbd3a87308c1875c05c3f3abac22d367c" }
use { "jose-elias-alvarez/null-ls.nvim", commit = "c0c19f32b614b3921e17886c541c13a72748d450" } -- for formatters and linters
use { "RRethy/vim-illuminate", commit = "a2e8476af3f3e993bb0d6477438aad3096512e42" }
use {"simrat39/rust-tools.nvim", commit = "11dcd674781ba68a951ab4c7b740553cae8fe671"}
use { "neovim/nvim-lspconfig" } -- , commit = "f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda" } -- enable LSP
use { "williamboman/mason.nvim" } -- , commit = "bfc5997e52fe9e20642704da050c415ea1d4775f"}
use { "williamboman/mason-lspconfig.nvim" } -- , commit = "0eb7cfefbd3a87308c1875c05c3f3abac22d367c" }
use { "jose-elias-alvarez/null-ls.nvim" } -- , commit = "c0c19f32b614b3921e17886c541c13a72748d450" } -- for formatters and linters
use { "RRethy/vim-illuminate" } -- , commit = "a2e8476af3f3e993bb0d6477438aad3096512e42" }
use {"simrat39/rust-tools.nvim" } -- , commit = "11dcd674781ba68a951ab4c7b740553cae8fe671"}

-- Telescope
use { "nvim-telescope/telescope.nvim", commit = "76ea9a898d3307244dce3573392dcf2cc38f340f" }
use { "nvim-telescope/telescope.nvim" } -- , commit = "76ea9a898d3307244dce3573392dcf2cc38f340f" }

-- Treesitter
use {
"nvim-treesitter/nvim-treesitter",
commit = "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac",
}
use { "nvim-treesitter/nvim-treesitter"} -- , commit = "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac", }

-- Git
use { "lewis6991/gitsigns.nvim", commit = "f98c85e7c3d65a51f45863a34feb4849c82f240f" }
use { "lewis6991/gitsigns.nvim"} -- , commit = "f98c85e7c3d65a51f45863a34feb4849c82f240f" }

-- DAP
use { "mfussenegger/nvim-dap", commit = "6b12294a57001d994022df8acbe2ef7327d30587" }
use { "rcarriga/nvim-dap-ui", commit = "1cd4764221c91686dcf4d6b62d7a7b2d112e0b13" }
use { "ravenxrz/DAPInstall.nvim", commit = "8798b4c36d33723e7bba6ed6e2c202f84bb300de" }
use { "mfussenegger/nvim-dap"} -- , commit = "6b12294a57001d994022df8acbe2ef7327d30587" }
use { "rcarriga/nvim-dap-ui"} -- , commit = "1cd4764221c91686dcf4d6b62d7a7b2d112e0b13" }
use { "ravenxrz/DAPInstall.nvim"} -- , commit = "8798b4c36d33723e7bba6ed6e2c202f84bb300de" }

-- Automatically set up your configuration after cloning packer.nvim
-- Put this at the end after all plugins
Expand Down
6 changes: 3 additions & 3 deletions nvim/.config/nvim/lua/user/telescope.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ telescope.setup {

prompt_prefix = "",
selection_caret = "",
path_display = { "smart" },
--path_display = { "smart" },
file_ignore_patterns = { ".git/", "node_modules" },

vimgrep_arguments = vimgrep_arguments,

pickers = {
find_files = {
-- `hidden = true` will still show the inside of `.git/` as it's not `.gitignore`d.
find_command = { "fd", "--type", "f", "--strip-cwd-prefix" },
hidden = true,
find_command = { "fd", "--type", "f", "--strip-cwd-prefix", "--hidden", "--exclude", ".git"},
},
},

Expand Down
34 changes: 17 additions & 17 deletions nvim/.config/nvim/lua/user/treesitter.lua
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
local status_ok, treesitter = pcall(require, "nvim-treesitter")
if not status_ok then
return
return
end

local status_ok, configs = pcall(require, "nvim-treesitter.configs")
if not status_ok then
return
return
end

configs.setup({
ensure_installed = { "lua", "markdown", "markdown_inline", "bash", "python" }, -- put the language you want in this array
ensure_installed = { "lua", "markdown", "markdown_inline", "bash", "python", "rust" }, -- put the language you want in this array
-- ensure_installed = "all", -- one of "all" or a list of languages
ignore_install = { "" }, -- List of parsers to ignore installing
sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
ignore_install = { "" }, -- List of parsers to ignore installing
sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)

highlight = {
enable = true, -- false will disable the whole extension
disable = { "css" }, -- list of language that will be disabled
},
autopairs = {
enable = true,
},
indent = { enable = true, disable = { "python", "css" } },
enable = true, -- false will disable the whole extension
disable = { "css" }, -- list of language that will be disabled
},
autopairs = {
enable = true,
},
indent = { enable = true, disable = { "python", "css" } },

context_commentstring = {
enable = true,
enable_autocmd = false,
},
context_commentstring = {
enable = true,
enable_autocmd = false,
},

})

0 comments on commit 1a83ef5

Please sign in to comment.