feat(nvim): config updates

config/neovim/after/plugin/colorscheme.lua

@@ -1,58 +1,12 @@
-if not pcall(require, "colorbuddy") then
+local status_ok, catppuccin = pcall(require, "catppuccin")
+if not status_ok then
   return
 end
 
+catppuccin.setup {}
+
 vim.opt.termguicolors = true
 
-require "colorbuddy".colorscheme "gruvbuddy"
-require "colorizer".setup {}
+vim.g.catppuccin_flavour = "mocha"
 
-local Group = require("colorbuddy.group").Group
-local c = require("colorbuddy.color").colors
-local g = require("colorbuddy.group").groups
-local s = require("colorbuddy.style").styles
-
--- Global
--- Group.new("TSComment", c.none)
-Group.new("TSInclude", nil)
-Group.new("TSOperator", nil)
-Group.new("TSPunctBracket", nil)
-Group.new("TSPunctDelimiter", nil)
-Group.new("WinSeparator", nil)
-
--- Lua
-Group.new("luaTSConstant", c.blue)
-Group.new("luaTSField", nil, nil)
-Group.new("luaTSFuncBuiltin", nil)
-Group.new("luaTSFunction", nil)
-Group.new("luaTSKeyword", nil)
-Group.new("luaTSKeywordFunction", c.violet)
-Group.new("luaTSKeywordOperator", c.orange)
-Group.new("luaTSKeywordReturn", nil)
-Group.new("luaTSParameter", nil)
-Group.new("luaTSPunctBracket", nil)
-Group.new("luaTSString", c.blue)
-Group.new("luaTSVariable", nil)
-
--- PHP
-Group.new("phpTSInclude", nil)
-Group.new("phpTSKeyword", nil)
-Group.new("phpTSKeywordFunction", nil)
-Group.new("phpTSMethod", c.blue)
-Group.new("phpTSOperator", nil)
-Group.new("phpTSVariableBuiltin", nil)
-Group.new("phpTSNamespace", c.blue)
-
--- JavaScript
-Group.new("javascriptTSConstructor", c.blue)
-Group.new("javascriptTSException", c.red)
-Group.new("javascriptTSFunction", c.none)
-Group.new("javascriptTSMethod", nil)
-Group.new("javascriptTSProperty", nil)
-Group.new("javascriptTSVariable", c.blue)
-
--- TypeScript
-Group.new("typescriptTSConditional", c.none)
-Group.new("typescriptTSKeyword", c.none)
-Group.new("typescriptTSProperty", c.violet)
-Group.new("typescriptTSType", c.blue)
+vim.cmd([[ colorscheme catppuccin ]])

config/neovim/after/plugin/gitsigns.lua

@@ -8,11 +8,9 @@ gitsigns.setup {
   numhl = true,
 }
 
-local actions = require("gitsigns.actions")
-
-vim.keymap.set('n', '[h', actions.prev_hunk);
-vim.keymap.set('n', ']h', actions.next_hunk);
-vim.keymap.set('n', 'gS', actions.undo_stage_hunk);
-vim.keymap.set('n', 'gb', actions.blame_line);
-vim.keymap.set('n', 'gp', actions.preview_hunk);
-vim.keymap.set('n', 'gs', actions.stage_hunk);
+vim.keymap.set('n', '[h', "<cmd>Gitsigns prev_hunk<cr>");
+vim.keymap.set('n', ']h', "<cmd>Gitsigns next_hunk<cr>");
+vim.keymap.set('n', 'gS', "<cmd>Gitsigns undo_stage_hunk<cr>");
+vim.keymap.set('n', 'gb', "<cmd>Gitsigns blame_line<cr>");
+vim.keymap.set('n', 'gp', "<cmd>Gitsigns preview_hunk<cr>");
+vim.keymap.set('n', 'gs', "<cmd>Gitsigns stage_hunk<cr>");

config/neovim/after/plugin/nvim-rest.lua

@@ -3,15 +3,10 @@ if not status_ok then
   return
 end
 
+rest_nvim.setup()
+
 local nmap = require("opdavies.keymap").nmap
 
--- Run the request.
-nmap { "<leader>rr", "require('rest-nvim').run()" }
-
--- Preview the request.
-nmap { "<leader>rp", "require('rest-nvim').run(true)" }
-
--- Re-run the last request.
-nmap { "<leader>rl", "require('rest-nvim').last()" }
-
-rest_nvim.setup()
+nmap { "<leader>rr", "<plug>RestNvim<cr>" }
+nmap { "<leader>rp", "<plug>RestNvimPreview<cr>" }
+nmap { "<leader>rl", "<plug>RestNvimLast<cr>" }