From 2df09ac4fbfaace2acda83b1fe40184cc170b328 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Sat, 25 Mar 2023 17:14:05 +0100 Subject: [PATCH] neovim: theme juggling --- .config/nvim/lazy-lock.json | 36 +++--- .config/nvim/lua/config/options.lua | 4 + .config/nvim/lua/plugins/shelman-theme.lua | 6 + .config/nvim/lua/plugins/zenbones.lua | 134 --------------------- 4 files changed, 27 insertions(+), 153 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 7cab44d..d116230 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -9,34 +9,33 @@ "cmp-tmux": { "branch": "main", "commit": "984772716f66d8ee88535a6bf3f94c4b4e1301f5" }, "colorbuddy.vim": { "branch": "master", "commit": "cdb5b0654d3cafe61d2a845e15b2b4b0e78e752a" }, "copilot-cmp": { "branch": "master", "commit": "92535dfd9c430b49ca7d9a7da336c5db65826b65" }, - "copilot.lua": { "branch": "master", "commit": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f" }, - "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" }, - "go.nvim": { "branch": "master", "commit": "063bf059e31f226c525415769bf3c312c8468566" }, + "copilot.lua": { "branch": "master", "commit": "db62371b6eac73954c194f3c8faee36cffee8135" }, + "gitsigns.nvim": { "branch": "main", "commit": "ca473e28382f1524aa3d2b6f04bcf54f2e6a64cb" }, + "go.nvim": { "branch": "master", "commit": "c02634a8350d559eeed94f78c67016fa6d80a8bf" }, "hlargs.nvim": { "branch": "main", "commit": "a7ad6ed8d6e27ea4dd13fda63fa732e9196ba4ea" }, "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "5b4444f0d7e556deba3f7ca949a2ba0e2c3369fb" }, + "lazy.nvim": { "branch": "main", "commit": "a80422f21750fcbf0e90b26da877d4024d76f116" }, "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, - "lush.nvim": { "branch": "main", "commit": "62180850d230e1650fe5543048bb15c4452916d6" }, "marks.nvim": { "branch": "master", "commit": "76aca5069c5ce5c0099e30168649e6393e494f26" }, "neogen": { "branch": "main", "commit": "93d997dbddfe084e77ba4541c54a7b8bfd754fb1" }, - "noice.nvim": { "branch": "main", "commit": "e2a04d480a9fba6b698c01998582ea17aa213ba3" }, + "noice.nvim": { "branch": "main", "commit": "f8b1a72a7bce56d9e9ed054708dc855d57dec085" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, - "null-ls.nvim": { "branch": "main", "commit": "09e99259f4cdd929e7fb5487bf9d92426ccf7cc1" }, - "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" }, - "nvim-dap": { "branch": "master", "commit": "73196075627a4f079c62b0dd4aff8ce0a1b7cf57" }, + "null-ls.nvim": { "branch": "main", "commit": "0180603b6f3cee40f83c6fc226b9ac5f85e691c4" }, + "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" }, + "nvim-dap": { "branch": "master", "commit": "7e81998e31277c7a33b6c34423640900c5c2c776" }, "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c" }, "nvim-lsp-ts-utils": { "branch": "main", "commit": "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7" }, - "nvim-lspconfig": { "branch": "master", "commit": "4bb0f1845c5cc6465aecedc773fc2d619fcd8faf" }, - "nvim-navic": { "branch": "master", "commit": "cdd24539bcf114a499827e9b32869fe74836efe7" }, + "nvim-lspconfig": { "branch": "master", "commit": "c6105c449683b944b5d2138fcf82f18c657249e9" }, + "nvim-navic": { "branch": "master", "commit": "ca34afcd15c7f6dd0836fc4fca2e37024bfa5019" }, "nvim-osc52": { "branch": "main", "commit": "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31" }, - "nvim-treesitter": { "branch": "master", "commit": "e3ebc8ec5d586162f3c408417621daa59ba8ea62" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "542e0879d524ba717234fcba049b6c2da7989d5a" }, - "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, + "nvim-treesitter": { "branch": "master", "commit": "1f087c91f5ca76a2257b855d72d371a2b5302986" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "582cbb5a4cb50f6161cac8cc01f55aeaff6d836a" }, + "nvim-ts-autotag": { "branch": "main", "commit": "25698e4033cd6cd3745454bfc837dd670eba0480" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "729d83ecb990dc2b30272833c213cc6d49ed5214" }, - "nvim-web-devicons": { "branch": "master", "commit": "4af94fec29f508159ceab5413383e5dedd6c24e3" }, + "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, "packer.nvim": { "branch": "master", "commit": "1d0cf98a561f7fd654c970c49f917d74fafe1530" }, "playground": { "branch": "master", "commit": "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, @@ -46,9 +45,8 @@ "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": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" }, - "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, + "telescope.nvim": { "branch": "master", "commit": "942fe5faef47b21241e970551eba407bc10d9547" }, + "trouble.nvim": { "branch": "main", "commit": "7915277a259fdff5d46c6f1d2e100df2ec384d3b" }, "vim-cue": { "branch": "master", "commit": "bd1a62303d096aa24fe4160a475645087f8770b3" }, - "vim-illuminate": { "branch": "master", "commit": "49062ab1dd8fec91833a69f0a1344223dd59d643" }, - "zenbones.nvim": { "branch": "main", "commit": "910b8c240c6aaf5263db038db81c538602c766c3" } + "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index 2686c4f..fb8d091 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -69,3 +69,7 @@ vim.g.netrw_dirhistmax = 0 --- Key mappings vim.keymap.set("n", "", ':let @/=""') -- clear search vim.keymap.set("n", ",L", ":luafile %") -- Reload lua file + +-- AutoCommand OSC7 workaround for tmux +-- see https://github.com/neovim/neovim/issues/21771 +vim.cmd([[autocmd DirChanged * call chansend(v:stderr, printf("\033]7;file://%s\033\\", v:event.cwd))]]) diff --git a/.config/nvim/lua/plugins/shelman-theme.lua b/.config/nvim/lua/plugins/shelman-theme.lua index eb28066..5c55c5b 100644 --- a/.config/nvim/lua/plugins/shelman-theme.lua +++ b/.config/nvim/lua/plugins/shelman-theme.lua @@ -1,4 +1,10 @@ return { name = "shelman-theme", dir = "~/.config/shelman-theme/current/neovim", + dev = true, + lazy = false, + priority = 1000, + config = function() + vim.cmd([[colorscheme shelman]]) + end, } diff --git a/.config/nvim/lua/plugins/zenbones.lua b/.config/nvim/lua/plugins/zenbones.lua deleted file mode 100644 index f4a6cca..0000000 --- a/.config/nvim/lua/plugins/zenbones.lua +++ /dev/null @@ -1,134 +0,0 @@ -local M = { - "mcchrish/zenbones.nvim", - lazy = false, - priority = 1000, - -- event = "VeryLazy", - dependencies = { - { "rktjmp/lush.nvim" }, - }, -} - -function M.config() - vim.g.kanagawabones = { - -- 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 kanagawabones") -end - -return M