From aae9a0f31f745c180dc26fb721415d8033a7f023 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Thu, 2 Mar 2023 14:18:25 +0100 Subject: [PATCH] dark mode experiment --- .config/nvim/lazy-lock.json | 58 ++++++----- .config/nvim/lua/config/lazy.lua | 6 +- .config/nvim/lua/config/options.lua | 1 - .config/nvim/lua/plugins/lualine.lua | 2 +- .config/nvim/lua/plugins/zenbones.lua | 132 -------------------------- 5 files changed, 33 insertions(+), 166 deletions(-) delete mode 100644 .config/nvim/lua/plugins/zenbones.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index f935590..c11e5be 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,58 +1,56 @@ { - "Comment.nvim": { "branch": "master", "commit": "418d3117dab2f54c4340ea73e0070dd78fc81753" }, + "Comment.nvim": { "branch": "master", "commit": "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43" }, + "catppuccin": { "branch": "main", "commit": "7c392fb5f27daa6addee050f7b7522718e8d9357" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" }, + "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-tmux": { "branch": "main", "commit": "984772716f66d8ee88535a6bf3f94c4b4e1301f5" }, "colorbuddy.vim": { "branch": "master", "commit": "cdb5b0654d3cafe61d2a845e15b2b4b0e78e752a" }, - "copilot-cmp": { "branch": "master", "commit": "b732a58ac8b7287b981cd9f0d9c0f61e5e9d5760" }, - "copilot.lua": { "branch": "master", "commit": "137df557486f91627b8e4708a47088f36950f12c" }, - "gitsigns.nvim": { "branch": "main", "commit": "4bd5d7702c17643ff40c035b6b936757b99743c7" }, - "go.nvim": { "branch": "master", "commit": "4977d3165d6ee8a06781f7b3443484fe7e91c9a3" }, - "hlargs.nvim": { "branch": "main", "commit": "88b925d699fb39633cdda02c24f0b3ba5d0e6964" }, + "copilot-cmp": { "branch": "master", "commit": "92535dfd9c430b49ca7d9a7da336c5db65826b65" }, + "copilot.lua": { "branch": "master", "commit": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f" }, + "gitsigns.nvim": { "branch": "main", "commit": "76b71f74ce002119fce322df13bd21cc52c1d112" }, + "go.nvim": { "branch": "master", "commit": "7d7b081bf3d3113d1d487d83a5436bd1e7215ff5" }, + "hlargs.nvim": { "branch": "main", "commit": "2a7f9878326cdfd0eb8c91ad543c07680c976227" }, "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" }, - "indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" }, - "lazy.nvim": { "branch": "main", "commit": "6a18404b7d1c05f0d1f35f7b78bd5c282dff7a89" }, - "lsp_lines.nvim": { "branch": "main", "commit": "ec98b45c8280e5ef8c84028d4f38aa447276c002" }, + "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, + "kanagawa": { "branch": "master", "commit": "4c8d48726621a7f3998c7ed35b2c2535abc22def" }, + "lazy.nvim": { "branch": "main", "commit": "26d121ea13bee96b079403cee6598f04969d4983" }, "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" }, + "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "lush.nvim": { "branch": "main", "commit": "b1e8eb1da3fee95ef31515a73c9eff9bf251088d" }, - "marks.nvim": { "branch": "master", "commit": "c3b18b97912720a6586fb537c5c0dfc9e06a68f1" }, - "neogen": { "branch": "main", "commit": "465af9d6c6fb7f360175991dcc23fc10917e3a06" }, + "marks.nvim": { "branch": "master", "commit": "76aca5069c5ce5c0099e30168649e6393e494f26" }, + "neogen": { "branch": "main", "commit": "93d997dbddfe084e77ba4541c54a7b8bfd754fb1" }, "noice.nvim": { "branch": "main", "commit": "d8a1f3056ad713b5d471048f8d029264828e22c0" }, - "nui.nvim": { "branch": "main", "commit": "d147222a1300901656f3ebd5b95f91732785a329" }, - "null-ls.nvim": { "branch": "main", "commit": "9d811bb6ed44cf766f4bda8a47fd65fdfbdcaa7d" }, - "nvim-cmp": { "branch": "main", "commit": "aae0c3e4e778ca4be6fabc52e388cbd5b844b7a5" }, - "nvim-dap": { "branch": "master", "commit": "401f5f22b2d7f9bdbb9294d0235136091458816a" }, + "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, + "null-ls.nvim": { "branch": "main", "commit": "689cdd78f70af20a37b5309ebc287ac645ae4f76" }, + "nvim-cmp": { "branch": "main", "commit": "01f697a68905f9dcae70960a9eb013695a17f9a2" }, + "nvim-dap": { "branch": "master", "commit": "5b986edc95cf7b37da1db91a5c149daa3ac008d2" }, "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" }, - "nvim-dap-ui": { "branch": "master", "commit": "110193102b4840be8bda6eb2358367026145ae3a" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "7f7f2af549e72a0b7bddc3b4f827beb027ea8ce3" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" }, "nvim-lsp-ts-utils": { "branch": "main", "commit": "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7" }, - "nvim-lspconfig": { "branch": "master", "commit": "9b8f5260f3e793e2dcb2899e0a5b944667a95cb2" }, + "nvim-lspconfig": { "branch": "master", "commit": "3b08f2edc461314b9051edf26348f8af3fe33e63" }, "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" }, - "nvim-osc52": { "branch": "main", "commit": "27da4724a887dabed3768b41fa51c785cb62ef26" }, - "nvim-treesitter": { "branch": "master", "commit": "f475b24c81d64d64ab213a73882b7c4f3bbbf26a" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "fcd764507f723903af5507e141ea593e855b504a" }, + "nvim-osc52": { "branch": "main", "commit": "0abf3267090905accf348d19951640e3b95755c3" }, + "nvim-treesitter": { "branch": "master", "commit": "9dd1b9c09707bf1cdd565b999c79ac6461602591" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "4b30081d2736e09f90c890a8a7adfe4df36f5b36" }, "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, - "nvim-web-devicons": { "branch": "master", "commit": "bb6d4fd1e010300510172b173ab5205d37af084f" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2c2317f356c8b7da0252f5da758f71bb60bb6b2" }, "packer.nvim": { "branch": "master", "commit": "1d0cf98a561f7fd654c970c49f917d74fafe1530" }, - "playground": { "branch": "master", "commit": "c481c660fa903a0e295902b1765ecfbd6e76a556" }, - "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" }, + "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" }, + "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "refactoring.nvim": { "branch": "master", "commit": "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a" }, "stylua-nvim": { "branch": "main", "commit": "ce59a353f02938cba3e0285e662fcd3901cd270f" }, "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" }, "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, "telescope-github.nvim": { "branch": "master", "commit": "ee95c509901c3357679e9f2f9eaac3561c811736" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" }, - "telescope.nvim": { "branch": "master", "commit": "203bf5609137600d73e8ed82703d6b0e320a5f36" }, - "trouble.nvim": { "branch": "main", "commit": "556ef3089709a6e253df1e500381fec5eb48e48a" }, + "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" }, + "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, "vim-cue": { "branch": "master", "commit": "bd1a62303d096aa24fe4160a475645087f8770b3" }, "vim-illuminate": { "branch": "master", "commit": "49062ab1dd8fec91833a69f0a1344223dd59d643" }, - "yanky.nvim": { "branch": "main", "commit": "100150704104db1930519eb2a05e5aee6d00f553" }, "zenbones.nvim": { "branch": "main", "commit": "910b8c240c6aaf5263db038db81c538602c766c3" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index a5685f6..553c853 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -5,12 +5,14 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.runtimepath:prepend(lazypath) --- require("lazy").setup("plugins") - require("lazy").setup({ import = "plugins", defaults = { lazy = true }, checker = { enabled = true }, + install = { + missing = true, + colorscheme = { "zenbones" }, + }, performance = { cache = { enabled = true, diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index 4b80a53..462c084 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -49,7 +49,6 @@ vim.cmd("set shortmess+=c") vim.o.completeopt = "menuone,noinsert,noselect" --- Appearance -vim.o.background = "light" vim.o.scrolloff = 7 vim.o.showmode = false vim.o.sidescrolloff = 5 diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index ba2cc41..2b40678 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -14,7 +14,7 @@ function M.config() lualine.setup({ options = { globalstatus = true, - theme = "onelight", + theme = "onedark", component_separators = { left = "╲", right = "╱" }, section_separators = { left = "", right = "" }, }, diff --git a/.config/nvim/lua/plugins/zenbones.lua b/.config/nvim/lua/plugins/zenbones.lua deleted file mode 100644 index 79c2c41..0000000 --- a/.config/nvim/lua/plugins/zenbones.lua +++ /dev/null @@ -1,132 +0,0 @@ -local M = { - "mcchrish/zenbones.nvim", - -- event = "VeryLazy", - dependencies = { - { "rktjmp/lush.nvim" }, - }, -} - -function M.config() - vim.g.zenbones = { - style = "light", - lightness = "bright", - colorize_diagnostic_underline_text = true, - transparent_background = true, - } - - local lush = require("lush") - local base = require("zenbones") - - -- Create some specs - ---@diagnostic disable = undefined-global - local specs = lush.parse(function(injected_functions) - -- See https://github.com/rktjmp/lush.nvim/issues/109 - local sym = injected_functions.sym - return { - CursorLine({ bg = "#f5f5f0" }), - Error({ fg = "#d9534f" }), - CursorLineNr({ fg = "#BCAAA4", bg = "#f5f5f0" }), - MsgArea({ fg = "#A1887F", bg = "#f1f1f1" }), - String({ fg = "#5E8122", gui = "italic" }), - Number({ fg = "#32936F" }), - sym("@field")({ fg = "#6F62A7" }), - sym("@string")({ fg = "#5B7B3D", gui = "italic" }), - sym("@type.definition")({ fg = "#B6465F", gui = "bold" }), - sym("@function")({ fg = "#8C1831", gui = "bold" }), - sym("@method")(sym("@function")), - -- Comment({ fg = "#114499", gui = "bold,italic" }), - -- Comment({ fg = "#144EE1", gui = "bold,italic" }), - Comment({ fg = "#8F001D", gui = "bold,italic" }), - Todo({ fg = "#FF0000", gui = "bold,underline" }), - EndOfBuffer({ fg = "#CBCFE1" }), - CopilotSuggestion({ fg = "#0066cc", gui = "bold,italic" }), - LineNr({ fg = "#9FA8AC", gui = "bold,italic" }), - LineNrAbove({ fg = "#9F080C", gui = "bold,italic" }), - IndentBlanklineContextChar({ fg = "#699FB5", gui = "italic" }), - Indent1({ fg = "#DFDF9A", gui = "italic" }), - Indent2({ fg = "#BAE1FF", gui = "italic" }), - Indent3({ fg = "#BAFFC9", gui = "italic" }), - Indent4({ fg = "#FFB3BA", gui = "italic" }), - Indent5({ fg = "#FFDFBA", gui = "italic" }), - Indent6({ fg = "#F3E5F5", gui = "italic" }), - NormalFloat({ bg = "#FFF9C4" }), - FloatBorder({ fg = "#FFB74D", bg = "#FFF9C4" }), - TelescopeNormal({ bg = "#EFEBE9" }), - TelescopeBorder({ fg = "#A1887F", bg = "#EFEBE9" }), - TelescopeSelection({ fg = "#FFFFFF", bg = "#1976D2" }), - DiagnosticSignError({ fg = "#ff2200", bg = "#fff5ff", gui = "bold" }), - DiagnosticVirtualTextInfo({ fg = "#0033bb", bg = "#f7fcff", gui = "bold,italic" }), - DiagnosticVirtualTextWarn({ fg = "#bb2200", bg = "#fff9f3", gui = "bold,italic" }), - DiagnosticVirtualTextError({ fg = "#ff2200", bg = "#fff5f3", gui = "italic" }), - DiagnosticUnderlineError({ fg = "#ff0000", gui = "undercurl" }), - DiagnosticUnderlineWarn({ fg = "#ff7700", gui = "undercurl" }), - DiagnosticUnderlineInfo({ fg = "#3366cc", gui = "undercurl" }), - MarkSignHL({ fg = "#009688", bg = "#E0F7FA" }), - MarkSignNumHL({ fg = "#B2DFDB", bg = "#E0F7FA" }), - GitSignsAdd({ fg = "#81C784" }), - GitSignsAddNr({ fg = "#C8E6C9" }), - GitSignsDelete({ fg = "#E53935" }), - GitSignsDeleteNr({ fg = "#FFCDD2" }), - GitSignsChange({ fg = "#FFA726" }), - GitSignsChangeNr({ fg = "#FFE0B2" }), - - Hlargs({ fg = "#2274A5" }), - - IlluminatedWordText({ bg = "#FFEE99" }), - NotifyBackground({ bg = "#FFF8D6" }), - - NavicIcons({ fg = "#cc0000" }), - NavicIconsFile({ fg = "#cc0000" }), - NavicIconsModule({ fg = "#cc0000" }), - NavicIconsNamespace({ fg = "#cc0000" }), - NavicIconsPackage({ fg = "#cc0000" }), - NavicIconsClass({ fg = "#cc0000" }), - NavicIconsMethod({ fg = "#cc0000" }), - NavicIconsProperty({ fg = "#cc0000" }), - NavicIconsField({ fg = "#cc0000" }), - NavicIconsConstructor({ fg = "#cc0000" }), - NavicIconsEnum({ fg = "#cc0000" }), - NavicIconsInterface({ fg = "#cc0000" }), - NavicIconsFunction({ fg = "#cc0000" }), - NavicIconsVariable({ fg = "#cc0000" }), - NavicIconsConstant({ fg = "#cc0000" }), - NavicIconsString({ fg = "#cc0000" }), - NavicIconsNumber({ fg = "#cc0000" }), - NavicIconsBoolean({ fg = "#cc0000" }), - NavicIconsArray({ fg = "#cc0000" }), - NavicIconsObject({ fg = "#cc0000" }), - NavicIconsKey({ fg = "#cc0000" }), - NavicIconsKeyword({ fg = "#cc0000" }), - NavicIconsNull({ fg = "#cc0000" }), - NavicIconsEnumMember({ fg = "#cc0000" }), - NavicIconsStruct({ fg = "#cc0000" }), - NavicIconsEvent({ fg = "#cc0000" }), - NavicIconsOperator({ fg = "#cc0000" }), - NavicIconsTypeParameter({ fg = "#cc0000" }), - - NavicText({ fg = "#cc0000", gui = "italic" }), - - -- LspCodeLens({ fg = "#00ff00", gui = "undercurl" }), - -- LspSignatureActiveParameter({ fg = "#ff0000", bg = "#ffffcc" }), - - NoiceCmdlinePopup({ bg = "#E1F5FE" }), - NoiceMini({ bg = "#FFF9C4" }), - - PMenu({ bg = "#F7F5F0" }), - PMenuBorder({ bg = "#F7F5F0", fg = "#886622" }), - PMenuSel({ fg = "#FFFFFF", bg = "#1976D2" }), - PMenuSbar({ bg = "#90CAF9" }), - PMenuThumb({ bg = "#64B5F6" }), - StatusLine({ base = base.VertSplit, fg = "#BCAAA4" }), - StatusLineNC({ base = base.VertSplit, fg = "#BCAAA4" }), - TreesitterContext({ bg = "#f0f0f0", fg = "#BCAAA4", gui = "bold,italic" }), - TreesitterContextLineNumber({ bg = "#f0f0f0", fg = "#979770", gui = "bold,italic" }), - } - end) - - -- Apply specs using lush tool-chain - lush.apply(lush.compile(specs)) - vim.cmd("colorscheme zenbones") -end - -return M