Improved colorscheme management

crivotz · May 30, 2023 · 8533091 · 8533091
1 parent d9f5afd
commit 8533091
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 249 deletions.
diff --git a/INFO.md b/INFO.md
@@ -15,7 +15,7 @@ Thanks to the developers of these plugins/color schemes
 ![nv-ide + telescope ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_2.png)
 ![nv-ide + which-key ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_3.png)
 ![nv-ide + lazygit ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_4.png)
-![nv-ide + noice + markid ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_5.png)
+![nv-ide + noice ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_5.png)
 
 ---
 

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Thanks to the developers of these plugins/color schemes
 ![nv-ide + telescope ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_2.png)
 ![nv-ide + which-key ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_3.png)
 ![nv-ide + lazygit ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_4.png)
-![nv-ide + noice + markid ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_5.png)
+![nv-ide + noice ](https://raw.githubusercontent.com/crivotz/nv-ide/master/screenshots/nv-ide_screenshot_5.png)
 
 ---
 
@@ -65,7 +65,6 @@ nvim
 * [quangnguyen30192/cmp-nvim-tags](https://github.com/quangnguyen30192/cmp-nvim-tags): tags sources for nvim-cmp  
 * [rafamadriz/friendly-snippets](https://github.com/rafamadriz/friendly-snippets): Set of preconfigured snippets for different languages.  
 * [windwp/nvim-ts-autotag](https://github.com/windwp/nvim-ts-autotag): Use treesitter to auto close and auto rename html tag  
-* [David-Kunz/markid](https://github.com/David-Kunz/markid): A Neovim extension to highlight same-name identifiers with the same color.  
 * [nvim-treesitter/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter): Nvim Treesitter configurations and abstraction layer  
 * [mrjones2014/nvim-ts-rainbow](https://github.com/mrjones2014/nvim-ts-rainbow): Rainbow parentheses for neovim using tree-sitter.  
 * [luukvbaal/statuscol.nvim](https://github.com/luukvbaal/statuscol.nvim): Status column plugin that provides a configurable 'statuscolumn' and click handlers.  

diff --git a/lazy-lock.json b/lazy-lock.json
@@ -15,61 +15,60 @@
   "colorful-winsep.nvim": { "branch": "main", "commit": "0576a11c1b2af468019f2b8bc942ec384ccb9aeb" },
   "committia.vim": { "branch": "master", "commit": "0b4df1a7f48ffbc23b009bd14d58ee1be541917c" },
   "csv.vim": { "branch": "master", "commit": "15ff93edf5b26c466affbb356e0696b7d6a3b499" },
-  "feline.nvim": { "branch": "main", "commit": "c63983da180595339163d8b7185dd43ddc31e70e" },
+  "feline.nvim": { "branch": "master", "commit": "c6eea890c4f81725f4c51eba48d9733a248513a2" },
   "flit.nvim": { "branch": "main", "commit": "f60e4b3d49bb5a5e97cfffe66f2e671eb422078e" },
   "formatter.nvim": { "branch": "master", "commit": "fa4f2729cc2909db599169f22d8e55632d4c8d59" },
-  "friendly-snippets": { "branch": "main", "commit": "ef6547d2f586e08e071efeebac835e545f3015cc" },
+  "friendly-snippets": { "branch": "main", "commit": "8875cccf779160303bf2bed7d422717676f214fd" },
+  "github-nvim-theme": { "branch": "main", "commit": "f09a14e9e111f7bfa190dbeab1994b8240dbf2ab" },
   "gitsigns.nvim": { "branch": "main", "commit": "f868d82a36f7f7f5e110eb0a9659993984f59875" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "86d1b71c5c26168c3a3a9ff5f69e833889a09c1d" },
-  "lazy.nvim": { "branch": "main", "commit": "67ae8bbbe3985e380b98abeaf6c567c422b29746" },
-  "leap.nvim": { "branch": "main", "commit": "2950d4826fb92ec3b56c59b5d4f2d575a84cb3fa" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" },
+  "lazy.nvim": { "branch": "main", "commit": "ebdd0499551765e6a7aba220cc8ae4e0cdb6be69" },
+  "leap.nvim": { "branch": "main", "commit": "be918a8e6aa00a6cfa7270d4bfcc11b2f80d6902" },
   "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
-  "markid": { "branch": "main", "commit": "379f7af033d19744b36b454309006d67675ed2f5" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "e1d2f1309f6746b488655970ea26c44469ddb131" },
-  "mason.nvim": { "branch": "main", "commit": "08b2fd308e0107eab9f0b59d570b69089fd0b522" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f0ce33f4794a2364eb08d09d09380e8b04ec5e6a" },
+  "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" },
   "muren.nvim": { "branch": "main", "commit": "1a43efb5ab9fa85040b6c510ec299e4c9816af6d" },
   "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "e1149cc68264739dce7d4f02df483bbb8c0f6a8f" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "8c89efb93b8383666a6f989762c2f610f5f2c930" },
   "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" },
-  "noice.nvim": { "branch": "main", "commit": "1478f7295806d354e7689edc2a58f3bc2e697f78" },
-  "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" },
+  "noice.nvim": { "branch": "main", "commit": "7e358170cea2314d9768b3f63616e8fad186195e" },
+  "nui.nvim": { "branch": "main", "commit": "2b2732528e4a79eb8542568bd51d25f710395bd6" },
   "numb.nvim": { "branch": "master", "commit": "2c89245d1185e02fec1494c45bc765a38b6b40b3" },
-  "nvim-autopairs": { "branch": "master", "commit": "7747bbae60074acf0b9e3a4c13950be7a2dff444" },
-  "nvim-cmp": { "branch": "main", "commit": "950d0e3a93ba61c13b031c086d11eacf4bd48d24" },
+  "nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" },
+  "nvim-cmp": { "branch": "main", "commit": "b43bfaf3229d6b39d8baaa567b13c6be0623bf12" },
   "nvim-code-action-menu": { "branch": "main", "commit": "e4399dbaf6eabff998d3d5f1cbcd8d9933710027" },
   "nvim-cokeline": { "branch": "master", "commit": "28b9ed6ef2afe8632557953be920543403965546" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
   "nvim-dap": { "branch": "master", "commit": "56118cee6af15cb9ddba9d080880949d8eeb0c9f" },
-  "nvim-dap-ui": { "branch": "master", "commit": "4ce7b97dd8f50b4f672948a34bf8f3a56214fdb8" },
+  "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
   "nvim-hlslens": { "branch": "main", "commit": "5e3e9088fba7508cee3612ee50b14dfdd3ab19af" },
-  "nvim-lspconfig": { "branch": "master", "commit": "570aae82f8c6bc15fb6e559ed7d5a3fd85374329" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9166622781a39a829878d1fd24c174529d996838" },
   "nvim-navic": { "branch": "master", "commit": "15704c607569d6c5cfeab486d3ef9459645a70ce" },
   "nvim-neoclip.lua": { "branch": "main", "commit": "4e406ae0f759262518731538f2585abb9d269bac" },
   "nvim-notify": { "branch": "master", "commit": "f3024b912073774111202f5fa6518b0cd2a74432" },
   "nvim-spectre": { "branch": "master", "commit": "1abe23ec9b7bc3082164f4cb842d521ef70e080e" },
   "nvim-toggleterm.lua": { "branch": "main", "commit": "a44313fb28ed9bc9837c2b99dec1c6eed3a4f47f" },
-  "nvim-treesitter": { "branch": "master", "commit": "dae928b3bbbcdd3890c61549bdc4c50e1e0d3094" },
+  "nvim-treesitter": { "branch": "master", "commit": "06aa932bb87c9e30d9c3444c65f4d13599c7fb9c" },
   "nvim-treesitter-context": { "branch": "master", "commit": "7cd5ac1c384b89e7e607238a936f13963f97ba32" },
   "nvim-ts-autotag": { "branch": "main", "commit": "40615e96075c743ef47aaf9de966dc348bec6459" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" },
-  "nvim-ts-rainbow": { "branch": "master", "commit": "840039440e012ad798ef31349b93a5d4365023ff" },
+  "nvim-ts-rainbow": { "branch": "master", "commit": "85279555783702b4bed6518e4494ec96d1ae1dfe" },
   "nvim-ufo": { "branch": "main", "commit": "45aede6f5c4981156df3ddeeae01c4290e43e104" },
-  "nvim-web-devicons": { "branch": "master", "commit": "e283ab937e0197b37ec5d8013e49495193407324" },
-  "octo.nvim": { "branch": "master", "commit": "512876820db1279e6f91530c6ce11187eb141056" },
+  "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" },
+  "octo.nvim": { "branch": "master", "commit": "ac8a4ca28709176bf686d59c4408249683cec369" },
   "plenary.nvim": { "branch": "master", "commit": "52544825d6b8be677eb395983515ad5e30ae1f2e" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" },
-  "statuscol.nvim": { "branch": "main", "commit": "7ee8d982331019fec3a90ec87b98d6b4405cacbe" },
+  "statuscol.nvim": { "branch": "main", "commit": "f13a5dbe83ed500e6022e8e96d3c404aa11ebfba" },
   "suda.vim": { "branch": "master", "commit": "08abd39dfe1cee681b8ce3e7321da5fa03e045c1" },
   "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
   "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
   "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" },
   "telescope-repo.nvim": { "branch": "master", "commit": "d069994f0571366ca2a80f0fb464bb80fd63569d" },
   "telescope.nvim": { "branch": "master", "commit": "6d3fbffe426794296a77bb0b37b6ae0f4f14f807" },
   "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
-  "tokyonight.nvim": { "branch": "main", "commit": "cd5156f4b4a6c4c337a46deb0c0bd37319920833" },
-  "trouble.nvim": { "branch": "main", "commit": "5da13b5007eb2b952834186cd640a22c765b64cf" },
+  "trouble.nvim": { "branch": "main", "commit": "324c977cfeacb8498ca9ba1c74cc35bd18858a8d" },
   "twilight.nvim": { "branch": "main", "commit": "a4843e6e67092a1e6fa9666f02bf0ab59174c1df" },
   "vim-abolish": { "branch": "master", "commit": "cb3dcb220262777082f63972298d57ef9e9455ec" },
   "vim-bundler": { "branch": "master", "commit": "5b2c2bae7eb84c70a3830dcf4f00394226a18450" },
@@ -81,7 +80,7 @@
   "vim-gutentags": { "branch": "master", "commit": "1337b1891b9d98d6f4881982f27aa22b02c80084" },
   "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" },
   "vim-jdaddy": { "branch": "master", "commit": "23b67752cb869dd9c8f3109173b69aa96a1f3acf" },
-  "vim-matchup": { "branch": "master", "commit": "b8eca3b588e41e0bb1b3ae200fae88183b91a76d" },
+  "vim-matchup": { "branch": "master", "commit": "02b906cf772811a6845f2d5caaa81152beb65d6b" },
   "vim-numbertoggle": { "branch": "main", "commit": "075b7478777e694fbac330ee34a74590dad0fee1" },
   "vim-rails": { "branch": "master", "commit": "2b8c4fc831e0de2681beda0a2f48222812920a1d" },
   "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },

diff --git a/lua/config/colorschemes/catppuccin.lua b/lua/config/colorschemes/catppuccin.lua
diff --git a/lua/config/colorschemes/github.lua b/lua/config/colorschemes/github.lua
@@ -0,0 +1,3 @@
+require("github-theme").setup({
+})
+vim.cmd [[colorscheme github_dark_dimmed]]
diff --git a/lua/config/colorschemes/gruvbox.lua b/lua/config/colorschemes/gruvbox.lua
@@ -26,16 +26,6 @@ vim.api.nvim_create_autocmd('ColorScheme', {
   'hi BqfPreviewBorder                   guifg=#ea6962 guibg=#282828 |' ..
   'hi NormalFloat                        guibg=#282828 |' ..
   'hi IndentBlanklineContextChar         guifg=#d3869b |' ..
-  'hi markid1                            guifg=#ff8f88 |' ..
-  'hi markid2                            guifg=#ffb074 |' ..
-  'hi markid3                            guifg=#cfdc8b |' ..
-  'hi markid4                            guifg=#a3d4c9 |' ..
-  'hi markid5                            guifg=#f9acc1 |' ..
-  'hi markid6                            guifg=#afdaa8 |' ..
-  'hi markid7                            guifg=#fecc7d |' ..
-  'hi markid8                            guifg=#eed8b2 |' ..
-  'hi markid9                            guifg=#ffedc7 |' ..
-  'hi markid10                           guifg=#cebfaa |' ..
   'hi StatusColumnBorder                 guifg=#232323 |' ..
   'hi StatusColumnBuffer                 guibg=#282828 |' ..
   'hi CursorLineNr                       guifg=#d8a657 |' ..

diff --git a/lua/config/colorschemes/onedarkpro.lua b/lua/config/colorschemes/onedarkpro.lua
diff --git a/lua/config/colorschemes/tokyonight.lua b/lua/config/colorschemes/tokyonight.lua
@@ -32,38 +32,4 @@ require("tokyonight").setup({
   ---@param colors ColorScheme
   on_highlights = function(highlights, colors) end,
 })
-
-grpid = vim.api.nvim_create_augroup('custom_highlights_tokyonight', {})
-vim.api.nvim_create_autocmd('ColorScheme', {
-  group = grpid,
-  pattern = 'tokyonight',
-  command =
-  'hi NvimTreeNormal                     guibg=#16161e |' ..
-  'hi NvimTreeEndOfBuffer                guibg=#16161e |' ..
-  'hi NoiceCmdlinePopupBorderCmdline     guifg=#f7768e guibg=#1a1b26 |' ..
-  'hi TelescopePromptBorder              guifg=#f7768e guibg=#1a1b26 |' ..
-  'hi TelescopePromptNormal              guifg=#f7768e guibg=#1a1b26 |' ..
-  'hi TelescopePromptTitle               guifg=#f7768e guibg=#1a1b26 |' ..
-  'hi TelescopePromptPrefix              guifg=#f7768e guibg=#1a1b26 |' ..
-  'hi TelescopePromptCounter             guifg=#f7768e guibg=#1a1b26 |' ..
-  'hi TelescopePreviewTitle              guifg=#9ece6a guibg=#1a1b26 |' ..
-  'hi TelescopePreviewBorder             guifg=#9ece6a guibg=#1a1b26 |' ..
-  'hi TelescopeResultsTitle              guifg=#9ece6a guibg=#1a1b26 |' ..
-  'hi TelescopeResultsBorder             guifg=#9ece6a guibg=#1a1b26 |' ..
-  'hi TelescopeMatching                  guifg=#e0af68 guibg=#1a1b26 |' ..
-  'hi TelescopeSelection                 guifg=#c0caf5 guibg=#1a1b26 |' ..
-  'hi FloatBorder                        guifg=#f7768e guibg=#1a1b26 |' ..
-  'hi BqfPreviewBorder                   guifg=#f7768e guibg=#1a1b26 |' ..
-  'hi NormalFloat                        guibg=#1a1b26 |' ..
-  'hi markid1                            guifg=#ff90a8 |' ..
-  'hi markid2                            guifg=#ffb87e |' ..
-  'hi markid3                            guifg=#b8e884 |' ..
-  'hi markid4                            guifg=#94bcff |' ..
-  'hi markid5                            guifg=#f56565 |' ..
-  'hi markid6                            guifg=#97e9ff |' ..
-  'hi markid7                            guifg=#fac982 |' ..
-  'hi markid8                            guifg=#d5b4ff |' ..
-  'hi markid9                            guifg=#44ddf8 |' ..
-  'hi markid10                           guifg=#34d6b6 |'
-})
 vim.cmd [[colorscheme tokyonight]]