diff --git a/lua/plugins/colortheme.lua b/lua/plugins/colortheme.lua index 62b35f5..4bb57c3 100644 --- a/lua/plugins/colortheme.lua +++ b/lua/plugins/colortheme.lua @@ -1,43 +1,34 @@ --- return { --- "catppuccin/nvim", --- name = "catppuccin", --- lazy = false, --- priority = 1000, --- config = function() --- vim.cmd.colorscheme("catppuccin-macchiato") --- end, --- } - return { - "rebelot/kanagawa.nvim", - name = "kanagawa", + "ellisonleao/gruvbox.nvim", + name = "gruvbox", lazy = false, priority = 1000, config = function() - require("kanagawa").setup({ - compile = false, -- enable compiling the colorscheme - undercurl = true, -- enable undercurls - commentStyle = { italic = true }, - functionStyle = {}, - keywordStyle = { italic = true }, - statementStyle = { bold = true }, - typeStyle = {}, - transparent = false, -- do not set background color - dimInactive = false, -- dim inactive window `:h hl-NormalNC` - terminalColors = true, -- define vim.g.terminal_color_{0,17} - colors = { -- add/modify theme and palette colors - palette = {}, - theme = { wave = {}, lotus = {}, dragon = {}, all = {} }, - }, - overrides = function(colors) -- add/modify highlights - return {} - end, - theme = "dragon", -- Load "wave" theme when 'background' option is not set - background = { -- map the value of 'background' option to a theme - dark = "dragon", -- try "dragon" ! - light = "lotus", + -- Default options: + require("gruvbox").setup({ + terminal_colors = true, -- add neovim terminal colors + undercurl = true, + underline = true, + bold = true, + italic = { + strings = true, + emphasis = true, + comments = true, + operators = false, + folds = true, }, + strikethrough = true, + invert_selection = false, + invert_signs = false, + invert_tabline = false, + invert_intend_guides = false, + inverse = true, -- invert background for search, diffs, statuslines and errors + contrast = "", -- can be "hard", "soft" or empty string + palette_overrides = {}, + overrides = {}, + dim_inactive = false, + transparent_mode = false, }) - vim.cmd("colorscheme kanagawa") - end, + vim.cmd("colorscheme gruvbox") + end } diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua index 4f397d7..516dd3a 100644 --- a/lua/plugins/lsp-config.lua +++ b/lua/plugins/lsp-config.lua @@ -9,7 +9,7 @@ return { "williamboman/mason-lspconfig.nvim", config = function() require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "ts_ls", "svelte", "tailwindcss", "cssls", "rust_analyzer", "jedi_language_server" }, + ensure_installed = { "lua_ls", "ts_ls", "svelte", "tailwindcss", "cssls", "rust_analyzer" }, }) end, }, diff --git a/lua/plugins/statusline.lua b/lua/plugins/statusline.lua new file mode 100644 index 0000000..e3f862c --- /dev/null +++ b/lua/plugins/statusline.lua @@ -0,0 +1,47 @@ +return { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("lualine").setup({ + options = { + icons_enabled = true, + theme = "auto", + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = { + statusline = {}, + winbar = {}, + }, + ignore_focus = {}, + always_divide_middle = true, + always_show_tabline = true, + globalstatus = false, + refresh = { + statusline = 100, + tabline = 100, + winbar = 100, + }, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch", "diff", "diagnostics" }, + lualine_c = { "filename" }, + lualine_x = { "encoding", "fileformat", "filetype" }, + lualine_y = { "progress" }, + lualine_z = { "location" }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + winbar = {}, + inactive_winbar = {}, + extensions = {}, + }) + end, +}