diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index fbb5b26..ff3f4bc 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,11 +1,8 @@ return { - "briones-gabriel/darcula-solid.nvim", - dependencies = { - "rktjmp/lush.nvim", - }, - lazy = false, -- make sure we load this during startup if it is your main colorscheme - priority = 1000, -- make sure to load this before all the other start plugins + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, config = function() - vim.cmd([[colorscheme darcula-solid]]) + vim.cmd([[colorscheme tokyonight]]) end, } diff --git a/lua/plugins/formatters.lua b/lua/plugins/formatters.lua index 40ac662..8a2a37e 100644 --- a/lua/plugins/formatters.lua +++ b/lua/plugins/formatters.lua @@ -11,6 +11,7 @@ return { javascriptreact = { "prettier" }, typescriptreact = { "prettier" }, css = { "prettier" }, + scss = { "prettier" }, html = { "prettier" }, json = { "prettier" }, yaml = { "prettier" }, diff --git a/lua/plugins/lsp/lspconfig.lua b/lua/plugins/lsp/lspconfig.lua index 00a2795..865cdbf 100644 --- a/lua/plugins/lsp/lspconfig.lua +++ b/lua/plugins/lsp/lspconfig.lua @@ -83,11 +83,6 @@ return { capabilities = capabilities, }) end, - ["tsserver"] = function() - lspconfig["tsserver"].setup({ - capabilities = capabilities, - }) - end, ["lua_ls"] = function() lspconfig["lua_ls"].setup({ capabilities = capabilities, diff --git a/lua/plugins/lsp/typescript-tools.lua b/lua/plugins/lsp/typescript-tools.lua new file mode 100644 index 0000000..078ece8 --- /dev/null +++ b/lua/plugins/lsp/typescript-tools.lua @@ -0,0 +1,5 @@ +return { + "pmizio/typescript-tools.nvim", + dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, + opts = {}, +} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index fdb0c83..5b85027 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -4,7 +4,7 @@ return { opts = { options = { icons_enabled = true, - theme = "powerline", + theme = "tokyonight", component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, disabled_filetypes = { diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 46a4900..1ea6700 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -1,9 +1,9 @@ local setup = { source_selector = { - winbar = true, -- toggle to show selector on winbar - statusline = false, -- toggle to show selector on statusline - show_scrolled_off_parent_node = false, -- this will replace the tabs with the parent path - -- of the top visible node when scrolled down. + winbar = true, + statusline = false, + show_scrolled_off_parent_node = false, + sources = { { source = "filesystem" }, { source = "buffers" }, @@ -17,14 +17,14 @@ return { branch = "v3.x", dependencies = { "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + "nvim-tree/nvim-web-devicons", "MunifTanjim/nui.nvim", }, config = function() require("neo-tree").setup(setup) - -- Define key mappings here to ensure they are set after the plugin is loaded + vim.api.nvim_set_keymap("n", "n", "Neotree toggle", { noremap = true, silent = true }) end, - keys = "n", -- Optionally specify here to load the plugin on this keypress + keys = "n", }, }