From c37b9e5f00d51aa8625c51fe9fd3431fbb4c5ae4 Mon Sep 17 00:00:00 2001 From: m0ntagur Date: Tue, 28 Nov 2023 16:03:06 +0100 Subject: --- nvim/colors/lushwal.vim | 218 ++++++++++++++++++++++++++++++++++++++++++++++++ nvim/init.lua | 13 ++- nvim/lazy-lock.json | 34 ++++---- nvim/lua/options.lua | 4 +- nvim/lua/plugins.lua | 116 ++++++++++++-------------- 5 files changed, 297 insertions(+), 88 deletions(-) create mode 100644 nvim/colors/lushwal.vim diff --git a/nvim/colors/lushwal.vim b/nvim/colors/lushwal.vim new file mode 100644 index 0000000..c24d7cf --- /dev/null +++ b/nvim/colors/lushwal.vim @@ -0,0 +1,218 @@ +set background=dark +if exists('g:colors_name') +hi clear +if exists('syntax_on') +syntax reset +endif +endif +let g:colors_name = 'lushwal' +highlight Normal guifg=#ACB9BE guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight! link User Normal +highlight Bold guifg=#ACB9BE guibg=#0F1413 guisp=NONE blend=NONE gui=bold +highlight Boolean guifg=#5C7845 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Character guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight ColorColumn guifg=#879297 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Comment guifg=#ACB9BE guibg=NONE guisp=NONE blend=NONE gui=italic +highlight Conceal guifg=#798386 guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight! link Whitespace Conceal +highlight Conditional guifg=#9AC6B8 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Constant guifg=#5C7845 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Cursor guifg=#0F1413 guibg=#ACB9BE guisp=NONE blend=NONE gui=NONE +highlight CursorColumn guifg=#879297 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight CursorLine guifg=#798386 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight CursorLineNr guifg=#ACB9BE guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight Debug guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Define guifg=#9AC6B8 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Delimiter guifg=#697156 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight DiagnosticError guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight DiagnosticHint guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight DiagnosticInfo guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight DiagnosticUnderlineError guifg=#596751 guibg=NONE guisp=#596751 blend=NONE gui=underline +highlight DiagnosticUnderlineHint guifg=#96A35C guibg=NONE guisp=#96A35C blend=NONE gui=underline +highlight DiagnosticUnderlineInfo guifg=#6A9051 guibg=NONE guisp=#6A9051 blend=NONE gui=underline +highlight DiagnosticUnderlineWarn guifg=#608B37 guibg=NONE guisp=#608B37 blend=NONE gui=underline +highlight DiagnosticWarn guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight DiffAdd guifg=#A56155 guibg=#798386 guisp=NONE blend=NONE gui=bold +highlight! link DiffAdded DiffAdd +highlight DiffChange guifg=#9AA7AC guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight DiffDelete guifg=#596751 guibg=#798386 guisp=NONE blend=NONE gui=bold +highlight! link DiffRemoved DiffDelete +highlight! link diffRemoved DiffDelete +highlight DiffFile guifg=#596751 guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight DiffLine guifg=#6A9051 guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight DiffNewFile guifg=#A56155 guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight DiffText guifg=#6A9051 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight Directory guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight EndOfBuffer guifg=#ACB9BE guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight Error guifg=#596751 guibg=#ACB9BE guisp=NONE blend=NONE gui=NONE +highlight ErrorMsg guifg=#596751 guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight Exception guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Float guifg=#5C7845 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight FoldColumn guifg=#6A9051 guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight Folded guifg=#ACB9BE guibg=#798386 guisp=NONE blend=NONE gui=italic +highlight Function guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Identifier guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight IncSearch guifg=#798386 guibg=#5C7845 guisp=NONE blend=NONE gui=NONE +highlight Include guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Italic guifg=#ACB9BE guibg=#0F1413 guisp=NONE blend=NONE gui=italic +highlight Keyword guifg=#9AC6B8 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Label guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight LineNr guifg=#9AA7AC guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight Macro guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight MatchParen guifg=#ACB9BE guibg=#9AA7AC guisp=NONE blend=NONE gui=NONE +highlight MiniCompletionActiveParameter guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight MiniCursorword guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=underline +highlight! link MiniCursorwordCurrent MiniCursorword +highlight MiniIndentscopePrefix guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=nocombine +highlight MiniIndentscopeSymbol guifg=#798386 guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight MiniJump guifg=#6A9051 guibg=NONE guisp=#9AA7AC blend=NONE gui=underline +highlight MiniJump2dSpot guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=undercurl +highlight MiniStarterCurrent guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight MiniStarterFooter guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=bold +highlight MiniStarterHeader guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=bold +highlight MiniStarterInactive guifg=#ACB9BE guibg=NONE guisp=NONE blend=NONE gui=italic +highlight MiniStarterItem guifg=#ACB9BE guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight MiniStarterItemBullet guifg=#697156 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight MiniStarterItemPrefix guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight MiniStarterQuery guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight MiniStarterSection guifg=#697156 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineDevinfo guifg=#ACB9BE guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineFileinfo guifg=#ACB9BE guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineFilename guifg=#608B37 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineInactive guifg=#879297 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineModeCommand guifg=#0F1413 guibg=#96A35C guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineModeInsert guifg=#0F1413 guibg=#6A9051 guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineModeNormal guifg=#0F1413 guibg=#A56155 guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineModeOther guifg=#0F1413 guibg=#9AC6B8 guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineModeReplace guifg=#0F1413 guibg=#596751 guisp=NONE blend=NONE gui=NONE +highlight MiniStatuslineModeVisual guifg=#0F1413 guibg=#5C7845 guisp=NONE blend=NONE gui=NONE +highlight MiniSurround guifg=#798386 guibg=#5C7845 guisp=NONE blend=NONE gui=NONE +highlight MiniTablineCurrent guifg=#9AA7AC guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniTablineFill guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight MiniTablineHidden guifg=#A56155 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniTablineModifiedCurrent guifg=#ACB9BE guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniTablineModifiedHidden guifg=#879297 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniTablineModifiedVisible guifg=#ACB9BE guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniTablineVisible guifg=#9AA7AC guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight MiniTestEmphasis guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=bold +highlight MiniTestFail guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=bold +highlight MiniTestPass guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=bold +highlight MiniTrailspace guifg=#596751 guibg=#ACB9BE guisp=NONE blend=NONE gui=NONE +highlight ModeMsg guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight MoreMsg guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight NonText guifg=#9AA7AC guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Number guifg=#5C7845 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Operator guifg=#ACB9BE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight PMenu guifg=#ACB9BE guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight PMenuSel guifg=#ACB9BE guibg=#6A9051 guisp=NONE blend=NONE gui=NONE +highlight PmenuSbar guifg=#879297 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight PmenuThumb guifg=#ACB9BE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight PreProc guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Question guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Repeat guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Search guifg=#9AA7AC guibg=#608B37 guisp=NONE blend=NONE gui=NONE +highlight! link MiniTablineTabpagesection Search +highlight SignColumn guifg=#879297 guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight Special guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight SpecialChar guifg=#697156 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight SpecialKey guifg=#9AA7AC guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight SpellBad guifg=#596751 guibg=NONE guisp=#596751 blend=NONE gui=underline +highlight SpellCap guifg=#608B37 guibg=NONE guisp=#608B37 blend=NONE gui=underline +highlight SpellLocal guifg=#96A35C guibg=NONE guisp=#96A35C blend=NONE gui=underline +highlight SpellRare guifg=#9AC6B8 guibg=NONE guisp=#9AC6B8 blend=NONE gui=underline +highlight Statement guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight StatusLine guifg=#ACB9BE guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight StatusLineNC guifg=#879297 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight StatusLineTerm guifg=#A56155 guibg=#A56155 guisp=NONE blend=NONE gui=NONE +highlight StatusLineTermNC guifg=#608B37 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight StorageClass guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight String guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Structure guifg=#9AC6B8 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight TabLine guifg=#9AA7AC guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight TabLineFill guifg=#9AA7AC guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight TabLineSel guifg=#A56155 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight Tag guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Title guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=bold +highlight Todo guifg=#608B37 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight TooLong guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Type guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Typedef guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight Underlined guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight VertSplit guifg=#ACB9BE guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight! link WinSeparator VertSplit +highlight Visual guifg=#0F1413 guibg=#879297 guisp=NONE blend=NONE gui=NONE +highlight VisualNOS guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight WarningMsg guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight WildMenu guifg=#ACB9BE guibg=#6A9051 guisp=NONE blend=NONE gui=NONE +highlight WinBar guifg=#ACB9BE guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight WinBarNC guifg=#879297 guibg=#0F1413 guisp=NONE blend=NONE gui=NONE +highlight gitCommitOverflow guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight gitCommitSummary guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight helpCommand guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight helpExample guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @attribute guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @boolean guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @character guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @character.special guifg=#697156 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @comment guifg=#ACB9BE guibg=NONE guisp=NONE blend=NONE gui=italic +highlight @conditional guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @constant guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @constant.builtin guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @constant.macro guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @constructor guifg=#ACB9BE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @debug guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @define guifg=#9AC6B8 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @exception guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @field guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @float guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @function guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @function.builtin guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @function.macro guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @include guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @keyword guifg=#9AC6B8 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @keyword.function guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @keyword.operator guifg=#9AC6B8 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @label guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @method guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @namespace guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @none guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @number guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @operator guifg=#ACB9BE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @parameter guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @preproc guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @property guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @punctuation.bracket guifg=#ACB9BE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @punctuation.delimiter guifg=#ACB9BE guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @punctuation.special guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=bold +highlight @repeat guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @storageclass guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @string guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @string.escape guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @string.regex guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @string.special guifg=#697156 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @symbol guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @tag guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @tag.attribute guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @tag.delimiter guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @text guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @text.bold guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=bold +highlight @text.danger guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @text.diff.add guifg=#A56155 guibg=#798386 guisp=NONE blend=NONE gui=bold +highlight @text.diff.delete guifg=#596751 guibg=#798386 guisp=NONE blend=NONE gui=bold +highlight @text.emphasis guifg=#9AC6B8 guibg=NONE guisp=NONE blend=NONE gui=italic +highlight @text.environment guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @text.environment.name guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @text.literal guifg=#A56155 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @text.math guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @text.note guifg=#96A35C guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @text.reference guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @text.strike guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=strikethrough +highlight @text.title guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=bold +highlight @text.todo guifg=#608B37 guibg=#798386 guisp=NONE blend=NONE gui=NONE +highlight @text.underline guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=underline +highlight @text.uri guifg=NONE guibg=#798386 guisp=NONE blend=NONE gui=underline +highlight @type guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @type.builtin guifg=#6A9051 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @type.definition guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @variable guifg=#608B37 guibg=NONE guisp=NONE blend=NONE gui=NONE +highlight @variable.builtin guifg=#596751 guibg=NONE guisp=NONE blend=NONE gui=NONE diff --git a/nvim/init.lua b/nvim/init.lua index e577d4a..716cc1c 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,10 +1,15 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - -- bootstrap lazy.nvim - -- stylua: ignore - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end -vim.opt.rtp:prepend(vim.env.LAZY or lazypath) +vim.opt.rtp:prepend(lazypath) require('autocmds') require('keymaps') diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index bc39837..088bc33 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,23 +1,23 @@ { - "Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" }, - "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" }, - "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" }, + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, + "LuaSnip": { "branch": "master", "commit": "0df29db3543837f8b41597f2640397c5ec792b7b" }, + "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "colorbuddy.nvim": { "branch": "master", "commit": "cdb5b0654d3cafe61d2a845e15b2b4b0e78e752a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, - "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, - "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, - "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, - "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, - "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, - "nvim-noirbuddy": { "branch": "master", "commit": "d6125a2d20aa02321693cd01b5d4e0702dc1a580" }, - "nvim-tree.lua": { "branch": "master", "commit": "3b62c6bf2c3f2973036aed609d02fd0ca9c3af35" }, - "nvim-treesitter": { "branch": "master", "commit": "9fa6806b88905d52b5ca36094909630919b432cc" }, - "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, - "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, - "staline.nvim": { "branch": "main", "commit": "a1b4d79382015ca40e257340ac3f27c51282fb8c" }, - "telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" } + "coal.nvim": { "branch": "main", "commit": "2a1aaad91fbe795a913fc4b402c82b961cf5aa31" }, + "indent-blankline.nvim": { "branch": "master", "commit": "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" }, + "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, + "nvim-autopairs": { "branch": "master", "commit": "f6c71641f6f183427a651c0ce4ba3fb89404fa9e" }, + "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, + "nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" }, + "nvim-tree.lua": { "branch": "master", "commit": "40b9b887d090d5da89a84689b4ca0304a9649f62" }, + "nvim-treesitter": { "branch": "master", "commit": "9c4fc86b67c1d68141cef57846d24cbee9b74fb0" }, + "nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "staline.nvim": { "branch": "main", "commit": "280c966df73a840d79d5fa0bda08fab50aba05c6" }, + "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" } } \ No newline at end of file diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua index 1988661..5b431d9 100644 --- a/nvim/lua/options.lua +++ b/nvim/lua/options.lua @@ -1,5 +1,4 @@ local options = { - langmenu = 'en_US.UTF-8', list = false, backup = false, -- creates a backup file clipboard = "unnamedplus", -- allows neovim to access the system clipboard @@ -27,7 +26,7 @@ local options = { shiftwidth = 2, -- the number of spaces inserted for each indentation tabstop = 2, -- insert 2 spaces for a tab ⇥ cursorline = false, -- highlight the current line (disabled for now) - number = true, -- set numbered lines + number = false, -- set numbered lines relativenumber = false, -- set relative numbered lines numberwidth = 4, -- set number column width to 2 (default 4) wrap = false, -- display lines as one long lines @@ -42,4 +41,3 @@ end vim.wo.list = false vim.cmd 'set whichwrap+=<,>,[,],h,l' -vim.cmd 'lang en' diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 238ed78..b67c007 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -1,29 +1,28 @@ require('lazy').setup({ - -- TokyoNight colorscheme - { - 'folke/tokyonight.nvim', - enabled = false, + { + 'cranberry-clockworks/coal.nvim', lazy = false, priority = 1000, config = function() - require('tokyonight').setup({ - style = 'night', - transparent = true, - styles = { - comments = { italic = false}, - keywords = { italic = true }, - functions = {}, - variables = {}, - sidebars = 'transparent', - floats = 'transparent', - }, - }) - vim.cmd([[colorscheme tokyonight]]) + vim.cmd.colorscheme('coal') + vim.cmd('highlight Normal guibg=NONE ctermbg=NONE') + vim.cmd('highlight LineNr guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE') + vim.cmd('highlight NormalNC guibg=NONE ctermbg=NONE') + vim.cmd('highlight CursorLine guibg=NONE ctermbg=NONE') + -- completion menu transparent + vim.cmd('highlight Pmenu guibg=NONE ctermbg=NONE') + vim.cmd('highlight PmenuSel guibg=NONE ctermbg=NONE') + -- vertical lines transparent + vim.cmd('highlight WinSeparator guibg=None ctermbg=None') + vim.cmd('highlight VertSplit guibg=NONE ctermbg=NONE') + + vim.cmd('highlight SignColumn guibg=NONE ctermbg=None') end }, -- { 'jesseleite/nvim-noirbuddy', + enabled = false, lazy = false, priority = 1000, dependencies = { 'tjdevries/colorbuddy.nvim' }, @@ -32,13 +31,27 @@ require('lazy').setup({ preset = 'minimal', }) vim.cmd('colorscheme noirbuddy') + -- nvim transparent + vim.cmd('highlight Normal guibg=NONE ctermbg=NONE') + vim.cmd('highlight LineNr guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE') + vim.cmd('highlight NormalNC guibg=NONE ctermbg=NONE') + vim.cmd('highlight CursorLine guibg=NONE ctermbg=NONE') + -- completion menu transparent + vim.cmd('highlight Pmenu guibg=NONE ctermbg=NONE') + vim.cmd('highlight PmenuSel guibg=NONE ctermbg=NONE') + -- vertical lines transparent + vim.cmd('highlight VertSplit guibg=NONE ctermbg=NONE') end }, -- Portable package manager to install and manage LSP servers, DAP servers, linters, and formatters. { 'williamboman/mason.nvim', + dependencies = { 'williamboman/mason-lspconfig.nvim' }, config = function() require('mason').setup() + require('mason-lspconfig').setup({ + automatic_installation = true, + }) end }, -- A completion engine plugin for neovim written in Lua. @@ -50,9 +63,9 @@ require('lazy').setup({ 'neovim/nvim-lspconfig', config = function() local signs = { - Error = " ", + Error = " ", Warn= " ", - Hint = " ", + Hint = " ", Info= " " } for type, icon in pairs(signs) do @@ -66,8 +79,8 @@ require('lazy').setup({ capabilities = capabilities, settings = { update_in_insert = true, - } - } + } + } lsp.lua_ls.setup { capabilities = capabilities, settings = { @@ -140,7 +153,7 @@ require('lazy').setup({ else fallback() end - end, { "i", "s" }), + end, { "i", "s" }), }, sources = cmp.config.sources({ { name = 'nvim_lsp' }, @@ -164,22 +177,21 @@ require('lazy').setup({ -- Adds indentation guides to all lines. { 'lukas-reineke/indent-blankline.nvim', - config = function() - require('indent_blankline').setup({ - filetype_exclude = { - 'help', - 'terminal', - 'alpha', - 'lazy', - 'NvimTree', - } - }) - end + main = "ibl", + opt = { + filetypes = { + "help", + "terminal", + "alpha", + "lazy", + "NvimTree" + } + } }, -- { 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate', + build = ':TSUpdate', config = function() require('nvim-treesitter.configs').setup({ auto_install = true, @@ -188,7 +200,7 @@ require('lazy').setup({ enable = true, use_languagetree = true }, - indent = true, + indent = { enable=true }, }) end }, @@ -239,6 +251,7 @@ require('lazy').setup({ extensions = { } }) + vim.api.nvim_set_keymap('n', '', ':Telescope current_buffer_fuzzy_find', { noremap = true, silent = true }) end }, -- @@ -291,41 +304,16 @@ require('lazy').setup({ 'tamton-aquib/staline.nvim', dependencies = { 'nvim-tree/nvim-web-devicons' }, config = function () - local function getCurrentTime() - local time = os.date("*t") - local hour = string.format("%02d", time.hour) - local minute = string.format("%02d", time.min) - return hour .. ":" .. minute - end require "staline".setup { sections = { - left = { ' ', 'mode', ' ', ' ', 'file_name' ,' ','branch'}, + left = { ' ' }, mid = {'lsp'}, - right = { 'line_column', getCurrentTime} + right = { 'line_column' } }, - --mode_colors = { - -- i = "#81a1c1", - -- n = "#88c0d0", - -- c = "#a3be8c", - -- v = "#b48ead", - -- i = "#d4be98", - -- n = "#8fbcbb", - -- v = "#81a1c1", - --}, - --mode_icons = { - -- n = "⌂ Normal ", - -- i = " Insert ", - -- c = " Command ", - -- v = " Visual ", - -- V = " Visual Line ", - --}, + lsp_symbols = { Error=" ", Info=" ", Warn=" ", Hint="" }, defaults = { true_colors = true, - -- line_column = " ☰%p%% ", - -- line_column = " ☰%l/%L ", - line_column = '%l/%L %c ☰ %p%%', - -- line_column_new = " ☰%p%% ", - -- line_column = "%l/%L %c ☰%p%% ", + line_column = ' ☰ %l/%L %c', branch_symbol = " ", exclude_fts = { 'NvimTree', 'Alpha' }, }, -- cgit v1.3.1