Nvim: Change colorscheme to kanagawa and some other minor tweaks

home/.config/nvim/lua/plugins/cmp.lua

@@ -47,8 +47,8 @@ return function()
             end
         },
         sources = {
-            {name = 'nvim_lsp'}, {name = 'luasnip'}, {name = 'path'},
+            {name = 'buffer'}, {name = 'git'}, {name = 'luasnip'},
-            {name = 'git'}, {name = 'buffer'}
+            {name = 'nvim_lsp'}, {name = 'nvim_lua'}, {name = 'path'}
         }
     }
 

home/.config/nvim/lua/plugins/colorscheme.lua

@@ -1,54 +1 @@
-return function()
+return function() vim.cmd("colorscheme kanagawa") end
-    require('catppuccin').setup({
-        transparent_background = false,
-        term_colors = false,
-        compile = {
-            enabled = true,
-            path = vim.fn.stdpath 'cache' .. '/catppuccin'
-        },
-        styles = {
-            comments = {'italic'},
-            functions = {'italic'},
-            keywords = {'italic'},
-            strings = {},
-            variables = {}
-        },
-        integrations = {
-            treesitter = true,
-            native_lsp = {
-                enabled = true,
-                virtual_text = {
-                    errors = {'italic'},
-                    hints = {'italic'},
-                    warnings = {'italic'},
-                    information = {'italic'}
-                },
-                underlines = {
-                    errors = {'underline'},
-                    hints = {'underline'},
-                    warnings = {'underline'},
-                    information = {'underline'}
-                }
-            },
-            lsp_trouble = false,
-            lsp_saga = false,
-            gitgutter = true,
-            gitsigns = false,
-            telescope = true,
-            nvimtree = {enabled = false, show_root = false},
-            which_key = false,
-            indent_blankline = {enabled = true, colored_indent_levels = false},
-            dashboard = false,
-            neogit = false,
-            vim_sneak = false,
-            fern = false,
-            barbar = false,
-            bufferline = false,
-            markdown = false,
-            lightspeed = false,
-            ts_rainbow = false,
-            hop = false
-        }
-    })
-    vim.cmd [[colorscheme catppuccin]]
-end

home/.config/nvim/lua/plugins/init.lua

@@ -20,10 +20,13 @@ require('packer').startup(function()
     use {'wbthomason/packer.nvim'}
 
     -- Colorscheme
+    use {'rebelot/kanagawa.nvim', config = require('plugins.colorscheme')}
+
+    -- Statusline
     use {
-        'catppuccin/nvim',
+        'nvim-lualine/lualine.nvim',
-        as = 'catppuccin',
+        requires = {'kyazdani42/nvim-web-devicons', opt = true},
-        config = require('plugins.colorscheme')
+        config = require('plugins.lualine')
     }
 
     -- Startup screen/dashboard
@@ -32,15 +35,6 @@ require('packer').startup(function()
     -- Git in signcolumn
     use 'airblade/vim-gitgutter'
 
-    -- Statusline
-    use {
-        'hoob3rt/lualine.nvim',
-        requires = {'kyazdani42/nvim-web-devicons', opt = true},
-        config = function()
-            require('lualine').setup {options = {theme = 'catppuccin'}}
-        end
-    }
-
     -- Tabline/bufferline
     use {
         'akinsho/nvim-bufferline.lua',
@@ -82,9 +76,7 @@ require('packer').startup(function()
     -- Display possible keybinds
     use {
         'folke/which-key.nvim',
-        config = function()
+        config = require('plugins.which-key')
-            require('which-key').setup {spelling = {enabled = true}}
-        end
     }
 
     -- Read editorconfig settings
@@ -97,6 +89,7 @@ require('packer').startup(function()
     }
     use {
         'williamboman/mason-lspconfig.nvim',
+        requires = {'ii14/emmylua-nvim'}, -- vim api documentation for lua lsp
         config = function()
             require('mason-lspconfig').setup {automatic_installation = true}
         end
@@ -115,13 +108,14 @@ require('packer').startup(function()
     use {
         'hrsh7th/nvim-cmp',
         requires = {
-            {'hrsh7th/cmp-nvim-lsp'}, -- LSP source
-            {'hrsh7th/cmp-path'}, -- Path source
-            {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source
             {'hrsh7th/cmp-buffer'}, -- Buffer source
-            {'saadparwaiz1/cmp_luasnip'}, -- Snippets source
+            {'petertriho/cmp-git', requires = "nvim-lua/plenary.nvim"}, -- Git source
             {'L3MON4D3/LuaSnip'}, -- Snippets plugin
-            {'rafamadriz/friendly-snippets'} -- Snippets collection
+            {'hrsh7th/cmp-nvim-lsp'}, -- LSP source
+            {'hrsh7th/cmp-nvim-lua'}, -- Neovim Lua API documentation
+            {'hrsh7th/cmp-path'}, -- Path source
+            {'rafamadriz/friendly-snippets'}, -- Snippets collection
+            {'saadparwaiz1/cmp_luasnip'} -- Snippets source
         },
         config = require('plugins.cmp')
     }
@@ -177,9 +171,7 @@ require('packer').startup(function()
 
     -- If Packer was just installed,
     -- sync plugins
-	if Packer_bootstrap then
+    if Packer_bootstrap then require('packer').sync() end
-		require('packer').sync()
-	end
 
 end)
 

home/.config/nvim/lua/plugins/lualine.lua

@@ -1 +1 @@
-require'lualine'.setup {options = {theme = 'catppuccin'}}
+return function() require('lualine').setup() end