From 7cffe20d8147b9e13cd7ac1d88d9f1f7f38550f3 Mon Sep 17 00:00:00 2001 From: Fabian Schmidt Date: Sat, 29 Oct 2022 14:22:42 +0200 Subject: [PATCH] Darcula looks weid since last (treesitter?) upgrade. Added a few colorschemes and shortcut to access them --- lua/maps.lua | 3 +++ lua/plugins.lua | 13 ++++++++++++- lua/settings/lsp.lua | 4 ++++ lua/settings/theme.lua | 7 +++++-- lua/settings/tree.lua | 2 +- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/lua/maps.lua b/lua/maps.lua index ca14bae..9d12ff5 100644 --- a/lua/maps.lua +++ b/lua/maps.lua @@ -60,6 +60,9 @@ end function maps.init() vim.g.mapleader = " " + map('n', 'b', 'NvimTreeToggle') + map('n', 'cc', 'Telescope colorscheme') + maps.toggleGoyo() maps.term() maps.telescope() diff --git a/lua/plugins.lua b/lua/plugins.lua index 3a31979..bd12b92 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -7,8 +7,19 @@ require 'paq' { -- Theme 'kyazdani42/nvim-web-devicons'; - 'rktjmp/lush.nvim'; + { 'folke/tokyonight.nvim', { branch = 'main' } }; + 'tiagovla/tokyodark.nvim'; + 'rebelot/kanagawa.nvim'; + 'sainnhe/everforest'; + 'navarasu/onedark.nvim'; + 'rose-pine/neovim'; + 'rmehri01/onenord.nvim'; + 'EdenEast/nightfox.nvim'; + 'tanvirtin/monokai.nvim'; + 'catppuccin/nvim'; 'briones-gabriel/darcula-solid.nvim'; + 'rktjmp/lush.nvim'; + -- treesitter 'nvim-treesitter/nvim-treesitter'; diff --git a/lua/settings/lsp.lua b/lua/settings/lsp.lua index 25152e5..9156808 100644 --- a/lua/settings/lsp.lua +++ b/lua/settings/lsp.lua @@ -72,6 +72,10 @@ function lsp.init() capabilities = capabilities, on_attach = lsp_attach }) + lspconfig.svelte.setup({ + capabilities = capabilities, + on_attach = lsp_attach + }) end return lsp diff --git a/lua/settings/theme.lua b/lua/settings/theme.lua index b0438fa..452db5b 100644 --- a/lua/settings/theme.lua +++ b/lua/settings/theme.lua @@ -13,7 +13,7 @@ end function theme.initStatusline() require('lualine').setup { options = { - theme = 'onedark' + theme = 'kanagawa' } } end @@ -25,13 +25,16 @@ end function theme.initColorscheme() vim.g.limelight_conceal_ctermfg = 'gray' - vim.cmd 'colorscheme darcula-solid' + vim.cmd 'colorscheme kanagawa' vim.cmd 'set termguicolors' vim.opt.syntax = 'on' require('nvim-treesitter.configs').setup { highlight = { enable = true, additional_vim_regex_highlighting = false, + }, + indent = { + enable = true } } end diff --git a/lua/settings/tree.lua b/lua/settings/tree.lua index e65a443..5042972 100644 --- a/lua/settings/tree.lua +++ b/lua/settings/tree.lua @@ -9,7 +9,7 @@ require('nvim-tree').setup { ignore_ft_on_setup = {}, open_on_tab = false, hijack_cursor = false, - update_cwd = false, + update_cwd = true, hijack_directories = { enable = true, auto_open = true,