diff --git a/.config/nvim/.luarc.json b/.config/nvim/.luarc.json deleted file mode 100644 index 0967ef4..0000000 --- a/.config/nvim/.luarc.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/.config/nvim/README.md b/.config/nvim/README.md deleted file mode 100644 index 6d90c12..0000000 --- a/.config/nvim/README.md +++ /dev/null @@ -1,140 +0,0 @@ -# dotfiles/.config/nvim - - - - - - -## Install Instructions - - > Install requires Neovim 0.9+. Always review the code before installing a configuration. - -Clone the repository and install the plugins: - -```sh -git clone git@github.com:Kyren223/dotfiles ~/.config/Kyren223/dotfiles -``` - -Open Neovim with this config: - -```sh -NVIM_APPNAME=Kyren223/dotfiles/.config/nvim nvim -``` - -## Plugins - -### code-runner - -+ [stevearc/overseer.nvim](https://dotfyle.com/plugins/stevearc/overseer.nvim) -### color - -+ [uga-rosa/ccc.nvim](https://dotfyle.com/plugins/uga-rosa/ccc.nvim) -### colorscheme - -+ [EdenEast/nightfox.nvim](https://dotfyle.com/plugins/EdenEast/nightfox.nvim) -+ [catppuccin/nvim](https://dotfyle.com/plugins/catppuccin/nvim) -+ [rose-pine/neovim](https://dotfyle.com/plugins/rose-pine/neovim) -+ [uloco/bluloco.nvim](https://dotfyle.com/plugins/uloco/bluloco.nvim) -+ [marko-cerovac/material.nvim](https://dotfyle.com/plugins/marko-cerovac/material.nvim) -+ [rebelot/kanagawa.nvim](https://dotfyle.com/plugins/rebelot/kanagawa.nvim) -+ [projekt0n/github-nvim-theme](https://dotfyle.com/plugins/projekt0n/github-nvim-theme) -+ [folke/tokyonight.nvim](https://dotfyle.com/plugins/folke/tokyonight.nvim) -### colorscheme-creation - -+ [rktjmp/lush.nvim](https://dotfyle.com/plugins/rktjmp/lush.nvim) -### comment - -+ [folke/todo-comments.nvim](https://dotfyle.com/plugins/folke/todo-comments.nvim) -+ [numToStr/Comment.nvim](https://dotfyle.com/plugins/numToStr/Comment.nvim) -### completion - -+ [hrsh7th/nvim-cmp](https://dotfyle.com/plugins/hrsh7th/nvim-cmp) -### cursorline - -+ [RRethy/vim-illuminate](https://dotfyle.com/plugins/RRethy/vim-illuminate) -### diagnostics - -+ [folke/trouble.nvim](https://dotfyle.com/plugins/folke/trouble.nvim) -### editing-support - -+ [windwp/nvim-autopairs](https://dotfyle.com/plugins/windwp/nvim-autopairs) -+ [okuuva/auto-save.nvim](https://dotfyle.com/plugins/okuuva/auto-save.nvim) -### file-explorer - -+ [stevearc/oil.nvim](https://dotfyle.com/plugins/stevearc/oil.nvim) -+ [nvim-neo-tree/neo-tree.nvim](https://dotfyle.com/plugins/nvim-neo-tree/neo-tree.nvim) -### fuzzy-finder - -+ [nvim-telescope/telescope.nvim](https://dotfyle.com/plugins/nvim-telescope/telescope.nvim) -### git - -+ [sindrets/diffview.nvim](https://dotfyle.com/plugins/sindrets/diffview.nvim) -+ [NeogitOrg/neogit](https://dotfyle.com/plugins/NeogitOrg/neogit) -+ [lewis6991/gitsigns.nvim](https://dotfyle.com/plugins/lewis6991/gitsigns.nvim) -### github - -+ [pwntester/octo.nvim](https://dotfyle.com/plugins/pwntester/octo.nvim) -### icon - -+ [nvim-tree/nvim-web-devicons](https://dotfyle.com/plugins/nvim-tree/nvim-web-devicons) -### indent - -+ [lukas-reineke/indent-blankline.nvim](https://dotfyle.com/plugins/lukas-reineke/indent-blankline.nvim) -### lsp - -+ [nvimdev/lspsaga.nvim](https://dotfyle.com/plugins/nvimdev/lspsaga.nvim) -+ [rachartier/tiny-inline-diagnostic.nvim](https://dotfyle.com/plugins/rachartier/tiny-inline-diagnostic.nvim) -+ [onsails/lspkind.nvim](https://dotfyle.com/plugins/onsails/lspkind.nvim) -+ [linrongbin16/lsp-progress.nvim](https://dotfyle.com/plugins/linrongbin16/lsp-progress.nvim) -+ [ray-x/lsp_signature.nvim](https://dotfyle.com/plugins/ray-x/lsp_signature.nvim) -+ [neovim/nvim-lspconfig](https://dotfyle.com/plugins/neovim/nvim-lspconfig) -+ [nvimtools/none-ls.nvim](https://dotfyle.com/plugins/nvimtools/none-ls.nvim) -### lsp-installer - -+ [williamboman/mason.nvim](https://dotfyle.com/plugins/williamboman/mason.nvim) -### marks - -+ [ThePrimeagen/harpoon](https://dotfyle.com/plugins/ThePrimeagen/harpoon) -### motion - -+ [ggandor/leap.nvim](https://dotfyle.com/plugins/ggandor/leap.nvim) -### nvim-dev - -+ [MunifTanjim/nui.nvim](https://dotfyle.com/plugins/MunifTanjim/nui.nvim) -+ [folke/lazydev.nvim](https://dotfyle.com/plugins/folke/lazydev.nvim) -+ [nvim-lua/plenary.nvim](https://dotfyle.com/plugins/nvim-lua/plenary.nvim) -### plugin-manager - -+ [folke/lazy.nvim](https://dotfyle.com/plugins/folke/lazy.nvim) -### search - -+ [nvim-pack/nvim-spectre](https://dotfyle.com/plugins/nvim-pack/nvim-spectre) -### session - -+ [rmagatti/auto-session](https://dotfyle.com/plugins/rmagatti/auto-session) -### snippet - -+ [L3MON4D3/LuaSnip](https://dotfyle.com/plugins/L3MON4D3/LuaSnip) -### split-and-window - -+ [folke/edgy.nvim](https://dotfyle.com/plugins/folke/edgy.nvim) -### startup - -+ [goolord/alpha-nvim](https://dotfyle.com/plugins/goolord/alpha-nvim) -### statusline - -+ [nvim-lualine/lualine.nvim](https://dotfyle.com/plugins/nvim-lualine/lualine.nvim) -### syntax - -+ [nvim-treesitter/nvim-treesitter-textobjects](https://dotfyle.com/plugins/nvim-treesitter/nvim-treesitter-textobjects) -+ [nvim-treesitter/nvim-treesitter](https://dotfyle.com/plugins/nvim-treesitter/nvim-treesitter) -+ [kylechui/nvim-surround](https://dotfyle.com/plugins/kylechui/nvim-surround) -### utility - -+ [echasnovski/mini.nvim](https://dotfyle.com/plugins/echasnovski/mini.nvim) -+ [j-morano/buffer_manager.nvim](https://dotfyle.com/plugins/j-morano/buffer_manager.nvim) -## Language Servers - - - - This readme was generated by [Dotfyle](https://dotfyle.com) diff --git a/.config/nvim/TODO.md b/.config/nvim/TODO.md deleted file mode 100644 index da835ae..0000000 --- a/.config/nvim/TODO.md +++ /dev/null @@ -1,29 +0,0 @@ - -# Plans for the future - -- TODO: Look at configuring Noice.nvim and decide if u like it or not -- TODO: Look at buffer-management plugins that automatically delete old buffers (and also ways to close buffers without exiting nvim, and be able to exit nvim with 1 keypress) -- TODO: Add refactoring keys like iv for introduce variable, extract method, introduce constant etc -- TODO: Decide which outline-plugin to use (lspsaga or aerial, or smthing else) -- TODO: Finish configuring lsp saga (I think it has supertypes and stuff which aren't in the doc) -- TODO: Create your own luasnip snippets, search what "choices" are -- TODO: Look for a list of sources for completions to add more cool stuff https://github.com/hrsh7th/nvim-cmp/wiki/List-of-sources - -- TODO: Configure more text objects (they are amazing!) - -# VERY IMPORTANT - -## TODO: Code actions -Don't show bs code actions (some kind of filter for "quickfix" and "refactor.extract" potentially?) -Sort quickfix actions to be first and then the rest less important ones -A lightbulb somewhere ONLY if the cursor (not line) has a code action and ONLY if it's a quickfix - -# Look at in the future - -- Database integration plugins -https://github.com/kndndrj/nvim-dbee?tab=readme-ov-file -https://github.com/tpope/vim-dadbod - -- Colorscheme https://github.com/scottmckendry/cyberdream.nvim?tab=readme-ov-file - - diff --git a/.config/nvim/lua/colorschemes/dapui.lua b/.config/nvim/lua/colorschemes/dapui.lua deleted file mode 100644 index f956ffe..0000000 --- a/.config/nvim/lua/colorschemes/dapui.lua +++ /dev/null @@ -1,340 +0,0 @@ --- Took from this repo https://github.com/rcarriga/dotfiles/blob/master/.config/nvim/init.lua -local c = { - transparent = 'NONE', - grey1 = '#262626', - grey2 = '#424242', - grey3 = '#8B8B8B', - grey4 = '#bdbdbd', - grey5 = '#F8F8F8', - violet = '#D484FF', - blue = '#2f628e', - cyan = '#00f1f5', - cyan2 = '#7EC9D8', -- by Kyren (from catpuccin-mocha) - green = '#A9FF68', - dark_green = '#142818', - yellow = '#FFF59D', - orange = '#F79000', - orange2 = '#ff9e64', -- by Kyren (from tokyonight-night) - red = '#F70067', - dark_red = '#3F0001', - float_background = '#132434', - background = 'NONE', - mocha = '#1E1E2E', -- by Kyren - mocha_search = '#3E5767', -- by Kyren (from catppuccin-mocha) - -- mocha_hi1 = '#28283e', -- by Kyren - mocha_hi1 = '#2A2B3C', -- by Kyren (from tokyonight-night) - -- mocha_hi2 = '#3c3c5c', -- by Kyren - -- mocha_hi2 = '#283457', -- by Kyren (from tokyonight-night) - mocha_hi2 = '#45475A', -- by Kyren (from catpuccin-mocha) - black = '#15161E', -- by Kyren (from tokyonight-night) - -- black = '#181825' -- by Kyren (from catpuccin-mocha) - -- illum = '#413761', -- by Kyren - -- illum = '#3E5767', -- by Kyren - -- illum = '#462250', -- by Kyren - -- illum = '#352d53', -- by Kyren - -- illum = '#5c3d50', -- by Kyren -} - -c.normal = c.grey5 -c.border = c.grey3 -c.decoration = c.orange -c.hidden = c.grey3 -c.built_in = c.red -c.var_name = c.grey5 -c.func_name = c.cyan -c.type_name = c.violet -c.key = c.cyan -c.val = c.violet --- c.parameter = c.green -- original -c.parameter = c.orange2 -- by Kyren -c.string = c.yellow -c.operator = c.orange -c.success = c.green -c.warning = c.orange -c.info = c.cyan -c.error = c.red - -local highlights = { - Normal = { fg = c.normal }, - NormalFloat = { fg = c.normal }, - Border = { fg = c.border }, - FloatBorder = { fg = c.border }, - Decoration = { fg = c.orange }, - Hidden = { fg = c.grey3 }, - Path = { fg = c.blue }, - BuiltIn = { fg = c.red }, - VarName = { fg = c.grey5, bold = true }, - FuncName = { fg = c.cyan }, - TypeName = { fg = c.violet }, - Key = { fg = c.cyan }, - Val = { fg = c.violet }, - String = { fg = c.yellow }, - Operator = { fg = c.orange }, - Success = { fg = c.green }, - Warning = { fg = c.yellow }, - Info = { fg = c.cyan }, - Error = { fg = c.red }, - User1 = { fg = c.success, bg = c.float_background }, - User2 = { fg = c.warning, bg = c.float_background }, - User3 = { fg = c.error, bg = c.float_background }, - User4 = { fg = c.grey1, bg = c.info }, - -- Vim - Cursor = { fg = c.grey1, bg = c.red }, - -- CursorLine = { fg = c.transparent, bg = c.grey1 }, -- original - -- CursorColumn = { fg = c.transparent, bg = c.grey1 }, -- original - -- ColorColumn = { fg = c.transparent, bg = c.grey1 }, -- original - LineNr = { fg = c.hidden }, - CursorLine = { fg = c.transparent, bg = c.mocha_hi1 }, -- by Kyren - CursorColumn = { fg = c.transparent, bg = c.mocha_hi1 }, -- by Kyren - ColorColumn = { fg = c.transparent, bg = c.mocha_hi1 }, -- by Kyren - -- CursorLineNr = { fg = c.success, bold = true }, -- original - CursorLineNr = { fg = c.violet, bold = true }, -- by Kyren - LineNrAbove = { fg = c.violet }, -- by Kyren - LineNrBelow = { fg = c.violet }, -- by Kyren - VertSplit = { fg = c.hidden }, - MatchParen = { fg = c.key, underline = true }, - StatusLine = { fg = c.normal }, - StatusLineNC = { fg = c.hidden }, - WinBar = { fg = c.normal }, - WinBarNC = { fg = c.normal }, - WinBarSep = { fg = c.decoration, bg = c.grey1 }, - WinBarPath = { fg = c.grey5, bg = c.grey1 }, - -- IncSearch = { fg = c.green, bold = true, underline = true }, -- original - -- Search = { fg = c.green, bold = true, underline = true }, -- original - IncSearch = { fg = c.black, bg = c.orange2, bold = true }, -- by Kyren - Search = { fg = c.black, bg = c.orange2, bold = true }, -- by Kyren - Directory = { fg = c.cyan }, - Folded = { fg = c.grey3 }, - WildMenu = { fg = c.cyan }, - VisualNOS = { fg = c.grey3, bg = c.yellow }, - ModeMsg = { fg = c.yellow }, - FoldColumn = { fg = c.grey4 }, - MoreMsg = { fg = c.yellow }, - cursorim = { fg = c.violet }, - Pmenu = { fg = c.grey4 }, - PmenuSel = { fg = c.transparent, bg = c.grey2, bold = true }, - PMenuSbar = { fg = c.transparent }, - PMenuThumb = { fg = c.transparent, bg = c.grey4 }, - -- Visual = { fg = c.transparent, bg = c.grey1, bold = true, underline = true }, -- original - Visual = { fg = c.transparent, bg = c.mocha_hi2, bold = true }, -- by Kyren - EndOfBuffer = { fg = c.grey1 }, - Underlined = { fg = c.transparent, underline = true }, - SpellBad = { fg = c.transparent, undercurl = true }, - SpellCap = { fg = c.transparent, undercurl = true }, - SpellLocal = { fg = c.transparent, undercurl = true }, - SignColumn = { fg = c.key }, - Question = { fg = c.info }, - TabLineFill = { fg = c.grey3 }, - NotificationInfo = { fg = c.normal, bg = c.float_background }, - NotificationError = { fg = c.error, bg = c.float_background }, - NotificationWarning = { fg = c.warning, bg = c.float_background }, - WinSeparator = { fg = c.grey2 }, - -- General - Boolean = { fg = c.val }, - Character = { fg = c.val }, - Comment = { fg = c.hidden }, - Conditional = { fg = c.built_in }, - Constant = { fg = c.var_name }, - Define = { fg = c.built_in }, - DiffAdd = { fg = c.background, bg = c.dark_green }, - DiffChange = { fg = c.background, bg = c.grey1 }, - DiffDelete = { fg = c.background, bg = c.dark_red }, - DiffText = { fg = c.background, bg = c.dark_red }, - ErrorMsg = { fg = c.error }, - WarningMsg = { fg = c.warning }, - Float = { fg = c.val }, - Function = { fg = c.func_name }, - Identifier = { fg = c.var_name }, - Keyword = { fg = c.built_in }, - Label = { fg = c.key }, - NonText = { fg = c.hidden }, - Number = { fg = c.val }, - PreProc = { fg = c.key }, - Special = { fg = c.cyan }, - SpecialKey = { fg = c.built_in }, - Statement = { fg = c.built_in }, - Tag = { fg = c.key }, - Title = { fg = c.normal, bold = true }, - Todo = { fg = c.normal, bold = true }, - Type = { fg = c.type_name }, - SpecialComment = { fg = c.info, bold = true }, - Typedef = { fg = c.type_name }, - PreCondit = { fg = c.built_in }, - Include = { fg = c.built_in }, - Ignore = { fg = c.built_in }, - Delimiter = { fg = c.decoration }, - Conceal = { fg = c.transparent, bold = true }, - -- gitsigns - GitSignsAdd = { fg = c.success, bold = true }, - GitSignsDelete = { fg = c.error, bold = true }, - GitSignsChange = { fg = c.yellow, bold = true }, - --ini - dosiniLabel = { fg = c.key }, - dosiniValue = { fg = c.val }, - dosiniHeader = { fg = c.built_in }, - -- TreeSitter - ['@error'] = { fg = c.error }, - ['@comment'] = { fg = c.hidden }, - ['@punct.delimiter'] = { fg = c.decoration }, - ['@punct.bracket'] = { fg = c.decoration }, - ['@punct.special'] = { fg = c.decoration }, - ['@constant'] = { fg = c.var_name }, - ['@const.builtin'] = { fg = c.built_in }, - ['@const.macro'] = { fg = c.built_in }, - ['@string'] = { fg = c.string }, - ['@string.regex'] = { fg = c.operator }, - ['@string.escape'] = { fg = c.operator }, - ['@character'] = { fg = c.val }, - ['@number'] = { fg = c.val }, - ['@boolean'] = { fg = c.val }, - ['@float'] = { fg = c.val }, - ['@function'] = { fg = c.func_name }, - ['@func.builtin'] = { fg = c.built_in }, - ['@func.macro'] = { fg = c.built_in }, - ['@parameter'] = { fg = c.green }, - ['@parameter.reference'] = { fg = c.green }, - ['@method'] = { fg = c.func_name }, - ['@field'] = { fg = c.func_name }, - ['@property'] = { fg = c.parameter }, - ['@tag'] = { fg = c.func_name }, - ['@constructor'] = { fg = c.type_name }, - ['@conditional'] = { fg = c.built_in }, - ['@repeat'] = { fg = c.built_in }, - ['@label'] = { fg = c.key }, - ['@operator'] = { fg = c.operator }, - ['@keyword'] = { fg = c.built_in }, - ['@keyword.function'] = { fg = c.built_in }, - ['@exception'] = { fg = c.error }, - ['@type'] = { fg = c.type_name }, - ['@type.builtin'] = { fg = c.type_name }, - ['@structure'] = { fg = c.error }, - ['@include'] = { fg = c.built_in }, - ['@annotation'] = { fg = c.string }, - ['@text'] = { fg = c.string }, - ['@strong'] = { fg = c.transparent, bold = true }, - ['@emphasis'] = { fg = c.transparent, bold = true, underline = true }, - ['@underline'] = { fg = c.transparent, underline = true }, - ['@title'] = { fg = c.key, bold = true }, - ['@literal'] = { fg = c.decoration }, - ['@uri'] = { fg = c.info }, - ['@variable'] = { fg = c.var_name }, - ['@variable.builtin'] = { fg = c.built_in }, - ['@definition'] = { fg = c.transparent, bold = true }, - ['@definition.usage'] = { fg = c.transparent, bold = true, underline = true }, - ['@current.scope'] = { fg = c.transparent, bold = true }, - ['@text.reference'] = { fg = c.normal, bold = true, underline = true }, - -- Golang - goFunctionCall = { fg = c.func_name }, - goVarDefs = { fg = c.var_name }, - -- Telescope - TelescopeBorder = { fg = c.border }, - -- LSP - LspReferenceText = { fg = c.background, bold = true, underline = true }, - LspReferenceRead = { fg = c.background, bold = true, underline = true }, - LspReferenceWrite = { fg = c.background, bold = true, underline = true }, - DiagnosticTruncateLine = { fg = c.hidden }, - DiagnosticError = { fg = c.error }, - DiagnosticWarn = { fg = c.warning }, - DiagnosticInfo = { fg = c.info }, - DiagnosticHint = { fg = c.info }, - LspCodeLens = { fg = c.type_name, italic = true }, - IblIndent = { fg = c.grey2 }, - - ['@lsp.type.property.lua'] = { fg = c.key }, - ['@lsp.mod.defaultLibrary.lua'] = { fg = c.built_in }, - ['@lsp.type.parameter.python'] = { fg = c.parameter }, - - -- LSP Signature - LspSelectedParam = { fg = c.normal, bold = true, underline = true }, - - --lsp-inlayhints.nvim - LspInlayHint = { fg = c.type_name, italic = true }, - - --nvim-cmp - CmpItemAbbr = { fg = c.normal }, - CmpDocumentationBorder = { fg = c.border }, - CmpItemAbbrMatch = { fg = c.normal, bold = true }, - CmpItemAbbrMatchFuzzy = { fg = c.normal, bold = true, underline = true }, - CmpItemAbbrDeprecated = { fg = c.normal, bold = true }, - CmpItemKindVariable = { fg = c.var_name, bold = true }, - CmpItemKindInterface = { fg = c.type_name, bold = true }, - CmpItemKindText = { fg = c.normal, bold = true }, - CmpItemKindFunction = { fg = c.func_name, bold = true }, - CmpItemKindMethod = { fg = c.func_name, bold = true }, - CmpItemKindKeyword = { fg = c.built_in, bold = true }, - CmpItemKindProperty = { fg = c.key, bold = true }, - CmpItemKindUnit = { fg = c.yellow, bold = true }, - CmpItemKindCopilt = { fg = c.green, bold = true }, - CmpBorderedWindow_FloatBorder = { fg = c.border }, - - --neorg - ['@neorg.headings.1.title'] = { fg = c.red, bold = true }, - ['@neorg.headings.2.title'] = { fg = c.orange, bold = true }, - ['@neorg.headings.3.title'] = { fg = c.cyan, bold = true }, - ['@neorg.headings.4.title'] = { fg = c.green, bold = true }, - ['@neorg.headings.5.title'] = { fg = c.yellow, bold = true }, - ['@neorg.headings.6.title'] = { fg = c.grey3, bold = true }, - ['@neorg.headings.1.prefix'] = { fg = c.red, bold = true }, - ['@neorg.headings.2.prefix'] = { fg = c.orange, bold = true }, - ['@neorg.headings.3.prefix'] = { fg = c.cyan, bold = true }, - ['@neorg.headings.4.prefix'] = { fg = c.green, bold = true }, - ['@neorg.headings.5.prefix'] = { fg = c.yellow, bold = true }, - ['@neorg.headings.6.prefix'] = { fg = c.grey3, bold = true }, - ['@neorg.todo_items.done.1'] = { fg = c.success }, - ['@neorg.todo_items.done.2'] = { fg = c.success }, - ['@neorg.todo_items.done.3'] = { fg = c.success }, - ['@neorg.todo_items.done.4'] = { fg = c.success }, - ['@neorg.todo_items.done.5'] = { fg = c.success }, - ['@neorg.todo_items.done.6'] = { fg = c.success }, - ['@neorg.todo_items.undone.1'] = { fg = c.cyan }, - ['@neorg.todo_items.undone.2'] = { fg = c.cyan }, - ['@neorg.todo_items.undone.3'] = { fg = c.cyan }, - ['@neorg.todo_items.undone.4'] = { fg = c.cyan }, - ['@neorg.todo_items.undone.5'] = { fg = c.cyan }, - ['@neorg.todo_items.undone.6'] = { fg = c.cyan }, - ['@neorg.todo_items.pending.1'] = { fg = c.yellow }, - ['@neorg.todo_items.pending.2'] = { fg = c.yellow }, - ['@neorg.todo_items.pending.3'] = { fg = c.yellow }, - ['@neorg.todo_items.pending.4'] = { fg = c.yellow }, - ['@neorg.todo_items.pending.5'] = { fg = c.yellow }, - ['@neorg.todo_items.pending.6'] = { fg = c.yellow }, - - logDate = { fg = c.info }, - logLevelDebug = { fg = c.grey3 }, - logLevelInfo = { fg = c.info }, - - MiniMapNormal = { fg = c.hidden }, - MiniMapSymbolCount = { fg = c.info }, - MiniMapSymbolLine = { fg = c.cyan }, - MiniMapSymbolView = { fg = c.hidden }, - - NeogitDiffAddHighlight = { fg = '#859900' }, - NeogitDiffDeleteHighlight = { fg = '#dc322f' }, - NeogitDiffContextHighlight = { fg = '#b2b2b2' }, - NeogitHunkHeader = { fg = '#cccccc' }, - NeogitHunkHeaderHighlight = { fg = '#cccccc' }, - - -- FzfLuaBorder = { fg = c.border }, - - NeotestPassedWinBar = { fg = c.success, bg = c.grey1 }, - NeotestFailedWinBar = { fg = c.error, bg = c.grey1 }, - NeotestRunningWinBar = { fg = c.yellow, bg = c.grey1 }, - NeotestSkippedWinBar = { fg = c.cyan, bg = c.grey1 }, - - AerialVariableIcon = { fg = c.green }, - - -- vim-illuminate - -- IlluminatedWordText = { bg = c.illum }, -- by Kyren - -- IlluminatedWordRead = { bg = c.illum }, -- by Kyren - -- IlluminatedWordWrite = { bg = c.illum }, -- by Kyren -} - -local M = {} - -function M.set() - for group, args in pairs(highlights) do - vim.api.nvim_set_hl(0, group, args) - end -end - -return M diff --git a/.config/nvim/lua/plugins/rustaceanvim.lua b/.config/nvim/lua/plugins/rustaceanvim.lua index 564e046..59f1717 100644 --- a/.config/nvim/lua/plugins/rustaceanvim.lua +++ b/.config/nvim/lua/plugins/rustaceanvim.lua @@ -3,6 +3,42 @@ return { version = '^5', lazy = false, -- already lazy init = function() - require('rustaceanvim') + ---@type RustaceanOpts + vim.g.rustaceanvim = { + ---@type RustaceanToolsOpts + tools = { + float_win_config = { + border = 'rounded', + }, + }, + ---@type RustaceanLspClientOpts + server = { + on_attach = function(_, bufnr) + local keymaps = { + { { 'n', 'i' }, '', 'RustLsp codeAction', { desc = 'Code Action' } }, + } + + for _, keymap in ipairs(keymaps) do + local modes = keymap[1] + local lhs = keymap[2] + local rhs = keymap[3] + local opts = keymap[4] + opts.buffer = bufnr + + vim.keymap.set(modes, lhs, rhs, opts) + end + end, + default_settings = { + ['rust-analyzer'] = { + semanticHighlighting = { + operator = { specialization = { enable = true } }, + punctuation = { enable = true, specialization = { enable = true } }, + }, + }, + }, + }, + ---@type RustaceanDapOpts + dap = {}, + } end, } diff --git a/.config/nvim/lua/rustaceanvim.lua b/.config/nvim/lua/rustaceanvim.lua deleted file mode 100644 index 91b1092..0000000 --- a/.config/nvim/lua/rustaceanvim.lua +++ /dev/null @@ -1,37 +0,0 @@ ----@type RustaceanOpts -vim.g.rustaceanvim = { - ---@type RustaceanToolsOpts - tools = { - float_win_config = { - border = 'rounded', - }, - }, - ---@type RustaceanLspClientOpts - server = { - on_attach = function(_, bufnr) - local keymaps = { - { { 'n', 'i' }, '', 'RustLsp codeAction', { desc = 'Code Action' } }, - } - - for _, keymap in ipairs(keymaps) do - local modes = keymap[1] - local lhs = keymap[2] - local rhs = keymap[3] - local opts = keymap[4] - opts.buffer = bufnr - - vim.keymap.set(modes, lhs, rhs, opts) - end - end, - default_settings = { - ['rust-analyzer'] = { - semanticHighlighting = { - operator = { specialization = { enable = true } }, - punctuation = { enable = true, specialization = { enable = true } }, - }, - }, - }, - }, - ---@type RustaceanDapOpts - dap = {}, -}