diff --git a/lua/basics.lua b/lua/basics.lua index b12602d..10e09d1 100644 --- a/lua/basics.lua +++ b/lua/basics.lua @@ -21,4 +21,4 @@ set.splitbelow = true set.signcolumn = "auto:2" -- set leader -vim.g.mapleader = "," +vim.g.mapleader = " " diff --git a/lua/plugins.lua2 b/lua/plugins.lua2 deleted file mode 100644 index 9f9444e..0000000 --- a/lua/plugins.lua2 +++ /dev/null @@ -1,177 +0,0 @@ -local execute = vim.api.nvim_command -local fn = vim.fn --- ensure that packer is installed -local install_path = fn.stdpath("data") .. "/site/pack/packer/opt/packer.nvim" -if fn.empty(fn.glob(install_path)) > 0 then -end -vim.cmd("packadd packer.nvim") -local packer = require "packer" - -packer.init( - { - package_root = util.join_paths(vim.fn.stdpath("data"), "site", "pack") - } -) -hello! - -return require("packer").startup( - function() - -- Packer can manage itself - use "wbthomason/packer.nvim" - use { - "MasterGordon/monokai.nvim", - config = function() - require("monokai").setup() - end - } - use { - "glepnir/galaxyline.nvim", - branch = "main", - config = function() - require "plugins/galaxyline" - end, - requires = {"kyazdani42/nvim-web-devicons"} - } - use { - "kyazdani42/nvim-tree.lua", - config = function() - require "plugins/nvim-tree" - end, - requires = {"kyazdani42/nvim-web-devicons", opt = true} - } - use "JoosepAlviste/nvim-ts-context-commentstring" - use { - "b3nj5m1n/kommentary", - config = function() - require("kommentary.config").configure_language( - "typescriptreact", - { - single_line_comment_string = "auto", - multi_line_comment_strings = "auto", - hook_function = function() - require("ts_context_commentstring.internal").update_commentstring() - end - } - ) - end - } - use { - "nvim-treesitter/playground", - requires = {"nvim-treesitter/nvim-treesitter"} - } - use { - "nvim-treesitter/nvim-treesitter", - run = ":TSUpdate", - config = function() - require("nvim-autopairs").setup( - { - enable_check_bracket_line = true - } - ) - require "nvim-treesitter.configs".setup { - context_commentstring = { - enable = true, - enable_autocmd = true - }, - highlight = { - enable = true, - custom_captures = { - ["jsx_element"] = "TSTag" - } - }, - indent = { - enable = true - }, - autotag = { - enable = true - } - } - end, - requires = {"JoosepAlviste/nvim-ts-context-commentstring", "windwp/nvim-ts-autotag", "windwp/nvim-autopairs"} - } - use { - "mhartington/formatter.nvim", - config = function() - require "plugins/formatter" - end - } - use { - "mhinz/vim-signify", - config = function() - require "plugins/signify" - end - } - use { - "RishabhRD/nvim-lsputils", - requires = {"RishabhRD/popfix"} - } - use { - "neovim/nvim-lspconfig", - config = function() - require "plugins/lsp" - end, - requires = { - "RishabhRD/nvim-lsputils", - "onsails/lspkind-nvim", - "ray-x/lsp_signature.nvim", - "jose-elias-alvarez/nvim-lsp-ts-utils" - } - } - use { - "hrsh7th/nvim-compe", - config = function() - require "plugins/compe" - end - } - use { - "nvim-telescope/telescope.nvim", - requires = {"nvim-lua/popup.nvim", "nvim-lua/plenary.nvim"} - } - use { - "nacro90/numb.nvim", - config = function() - require("numb").setup() - end - } - use { - "norcalli/nvim-colorizer.lua", - config = function() - require "colorizer".setup() - end - } - use { - "sindrets/diffview.nvim", - config = function() - require "plugins/diffview" - end - } - use { - "akinsho/nvim-bufferline.lua", - config = function() - require "plugins/bufferline" - end, - requires = "kyazdani42/nvim-web-devicons" - } - use { - "lewis6991/spellsitter.nvim", - config = function() - require("spellsitter").setup() - end - } - use { - "rcarriga/vim-ultest", - config = function() - require "plugins/ultest" - end, - requires = {"vim-test/vim-test"}, - run = ":UpdateRemotePlugins" - } - use { - "vuki656/package-info.nvim", - config = function() - require("package-info").setup() - end - } - use {"npxbr/glow.nvim", run = "GlowInstall"} - end -) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 9ded307..55d32a8 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -70,11 +70,6 @@ require "lspconfig".efm.setup { local nvim_lsp = require("lspconfig") local on_attach = function(client, bufnr) - require "lsp_signature".on_attach( - { - hint_enable = false - } - ) local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end @@ -92,7 +87,7 @@ local on_attach = function(client, bufnr) buf_set_keymap("n", "wa", "lua vim.lsp.buf.add_workspace_folder()", opts) buf_set_keymap("n", "wr", "lua vim.lsp.buf.remove_workspace_folder()", opts) buf_set_keymap("n", "wl", "lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))", opts) - buf_set_keymap("n", "t", "lua vim.lsp.buf.type_definition()", opts) + -- buf_set_keymap("n", "t", "lua vim.lsp.buf.type_definition()", opts) buf_set_keymap("n", "", "lua vim.lsp.buf.rename()", opts) buf_set_keymap("n", "a", "lua vim.lsp.buf.code_action()", opts) buf_set_keymap("n", "gr", "lua vim.lsp.buf.references()", opts) diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua index 7c7dab6..7508529 100644 --- a/lua/plugins/nvim-tree.lua +++ b/lua/plugins/nvim-tree.lua @@ -11,7 +11,9 @@ vim.g.nvim_tree_icons = { staged = "✓", unmerged = "", renamed = "➜", - untracked = "★" + untracked = "★", + deleted = "", + ignored = "◌" }, folder = { default = "",