diff --git a/lua/keys.lua b/lua/keys.lua index a1dade4..514ab53 100644 --- a/lua/keys.lua +++ b/lua/keys.lua @@ -1 +1,2 @@ vim.api.nvim_set_keymap("n", "f", "Telescope find_files", {silent = true}) +vim.api.nvim_set_keymap("", "q:", "", {silent = true}) diff --git a/lua/plugins.lua b/lua/plugins.lua index 9af071c..0552385 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -21,7 +21,13 @@ return require("packer").startup( function() -- Packer can manage itself use "wbthomason/packer.nvim" - use "MasterGordon/monokai.nvim" + use { + "MasterGordon/monokai.nvim", + config = function() + require("monokai").setup() + end + } + -- use "folke/tokyonight.nvim" use { "glepnir/galaxyline.nvim", branch = "main", @@ -53,6 +59,10 @@ return require("packer").startup( ) end } + use { + "nvim-treesitter/playground", + requires = {"nvim-treesitter/nvim-treesitter"} + } use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate", @@ -68,7 +78,10 @@ return require("packer").startup( enable_autocmd = true }, highlight = { - enable = true + enable = true, + custom_captures = { + ["jsx_element"] = "TSTag" + } }, indent = { enable = true diff --git a/lua/plugins/galaxyline.lua b/lua/plugins/galaxyline.lua index 0523a82..324a154 100644 --- a/lua/plugins/galaxyline.lua +++ b/lua/plugins/galaxyline.lua @@ -1,9 +1,9 @@ local gl = require("galaxyline") local colors = require("galaxyline.theme").default -local monokai = require("monokai") +local theme = require("monokai") local condition = require("galaxyline.condition") local gls = gl.section -colors.bg = monokai.bg +colors.bg = theme.classic.base3 gl.short_line_list = {"NvimTree", "vista", "dbui", "packer"} gls.left[2] = { diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua index 26aae27..7c7dab6 100644 --- a/lua/plugins/nvim-tree.lua +++ b/lua/plugins/nvim-tree.lua @@ -1,7 +1,7 @@ vim.g.nvim_tree_auto_close = 1 vim.g.nvim_tree_ignore = {".git", "node_modules", ".cache"} vim.g.nvim_tree_indent_markers = 1 -vim.api.nvim_set_keymap("", "", ":NvimTreeFindFile", {}) +vim.api.nvim_set_keymap("", "", ":NvimTreeFindFile", {silent = true}) vim.g.nvim_tree_icons = { default = "",