From a93d3578a3dc233a06d19918925c8a2824fa6d86 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Fri, 8 Mar 2024 19:53:33 +0100 Subject: [PATCH] nvim: color scheme tweaks --- .config/nvim/lazy-lock.json | 46 ++++++------ .config/nvim/lua/config/lazy.lua | 2 +- .config/nvim/lua/plugins/colorscheme.lua | 91 +++++++++++++++++------- .config/nvim/lua/plugins/lsp.lua | 20 +++--- 4 files changed, 100 insertions(+), 59 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 192f34b..ca65459 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,26 +1,29 @@ { - "LazyVim": { "branch": "main", "commit": "fe72424e77cb9c953084bbcaaa0eb7fe8056dc70" }, + "LazyVim": { "branch": "main", "commit": "e3bfcb9bf74292dc846f5d1710fbb2e8f36a687a" }, "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, - "SchemaStore.nvim": { "branch": "main", "commit": "ebe6fe2e78c19a0cf6e82752ab6f3ac55c35ef99" }, - "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, - "catppuccin": { "branch": "main", "commit": "c0de3b46811fe1ce3912e2245a9dfbea6b41c300" }, + "SchemaStore.nvim": { "branch": "main", "commit": "6eb5d8d9ec9f81b75aaa6d15d0f6dc12a066fd3f" }, + "alabaster.nvim": { "branch": "main", "commit": "ab61b9d3b7398e6c8ebd5207f609c24ebb37ebeb" }, + "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, + "catppuccin": { "branch": "main", "commit": "045e3499d9ec8d84635fb08877ae44fd33f6a38d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, + "cmp-emoji": { "branch": "main", "commit": "0acd702358230abeb6576769f7116e766bca28a0" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "colorbuddy.nvim": { "branch": "master", "commit": "cdb5b0654d3cafe61d2a845e15b2b4b0e78e752a" }, - "conform.nvim": { "branch": "master", "commit": "34b81e70da83e26c048290204de44268eb59814e" }, + "conform.nvim": { "branch": "master", "commit": "5a15cc46e75cad804fd51ec5af9227aeb1d1bdaa" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" }, + "crates.nvim": { "branch": "main", "commit": "535773ed3b321d68ddd6ef8cd5a1e07b345026a6" }, "dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" }, "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, + "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, + "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, @@ -29,36 +32,35 @@ "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" }, "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "f3941c57ec85d7bdb44fa53fd858fd80f159018f" }, - "neoconf.nvim": { "branch": "main", "commit": "8d7150e9d6113f01421c34c5aeb0f586afa232e0" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "459c60317cc1d251f6eb3b6f010d015d5d24b806" }, + "neoconf.nvim": { "branch": "main", "commit": "db1d1bd45f4e91da6abc898281711fa47eda0ece" }, "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" }, - "nui.nvim": { "branch": "main", "commit": "b81333d12f824dbed5eb231c8a4409a290fdd848" }, + "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, "nvim-dap-go": { "branch": "main", "commit": "64f73400761e2d19459e664a52ea478f3a4420e7" }, "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "a5fc69240869c0fee8ff176bc9e4efdf8bdfb596" }, "nvim-lint": { "branch": "master", "commit": "e824adb9bc01647f71e55457353a68f0f37f9931" }, - "nvim-lspconfig": { "branch": "master", "commit": "c932a56bf25167b1e88d2a1ebe35bb774b41019a" }, + "nvim-lspconfig": { "branch": "master", "commit": "94cf4adb81158817520e18d2174963d8e1424df9" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-noirbuddy": { "branch": "master", "commit": "131b032debf1d9aebd096f41bb3fb7b9e1545b7c" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" }, - "nvim-treesitter": { "branch": "master", "commit": "63ca90eaa3ce1cc668add8828a9e3d6728dbbdf1" }, - "nvim-treesitter-context": { "branch": "master", "commit": "b8d1ffe58a88e0356da56b167373e89c4579ce15" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" }, + "nvim-treesitter": { "branch": "master", "commit": "57205313dda0ac82ac69e21d5e2a80f3297c14cc" }, + "nvim-treesitter-context": { "branch": "master", "commit": "b8b7e52c1517d401d7c519787d5dc4528c41291a" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, - "rasmus.nvim": { "branch": "main", "commit": "f824de95d446686e479781c0c2b778c177da528f" }, - "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, + "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, + "rustaceanvim": { "branch": "master", "commit": "387ca846d632f8c90631536341ca1778b4c2c497" }, "sqlite.lua": { "branch": "master", "commit": "40701b6151f8883980c1548647116de39b763540" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "master", "commit": "aa83606299c5beeaf80e656efbf07bde258db7be" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index b4773e7..9affbf2 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -32,7 +32,7 @@ require("lazy").setup({ version = false, -- always use the latest git commit -- version = "*", -- try installing the latest stable version for plugins that support semver }, - install = { colorscheme = { "eyes" } }, + -- install = { colorscheme = { "eyes" } }, checker = { enabled = true }, -- automatically check for plugin updates performance = { rtp = { diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua index 9ad67d2..30f2076 100644 --- a/.config/nvim/lua/plugins/colorscheme.lua +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -1,20 +1,32 @@ return { - { - "kvrohit/rasmus.nvim", - dependencies = { - { "tjdevries/colorbuddy.nvim" }, - }, - lazy = false, - priority = 1000, - config = function() - vim.g.rasmus_variant = "monochrome" - vim.g.rasmus_bold_functions = true - vim.g.rasmus_bold_comments = false - vim.g.rasmus_italic_comments = true - vim.g.rasmus_transparent = true + -- { + -- "kvrohit/rasmus.nvim", + -- dependencies = { + -- { "tjdevries/colorbuddy.nvim" }, + -- }, + -- lazy = false, + -- priority = 1000, + -- config = function() + -- vim.g.rasmus_variant = "monochrome" + -- vim.g.rasmus_bold_functions = true + -- vim.g.rasmus_bold_comments = false + -- vim.g.rasmus_italic_comments = true + -- vim.g.rasmus_transparent = true + -- + -- -- vim.cmd("colorscheme rasmus") + -- end, + -- }, - -- vim.cmd("colorscheme rasmus") - end, + -- { + -- "LazyVim/LazyVim", + -- opts = { + -- colorscheme = "default", + -- }, + -- }, + + { + "p00f/alabaster.nvim", + lazy = false, }, { @@ -39,9 +51,7 @@ return { undercurl = true, }, colors = { - -- background = "#0d1219", background = "#11171d", - -- background = "#1e2835", primary = "#FFECD3", secondary = "#B0BEC5", -- @@ -51,6 +61,12 @@ return { }) -- local Color, colors, Group, groups, styles = require("colorbuddy").setup() + + Color.new("ColorColumn", "#171e26") + Group.new("ColorColumn", nil, colors.ColorColumn) + Color.new("normal", "#e3e0cd") + Group.new("Normal", colors.normal, nil) + Color.new("string", "#D7CCC8") Color.new("symbol", "#ECEFF1") -- @@ -70,15 +86,15 @@ return { Group.new("MiniIndentscopeSymbol", colors.MiniIndentscopeSymbol) -- Color.new("CursorFg", "#000000", styles.nocombine) - Color.new("CursorBg", "#00d992", styles.nocombine) + Color.new("CursorBg", "#23fdb6", styles.nocombine) Group.new("Cursor", colors.CursorFg, colors.CursorBg) Color.new("CursorLine", "#141b23") Group.new("CursorLine", nil, colors.CursorLine) - -- + Color.new("NavicTextFg", "#5fbf9f") Color.new("NavicTextBg", "#333333") Color.new("NavicIcon", "#5fbf9f") - -- + Group.new("NavicText", colors.NavicTextFg, colors.NavicTextBg) Group.new("NavicIcon", colors.NavicIcon, colors.NavicTextBg) Group.link("NavicIconsFile", groups.NavicIcon) @@ -107,16 +123,40 @@ return { Group.link("NavicIconsEvent", groups.NavicIcon) Group.link("NavicIconsOperator", groups.NavicIcon) Group.link("NavicIconsTypeParameter", groups.NavicIcon) - -- + Color.new("NormalFloatFg", "#b8d1ef", styles.nocombine) Color.new("NormalFloatBg", "#335a88", styles.nocombine) Group.new("NormalFloat", colors.NormalFloatFg, colors.NormalFloatBg) - -- + Color.new("PmenuSelFg", "#f3d390", styles.nocombine) Color.new("PmenuSelBg", "#335a88", styles.nocombine) Group.new("PmenuSel", colors.PmenuSelFg, colors.PmenuSelBg) + + Color.new("PmenuSelBg", "#335a88", styles.nocombine) + Group.new("PmenuSel", colors.PmenuSelFg, colors.PmenuSelBg) + + Color.new("TreesitterContext", "#233344", styles.nocombine) + Group.new("TreesitterContext", nil, colors.TreesitterContext) + + -- Color.new("NonText", "#955252", styles.nocombine) + Color.new("NonText", "#955252", styles.nocombine) + + Color.new("comment2", "#51a0cf") + Group.new("Comment", colors.NonText, nil, styles.italic + styles.bold) + Group.new("LspInlayHint", colors.comment2, nil, styles.italic) + + Group.new("NonText", colors.NonText, nil, styles.italic) + Group.new("NonText", colors.NonText, nil, styles.italic) + + Color.new("spelling", "#ffce60") + Group.new("SpellBad", colors.spelling, nil, styles.undercurl) + + Color.new("LspInfoTitle", "#955252") + Group.new("LspInfoTitle", colors.LspInfoTitle, nil, styles.italic) + -- Group.new("DiagnosticHint", colors.LspInfoTitle, nil, styles.italic) -- -- Color.new("TroubleFg", "#ffce60", styles.nocombine) + -- Color.new("TroubleFg", "#ffce60", styles.nocombine) -- Color.new("TroubleBg", "#260200", styles.nocombine) -- Group.new("TroubleNormal", colors.TroubleFg, colors.TroubleBg) -- Group.link("TroubleText", groups.TroubleNormal) @@ -131,8 +171,9 @@ return { -- Group.new("TelescopeTitle", colors.primary) Group.new("TelescopeBorder", colors.secondary) - Group.new("@comment", colors.comment, nil, styles.italic) + Group.new("@comment", colors.comment, nil, styles.italic + styles.bold) Group.new("@string", colors.string, nil, styles.italic) + -- Group.new("@keyword", colors.noir_2) Group.new("@keyword.function", colors.noir_2) @@ -143,8 +184,8 @@ return { -- Group.new("Hlargs", colors.noir_3, nil, styles.italic) Group.new("@type.builtin", colors.noir_2) -- - Group.new("@variable", colors.symbol, nil, styles.italic) - Group.new("Hlargs", colors.hlargs, nil, styles.italic) + Group.new("@variable", colors.symbol, nil) + Group.new("Hlargs", colors.hlargs, nil) -- Group.new("@function", colors.noir_1, nil, styles.bold) Group.new("@method", colors.noir_1, nil, styles.bold) diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index db126a3..3a94ba6 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -2,15 +2,14 @@ return { { "neovim/nvim-lspconfig", opts = { - inlay_hints = { enabled = true }, - capabilities = { - workspace = { - didChangeWatchedFiles = { - dynamicRegistration = false, - }, - }, - }, - ---@type lspconfig.options + -- inlay_hints = { enabled = true }, + -- capabilities = { + -- workspace = { + -- didChangeWatchedFiles = { + -- dynamicRegistration = false, + -- }, + -- }, + -- }, servers = { rust_analyzer = { keys = { @@ -46,11 +45,10 @@ return { settings = { yaml = { schemas = { - kubernetes = "*.yaml", + -- kubernetes = "*.yaml", ["http://json.schemastore.org/github-workflow"] = ".github/workflows/*", ["http://json.schemastore.org/github-action"] = ".github/action.{yml,yaml}", ["http://json.schemastore.org/ansible-stable-2.9"] = "roles/tasks/*.{yml,yaml}", - ["http://json.schemastore.org/kustomization"] = "kustomization.{yml,yaml}", ["http://json.schemastore.org/chart"] = "Chart.{yml,yaml}", ["https://json.schemastore.org/dependabot-v2"] = ".github/dependabot.{yml,yaml}", ["https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json"] = "*api*.{yml,yaml}",