From d0316e95b17406c8d140f1a7a50efd3f291054a2 Mon Sep 17 00:00:00 2001 From: Fraser Fewster Date: Thu, 13 Nov 2025 11:41:54 +0000 Subject: [PATCH] Update theme --- init.lua | 49 ++++++++++---------- lua/custom/plugins/init.lua | 2 + lua/custom/plugins/theme.lua | 86 ++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 24 deletions(-) create mode 100644 lua/custom/plugins/theme.lua diff --git a/init.lua b/init.lua index 20ae6563..f2cbbdc6 100644 --- a/init.lua +++ b/init.lua @@ -537,7 +537,7 @@ require('lazy').setup({ -- Rename the variable under your cursor. -- Most Language Servers support renaming across files, etc. - map('grn', vim.lsp.buf.rename, '[R]e[n]ame') + map('rn', vim.lsp.buf.rename, '[R]e[n]ame') -- Execute a code action, usually your cursor needs to be on top of an error -- or a suggestion from your LSP for this to activate. @@ -553,7 +553,7 @@ require('lazy').setup({ -- Jump to the definition of the word under your cursor. -- This is where a variable was first declared, or where a function is defined, etc. -- To jump back, press . - map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') -- WARN: This is not Goto Definition, this is Goto Declaration. -- For example, in C this would take you to the header. @@ -722,7 +722,6 @@ require('lazy').setup({ 'dockerls', 'graphql', 'jsonls', - 'sqlls', 'yamlls', 'eslint', 'bashls', @@ -886,27 +885,29 @@ require('lazy').setup({ }, }, - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - config = function() - ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments - }, - } - - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' - end, - }, + -- { -- You can easily change to a different colorscheme. + -- -- Change the name of the colorscheme plugin below, and then + -- -- change the command in the config to whatever the name of that colorscheme is. + -- -- + -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + -- 'folke/tokyonight.nvim', + -- priority = 1000, -- Make sure to load this before all the other start plugins. + -- config = function() + -- ---@diagnostic disable-next-line: missing-fields + -- require('tokyonight').setup { + -- styles = { + -- comments = { italic = false }, -- Disable italics in comments + -- }, + -- } + -- + -- -- Load the colorscheme here. + -- -- Like many other themes, this one has different styles, and you could load + -- -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + -- -- vim.cmd.colorscheme 'tokyonight-night' + -- -- vim.cmd.colorscheme 'aliqyan-21/darkvoid.nvim' + -- vim.cmd.colorscheme 'nordic' + -- end, + -- }, -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index a65d8b46..bf56c776 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -6,6 +6,8 @@ return { require 'custom.plugins.comment', require 'custom.plugins.tabs', require 'custom.plugins.copilot', + require 'custom.plugins.copilot-chat', require 'custom.plugins.neo-tree-config', require 'custom.plugins.sleuth', + require 'custom.plugins.theme', } diff --git a/lua/custom/plugins/theme.lua b/lua/custom/plugins/theme.lua new file mode 100644 index 00000000..90d3f78d --- /dev/null +++ b/lua/custom/plugins/theme.lua @@ -0,0 +1,86 @@ +-- return { +-- 'AlexvZyl/nordic.nvim', +-- lazy = false, +-- priority = 1000, +-- config = function() +-- require('nordic').load() +-- vim.cmd.colorscheme 'nordic' +-- end, +-- } + +return { + 'rebelot/kanagawa.nvim', + lazy = false, + priority = 1000, + config = function() + require('kanagawa').setup { + commentStyle = { + italic = true, + }, + -- optional: your custom config here + } + vim.cmd 'colorscheme kanagawa-dragon' + end, +} + +-- return { +-- 'aliqyan-21/darkvoid.nvim', +-- priority = 1000, +-- lazy = false, +-- init = function() +-- require('darkvoid').setup { +-- glow = true, +-- transparent = true, +-- colors = { +-- fg = '#c0c0c0', +-- bg = '#1c1c1c', +-- cursor = '#fdd41b', +-- line_nr = '#404040', +-- visual = '#303030', +-- comment = '#737373', +-- string = '#66b2b2', +-- func = '#1bfd9c', +-- kw = '#fe5e58', +-- identifier = '#b1b1b1', +-- type = '#a1a1a1', +-- search_highlight = '#fdd41b', +-- operator = '#1bfd9c', +-- bracket = '#e6e6e6', +-- preprocessor = '#4b8902', +-- bool = '#d1d1d1', +-- constant = '#b2d8d8', +-- +-- -- gitsigns colors +-- added = '#baffc9', +-- changed = '#ffffba', +-- removed = '#ffb3ba', +-- +-- -- Pmenu colors +-- pmenu_bg = '#1c1c1c', +-- pmenu_sel_bg = '#1bfd9c', +-- pmenu_fg = '#c0c0c0', +-- +-- -- EndOfBuffer color +-- eob = '#3c3c3c', +-- +-- -- Telescope specific colors +-- border = '#fe5e58', +-- title = '#ffffff', +-- +-- -- bufferline specific colors +-- bufferline_selection = '#1bfd9c', +-- +-- -- LSP diagnostics colors +-- error = '#dea6a0', +-- warning = '#d6efd8', +-- hint = '#bedc74', +-- info = '#7fa1c3', +-- }, +-- } +-- -- You can configure highlights by doing something like: +-- vim.cmd.hi 'Comment gui=none' +-- vim.cmd.hi 'Normal guibg=none' +-- vim.cmd.hi 'Normal guibg=none' +-- vim.cmd.colorscheme 'darkvoid' +-- end, +-- }