From 60884400c12a7c06227e6af791a5d1fbf7e4573c Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Thu, 8 Feb 2024 15:39:47 -0500 Subject: [PATCH] Okay, just a back up. Redoing colorschemes... --- nvim/.config/nvim/lazy-lock.json | 48 +++--- nvim/.config/nvim/lua/plugins/init.lua | 149 +++++++++--------- nvim/.config/nvim/lua/plugins/rainbow_csv.lua | 19 +++ 3 files changed, 121 insertions(+), 95 deletions(-) create mode 100644 nvim/.config/nvim/lua/plugins/rainbow_csv.lua diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 01b697a..b282a26 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" }, - "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, + "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" }, "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" }, @@ -28,58 +28,60 @@ "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" }, + "link.nvim": { "branch": "main", "commit": "76fbb97e9bdc932f72669261099a76de2d576f0d" }, "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "lush.nvim": { "branch": "main", "commit": "2e8d34e748642621d761a65e3c2a198154b914e8" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "558de4372d23bd432cc3594666c4d812cd071bbf" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "a1e19bf9baa86e8a43dd86cf9689ca9f71b4d1da" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" }, "mini.fuzzy": { "branch": "stable", "commit": "3f4dca52f791feb5a009fecf8d519f2e391271f4" }, + "mini.hipatterns": { "branch": "main", "commit": "82d348b05328705a7048f852f15f66a482562f03" }, "mini.move": { "branch": "main", "commit": "03a16d64e58da0a871de6493c3d8fa1101baef46" }, "mini.pairs": { "branch": "stable", "commit": "71f117fd57f930da6ef4126b24f594dd398bac26" }, "mini.surround": { "branch": "main", "commit": "af8129efcabe95fc08a233e9f91569829bed031f" }, "mini.trailspace": { "branch": "main", "commit": "60d0eca6703b55285e33b0da00105cde50d188df" }, "mkdnflow.nvim": { "branch": "main", "commit": "7b2fc47d6a3ae3b19ebc5a7eea00ea1e712f20d1" }, - "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" }, + "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" }, "neovim": { "branch": "main", "commit": "9d7474f80afe2f0cfcb4fabfc5451f509d844b85" }, - "night-owl.nvim": { "branch": "main", "commit": "d367c16e57843ff50447b23746c4d5fcbf09ce35" }, - "nightfly": { "branch": "master", "commit": "050e56f09233a7b00884fe83cfc5ecfd9129791c" }, - "nightfox.nvim": { "branch": "main", "commit": "57b8154aba0de8ced36722ea2674a7b97e4f468f" }, + "night-owl.nvim": { "branch": "main", "commit": "2b7e78c34e25aea841d10ebc3ee19d6d558e9ec0" }, + "nightfly": { "branch": "master", "commit": "56fe47bd16272d9644fd9946a2596fa2c3905c35" }, + "nightfox.nvim": { "branch": "main", "commit": "a408e6bb101066952b81de9c11be367114bd561f" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, - "nvim": { "branch": "main", "commit": "afab7ec2a79c7127627dede79c0018b6e45663d0" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, - "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" }, + "nvim": { "branch": "main", "commit": "c2034f7b549152e5cc757820426341ea5000bc7a" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" }, + "nvim-dap-python": { "branch": "master", "commit": "f5b6f3a90aae0284b61fb3565e575267c19a16e6" }, "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, "nvim-http": { "branch": "main", "commit": "11de61bcdf01f4728dd8d8bbcd48901d220c28cc" }, - "nvim-lspconfig": { "branch": "master", "commit": "021906284dcfb938bc236f8295af2650c60cb807" }, + "nvim-lspconfig": { "branch": "master", "commit": "0a1a2aa549da0d2294e072e2d725f02cca32f64e" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" }, "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" }, - "nvim-treesitter": { "branch": "master", "commit": "e24dab6696aa2a6682a117e241adc32c38e93d53" }, - "nvim-web-devicons": { "branch": "master", "commit": "7fd8d7f08be824d9d362fb2d9800b84eb15786c1" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" }, + "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "c84eeb689e4cc86808e823c11eac4239c75292ce" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "ca8d5ee2b4ee1eec491040a7601d366ddc8a2e02" }, + "rainbow_csv.nvim": { "branch": "main", "commit": "a520dabf1c74d7d7d8341dd3f3570063ef51b3aa" }, + "solarized-osaka.nvim": { "branch": "main", "commit": "f6e66670e31c09cfb7142a16d5dc2f26d2a31a40" }, "sonokai": { "branch": "master", "commit": "42822f8f9b3a5088f05cf72a0aa1477598ad1a40" }, "styler.nvim": { "branch": "main", "commit": "2cd29996d08cec8b31270c6de64465f716ef9d71" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, - "telescope-cmdline.nvim": { "branch": "main", "commit": "38dfa6620fdf7308d795981d34aac3ff0c742001" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "6f735a63dc24b9aed527cd505a31864223c8a6d8" }, + "telescope-cmdline.nvim": { "branch": "main", "commit": "7c92e740fd90efa7786c28876c8230ae8f16b42b" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "6dd6522bc1a4cbe5883eb0272f5cc7a54ae3858b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "thethethe.nvim": { "branch": "main", "commit": "c542d26de1c3dab104927b354ccfd62bf977cb5a" }, + "thethethe.nvim": { "branch": "main", "commit": "357580127cd291c8a813564eeaff07c09303084e" }, "tmux.nvim": { "branch": "main", "commit": "ea67d59721eb7e12144ce2963452e869bfd60526" }, - "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, "toggleterm.nvim": { "branch": "main", "commit": "cbd041d91b90cd3c02df03fe6133208888f8e008" }, - "tokyonight.nvim": { "branch": "main", "commit": "e3301873c1e96903daebb98cc9b5926810bf73dd" }, - "tol.nvim": { "branch": "main", "commit": "3309fcebeaaa0cd556a682baa5813a51609d523e" }, + "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "venn.nvim": { "branch": "main", "commit": "e4d68341a73dd56c64955058821a58295fb337b1" }, "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" }, diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 70d346e..d6371de 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -246,6 +246,32 @@ return { require('mini.fuzzy').setup() end }, + { + 'echasnovski/mini.hipatterns', version = false, + -- event = "BufReadPre", + config = function() + local hipatterns = require('mini.hipatterns') + hipatterns.setup({ + highlighters = { + fixme = { pattern = '%f[%w]()FIXME()%f[%W]', group = 'MiniHipatternsFixme' }, + hack = { pattern = '%f[%w]()HACK()%f[%W]', group = 'MiniHipatternsHack' }, + todo = { pattern = '%f[%w]()TODO()%f[%W]', group = 'MiniHipatternsTodo' }, + note = { pattern = '%f[%w]()NOTE()%f[%W]', group = 'MiniHipatternsNote' }, + hex_color = hipatterns.gen_highlighter.hex_color(), + hsl_color = { + pattern = "hsl%(%d+,? %d+,? %d+%)", + group = function(_, match) + local utils = require("solarized-osaka.hsl") + local nh, ns, nl = match:match("hsl%((%d+),? (%d+),? (%d+)%)") + local h, s, l = tonumber(nh), tonumber(ns), tonumber(nl) + local hex_color = utils.hslToHex(h, s, l) + return MiniHipatterns.compute_hex_color_group(hex_color, "bg") + end, + }, + }, + }) + end + }, ----------------------------------------------------------- -- Markdown Plugins @@ -288,30 +314,9 @@ return { ) end }, - -- Sidebar --- { --- 'sidebar-nvim/sidebar.nvim', --- config = function() --- require("sidebar-nvim").setup({ --- side = "right", --- sections = { --- "git", --- "symbols", --- "diagnostics", --- }, --- todos = { --- initially_closed = false, -- whether the groups should be initially closed on start. You can manually open/close groups later. --- }, --- diagnostics = { --- icon = "", --- }, --- }) --- end --- }, --- -{ - 'rcarriga/nvim-dap-ui', dependencies = {"mfussenegger/nvim-dap"} -}, + { + 'rcarriga/nvim-dap-ui', dependencies = {"mfussenegger/nvim-dap"} + }, --------------------------------------------------------- -- Text, Icons, Symbols @@ -339,40 +344,40 @@ return { 'nvim-lua/plenary.nvim', -- Todo & Comments for Organization - { - 'folke/todo-comments.nvim', - dependencies = "nvim-lua/plenary.nvim", - config = function() - require("todo-comments").setup { - keywords = { - FIX = { - icon = " ", -- icon used for the sign, and in search results - color = "error", -- can be a hex color, or a named color (see below) - alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords - -- signs = false, -- configure signs for some keywords individually - }, - DONE = { icon = " ", color = "info" }, - IN_PROG = { icon = "󰇘", color = "default" }, - FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } }, - WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } }, - TODO = { icon = " ", color = "hint", alt = { "TASK", "TBD" } }, - RISK = { icon = " ", color = "hint", alt = { "RISK" } }, - SENG = { icon = " ", color = "test", alt = { "SOLUTIONS", "SE", "WORKAROUND" } }, - }, - highlight = { - comments_only = false, - }, - colors = { - error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, - warning = { "DiagnosticWarning", "WarningMsg", "#FBBF24" }, - info = { "DiagnosticInfo", "#2563EB" }, - hint = { "DiagnosticHint", "#10B981" }, - default = { "Identifier", "#7C3AED" }, - test = { "Identifier", "#FF00FF" } - }, - } - end - }, + -- { + -- 'folke/todo-comments.nvim', + -- dependencies = "nvim-lua/plenary.nvim", + -- config = function() + -- require("todo-comments").setup { + -- keywords = { + -- FIX = { + -- icon = " ", -- icon used for the sign, and in search results + -- color = "error", -- can be a hex color, or a named color (see below) + -- alt = { "FIXME", "BUG", "FIXIT", "ISSUE" }, -- a set of other keywords that all map to this FIX keywords + -- -- signs = false, -- configure signs for some keywords individually + -- }, + -- DONE = { icon = " ", color = "info" }, + -- IN_PROG = { icon = "󰇘", color = "default" }, + -- FEAT = { icon = " ", color = "warning", alt = { "NEED", "REQUEST" } }, + -- WARN = { icon = " ", color = "error", alt = { "WARNING", "ERROR" } }, + -- TODO = { icon = " ", color = "hint", alt = { "TASK", "TBD" } }, + -- RISK = { icon = " ", color = "hint", alt = { "RISK" } }, + -- SENG = { icon = " ", color = "test", alt = { "SOLUTIONS", "SE", "WORKAROUND" } }, + -- }, + -- highlight = { + -- comments_only = false, + -- }, + -- colors = { + -- error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, + -- warning = { "DiagnosticWarning", "WarningMsg", "#FBBF24" }, + -- info = { "DiagnosticInfo", "#2563EB" }, + -- hint = { "DiagnosticHint", "#10B981" }, + -- default = { "Identifier", "#7C3AED" }, + -- test = { "Identifier", "#FF00FF" } + -- }, + -- } + -- end + -- }, -- Various telescopes 'nvim-telescope/telescope-file-browser.nvim', @@ -385,15 +390,15 @@ return { -- Various Color Schemes, Dashboard, etc ----------------------------------------------------------- - -- ColorSchemes + { 'rktjmp/lush.nvim' }, + { 'normanras/link.nvim' }, + { dir = '/Users/normrasmussen/Documents/Projects/link-two/', lazy = true}, { - 'norcalli/nvim-colorizer.lua', - config = function() - require("colorizer").setup { - '*'; - } - end, - }, + "craftzdog/solarized-osaka.nvim", + lazy = false, + priority = 1000, + opts = {}, +}, 'Mofiqul/dracula.nvim', -- 'ray-x/starry.nvim', 'rose-pine/neovim', @@ -421,12 +426,12 @@ return { }, { 'bluz71/vim-nightfly-colors', name = "nightfly", lazy = true, priority = 1000 }, 'Bekaboo/deadcolumn.nvim', - { - "dustypomerleau/tol.nvim", - lazy = false, -- load the colorscheme at startup - priority = 1000, -- load colorscheme first - config = true, - }, + -- { + -- "dustypomerleau/tol.nvim", + -- lazy = false, -- load the colorscheme at startup + -- priority = 1000, -- load colorscheme first + -- config = true, + -- }, -- UI Improvements and Changes { diff --git a/nvim/.config/nvim/lua/plugins/rainbow_csv.lua b/nvim/.config/nvim/lua/plugins/rainbow_csv.lua new file mode 100644 index 0000000..e4e481d --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/rainbow_csv.lua @@ -0,0 +1,19 @@ +return { + 'cameron-wags/rainbow_csv.nvim', + config = true, + ft = { + 'csv', + 'tsv', + 'csv_semicolon', + 'csv_whitespace', + 'csv_pipe', + 'rfc_csv', + 'rfc_semicolon' + }, + cmd = { + 'RainbowDelim', + 'RainbowDelimSimple', + 'RainbowDelimQuoted', + 'RainbowMultiDelim' + } +}