feat: use new default color scheme on nvim 0.10

otherwise uses catppuccin

Author: jmbuhr

init.lua

@@ -13,4 +13,3 @@
 require 'config.global'
 require 'config.lazy'
 require 'config.autocommands'
-require 'config.colors'

lua/config/colors.lua

@@ -21,7 +21,7 @@ require('lazy').setup('plugins', {
     path = '~/projects',
     fallback = true,
   },
-  install = { colorscheme = { 'catppuccin', 'habamax' } },
+  install = {},
   checker = { enabled = false },
   rtp = {
     disabled_plugins = {

lua/config/lazy.lua

@@ -5,8 +5,26 @@ return {
   {
     'catppuccin/nvim',
     name = 'catppuccin',
+    -- using new default on nvim 0.10 now for a while to test
+    enabled = function()
+      -- only enabled catppuccin on lower versions
+      local has_new_default_theme = vim.fn.has 'nvim-0.10' == 1
+      if has_new_default_theme then
+        -- change cursor color for terminal insert mode
+        -- (because cursor shape does not change for now)
+        vim.api.nvim_set_hl(0, 'TermCursor', { fg = '#A6E3A1', bg = '#A6E3A1' })
+      end
+      return not has_new_default_theme
+    end,
     lazy = false, -- make sure we load this during startup if it is your main colorscheme
     priority = 1000, -- make sure to load this before all the other start plugins
+    config = function()
+      -- set colorscheme and overwrite highlights
+      vim.cmd.colorscheme 'catppuccin-mocha'
+      local colors = require 'catppuccin.palettes.mocha'
+      vim.api.nvim_set_hl(0, 'Tabline', { fg = colors.green, bg = colors.mantle })
+      vim.api.nvim_set_hl(0, 'TermCursor', { fg = '#A6E3A1', bg = '#A6E3A1' })
+    end,
   },
   {
     'olimorris/onedarkpro.nvim',

lua/plugins/colorthemes.lua

@@ -11,20 +11,21 @@ return {
     'hrsh7th/nvim-cmp',
     event = 'InsertEnter',
     dependencies = {
-      { 'hrsh7th/cmp-nvim-lsp' },
-      { 'hrsh7th/cmp-nvim-lsp-signature-help' },
-      { 'hrsh7th/cmp-buffer' },
-      { 'hrsh7th/cmp-path' },
-      { 'hrsh7th/cmp-calc' },
-      { 'hrsh7th/cmp-emoji' },
-      { 'saadparwaiz1/cmp_luasnip' },
-      { 'f3fora/cmp-spell' },
-      { 'ray-x/cmp-treesitter' },
-      { 'kdheepak/cmp-latex-symbols' },
-      { 'jmbuhr/cmp-pandoc-references' },
-      { 'L3MON4D3/LuaSnip' },
-      { 'rafamadriz/friendly-snippets' },
-      { 'onsails/lspkind-nvim' },
+      'hrsh7th/cmp-nvim-lsp',
+      'hrsh7th/cmp-nvim-lsp-signature-help',
+      'hrsh7th/cmp-buffer',
+      'hrsh7th/cmp-path',
+      'hrsh7th/cmp-calc',
+      'hrsh7th/cmp-emoji',
+      'saadparwaiz1/cmp_luasnip',
+      'f3fora/cmp-spell',
+      'ray-x/cmp-treesitter',
+      'kdheepak/cmp-latex-symbols',
+      'jmbuhr/cmp-pandoc-references',
+      'L3MON4D3/LuaSnip',
+      'rafamadriz/friendly-snippets',
+      'onsails/lspkind-nvim',
+      'jmbuhr/otter.nvim',
     },
     config = function()
       local cmp = require 'cmp'

lua/plugins/completion.lua

@@ -1,4 +1,28 @@
 return {
+  {
+    -- for lsp features in code cells / embedded code
+    'jmbuhr/otter.nvim',
+    dev = true,
+    dependencies = {
+      {
+        'neovim/nvim-lspconfig',
+        'nvim-treesitter/nvim-treesitter',
+        'hrsh7th/nvim-cmp',
+      },
+    },
+    opts = {
+      lsp = {
+        hover = {
+          border = require('misc.style').border,
+        },
+      },
+      buffers = {
+        set_filetype = true,
+      },
+      handle_leading_whitespace = true,
+    },
+  },
+
   {
     'neovim/nvim-lspconfig',
     dependencies = {

lua/plugins/lsp.lua

@@ -1,6 +1,7 @@
 return {
 
-  { -- requires plugins in treesitter.lua and lsp.lua
+  { -- requires plugins in lua/plugins/treesitter.lua and lua/plugins/lsp.lua
+    -- for complete functionality (language features)
     'quarto-dev/quarto-nvim',
     ft = { 'quarto' },
     dev = false,
@@ -14,30 +15,10 @@ return {
       },
     },
     dependencies = {
-      {
-        -- for language features in code cells
-        -- specifically needs its source added for nvim-cmp in completion.lua
-        'jmbuhr/otter.nvim',
-        dev = false,
-        dependencies = {
-          {
-            'neovim/nvim-lspconfig',
-            'nvim-treesitter/nvim-treesitter',
-            'hrsh7th/nvim-cmp',
-          },
-        },
-        opts = {
-          lsp = {
-            hover = {
-              border = require('misc.style').border,
-            },
-          },
-          buffers = {
-            set_filetype = true,
-          },
-          handle_leading_whitespace = true,
-        },
-      },
+      -- for language features in code cells
+      -- configured in lua/plugins/lsp.lua and
+      -- added as a nvim-cmp source in lua/plugins/completion.lua
+      'jmbuhr/otter.nvim',
     },
   },
 

lua/plugins/quarto.lua

@@ -274,7 +274,7 @@ return {
 
   { -- highlight markdown headings and code blocks etc.
     'lukas-reineke/headlines.nvim',
-    enabled = true,
+    enabled = false,
     dependencies = 'nvim-treesitter/nvim-treesitter',
     config = function()
       require('headlines').setup {
@@ -304,15 +304,24 @@ return {
   { -- show images in nvim!
     '3rd/image.nvim',
     enabled = true,
+    dependencies = {
+      {
+        -- needs:
+        -- sudo apt installl luajit
+        -- <https://github.com/vhyrro/luarocks.nvim>
+        'vhyrro/luarocks.nvim',
+        priority = 1001, -- this plugin needs to run before anything else
+        opts = {
+          rocks = { 'magick' },
+        },
+      },
+    },
     config = function()
       -- Requirements
       -- https://github.com/3rd/image.nvim?tab=readme-ov-file#requirements
       -- check for dependencies with `:checkhealth kickstart`
-      -- otherwise set `enabled = false` in the plugin spec
-      -- Example for configuring Neovim to load user-installed installed Lua rocks:
-      --$ luarocks --local --lua-version=5.1 install magick
-      package.path = package.path .. ';' .. vim.fn.expand '$HOME' .. '/.luarocks/share/lua/5.1/?/init.lua;'
-      package.path = package.path .. ';' .. vim.fn.expand '$HOME' .. '/.luarocks/share/lua/5.1/?.lua;'
+      -- needs:
+      -- sudo apt install libmagickwand-dev
 
       require('image').setup {
         backend = 'kitty',