From 96c638f4bc23a63c4b7cc88292c3fa6f20423ae3 Mon Sep 17 00:00:00 2001 From: cscherr Date: Wed, 7 May 2025 11:55:39 +0200 Subject: [PATCH] refactor --- lua/custom/plugins/configs/lsp.lua | 22 +-- lua/custom/plugins/telescope.lua | 1 + lua/custom/plugins/themes.lua | 208 ++++++++++++++--------------- lua/settings/theme.lua | 7 - 4 files changed, 109 insertions(+), 129 deletions(-) delete mode 100644 lua/settings/theme.lua diff --git a/lua/custom/plugins/configs/lsp.lua b/lua/custom/plugins/configs/lsp.lua index 732c05b..bd8eeb0 100644 --- a/lua/custom/plugins/configs/lsp.lua +++ b/lua/custom/plugins/configs/lsp.lua @@ -127,19 +127,6 @@ capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp' -- - settings (table): Override the default settings passed when initializing the server. -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ local servers = { - -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, - -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs - -- - -- Some languages (like typescript) have entire language plugins that can be useful: - -- https://github.com/pmizio/typescript-tools.nvim - -- - -- But for many setups, the LSP (`tsserver`) will work just fine - -- tsserver = {}, - -- - tinymist = { settings = { formatterMode = 'typstyle', @@ -171,7 +158,6 @@ local servers = { pyright = {}, bashls = {}, yamlls = {}, - texlab = {}, rust_analyzer = { settings = { ['rust-analyzer'] = { @@ -220,15 +206,17 @@ require('mason').setup() local ensure_installed = vim.tbl_keys(servers or {}) vim.list_extend(ensure_installed, { 'stylua', - 'typstfmt', + 'typstyle', + 'prettier', }) -require('mason-tool-installer').setup { ensure_installed = ensure_installed } require('mason-lspconfig').setup { - ensure_installed = nil, + ensure_installed = ensure_installed, automatic_installation = true, + automatic_enable = true, handlers = { function(server_name) + print('setting up' + server_name) local server = servers[server_name] or {} -- This handles overriding only values explicitly passed -- by the server configuration above. Useful when disabling diff --git a/lua/custom/plugins/telescope.lua b/lua/custom/plugins/telescope.lua index 943bbf5..d45643d 100644 --- a/lua/custom/plugins/telescope.lua +++ b/lua/custom/plugins/telescope.lua @@ -22,6 +22,7 @@ return { -- Useful for getting pretty icons, but requires a Nerd Font. { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + { 'echasnovski/mini.icons', version = '*' }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that diff --git a/lua/custom/plugins/themes.lua b/lua/custom/plugins/themes.lua index cf05db3..e474d54 100644 --- a/lua/custom/plugins/themes.lua +++ b/lua/custom/plugins/themes.lua @@ -1,117 +1,115 @@ +the_themes = { + -- Dark Themes + { + name = '==========Dark Themes==========', + colorscheme = '', -- this actually keeps the selected theme, but it wont work with persistence + }, + { + name = 'nvim default', + colorscheme = 'default', + }, + { + name = 'nvim lunaperche', + colorscheme = 'lunaperche', + }, + { + name = 'nvim quiet', + colorscheme = 'quiet', + }, + { + name = 'nvim retrobox', + colorscheme = 'retrobox', + }, + { + name = 'nvim slate', + colorscheme = 'slate', + }, + { + name = 'nvim vim', + colorscheme = 'vim', + }, + { + name = 'tokyonight', + colorscheme = 'tokyonight', + }, + { + name = 'tokyonight-moon', + colorscheme = 'tokyonight-moon', + }, + { + name = 'tokyonight-storm', + colorscheme = 'tokyonight-storm', + }, + { + name = 'kanagawa', + colorscheme = 'kanagawa', + }, + { + name = 'kanagawa-dragon', + colorscheme = 'kanagawa-dragon', + }, + { + name = 'kanagawa-wave', + colorscheme = 'kanagawa-wave', + }, + { + name = 'zenbones', + colorscheme = 'zenbones', + before = [[ + -- It's a major hack from the themery guys that this is a string + vim.opt.background = "dark" + ]], + }, + { + name = 'tokyobones', + colorscheme = 'tokyobones', + before = [[ + -- It's a major hack from the themery guys that this is a string + vim.opt.background = "dark" + ]], + }, + { + name = 'kanagawabones', + colorscheme = 'kanagawabones', + before = [[ + -- It's a major hack from the themery guys that this is a string + vim.opt.background = "dark" + ]], + }, + -- Light themes + { + name = '==========Light Themes==========', + colorscheme = '', -- this actually keeps the selected theme, but it wont work with persistence + }, + { + name = 'tokyonight-day', + colorscheme = 'tokyonight-day', + }, + { + name = 'kanagawa-lotus', + colorscheme = 'kanagawa-lotus', + }, + { + name = 'zenbones', + colorscheme = 'zenbones', + before = [[ + -- It's a major hack from the themery guys that this is a string + vim.opt.background = "light" + ]], + }, +} + return { { 'zaldih/themery.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. + lazy = false, cmd = 'Themery', keys = { { ';ft', ' Themery ', desc = '[F]ind [T]heme' }, }, - init = function() - require 'settings.theme' - end, config = function() require('themery').setup { - themes = { - -- Dark Themes - { - name = '==========Dark Themes==========', - colorscheme = '', -- this actually keeps the selected theme, but it wont work with persistence - }, - { - name = 'nvim default', - colorscheme = 'default', - }, - { - name = 'nvim lunaperche', - colorscheme = 'lunaperche', - }, - { - name = 'nvim quiet', - colorscheme = 'quiet', - }, - { - name = 'nvim retrobox', - colorscheme = 'retrobox', - }, - { - name = 'nvim slate', - colorscheme = 'slate', - }, - { - name = 'nvim vim', - colorscheme = 'vim', - }, - { - name = 'tokyonight', - colorscheme = 'tokyonight', - }, - { - name = 'tokyonight-moon', - colorscheme = 'tokyonight-moon', - }, - { - name = 'tokyonight-storm', - colorscheme = 'tokyonight-storm', - }, - { - name = 'kanagawa', - colorscheme = 'kanagawa', - }, - { - name = 'kanagawa-dragon', - colorscheme = 'kanagawa-dragon', - }, - { - name = 'kanagawa-wave', - colorscheme = 'kanagawa-wave', - }, - { - name = 'zenbones', - colorscheme = 'zenbones', - before = [[ - -- It's a major hack from the themery guys that this is a string - vim.opt.background = "dark" - ]], - }, - { - name = 'tokyobones', - colorscheme = 'tokyobones', - before = [[ - -- It's a major hack from the themery guys that this is a string - vim.opt.background = "dark" - ]], - }, - { - name = 'kanagawabones', - colorscheme = 'kanagawabones', - before = [[ - -- It's a major hack from the themery guys that this is a string - vim.opt.background = "dark" - ]], - }, - -- Light themes - { - name = '==========Light Themes==========', - colorscheme = '', -- this actually keeps the selected theme, but it wont work with persistence - }, - { - name = 'tokyonight-day', - colorscheme = 'tokyonight-day', - }, - { - name = 'kanagawa-lotus', - colorscheme = 'kanagawa-lotus', - }, - { - name = 'zenbones', - colorscheme = 'zenbones', - before = [[ - -- It's a major hack from the themery guys that this is a string - vim.opt.background = "light" - ]], - }, - }, - themeConfigFile = '~/.config/nvim/lua/settings/theme.lua', + themes = the_themes, livePreview = true, -- Apply theme while browsing. Default to true. } end, diff --git a/lua/settings/theme.lua b/lua/settings/theme.lua deleted file mode 100644 index f0d0986..0000000 --- a/lua/settings/theme.lua +++ /dev/null @@ -1,7 +0,0 @@ --- Use `git update-index --assume-unchanged ` to ignore changes in this file --- --- Themery block --- This block will be replaced by Themery. -vim.cmd("colorscheme tokyonight-storm") -vim.g.theme_id = 10 --- end themery block