2 files changed, 33 insertions, 0 deletions

diff --git a/common/vim.nix b/common/vim.nix
index 17d18ac..47dc04f 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -71,7 +71,9 @@ let
           lualine-lsp-progress
           gitsigns-nvim
           diffview-nvim
+          nvim-notify
 
+          # Completion
           nvim-cmp
           cmp-buffer
           cmp-calc
@@ -84,9 +86,11 @@ let
           cmp-treesitter
           cmp-vsnip
 
+          # Snippets
           vim-vsnip
           vim-vsnip-integ
 
+          # Telescope
           telescope-nvim
           telescope-file-browser-nvim
           telescope-ui-select-nvim
@@ -120,6 +124,7 @@ let
           tabular
           vim-abolish
           vim-oscyank
+          comment-nvim
         ] ++ config.vim.extraPlugins;
       };
     };
diff --git a/dotfiles/vim.lua b/dotfiles/vim.lua
index 0e89ba6..05af6de 100644
--- a/dotfiles/vim.lua
+++ b/dotfiles/vim.lua
@@ -285,6 +285,34 @@ require("neogit").setup {
         },
 }
 
+-- Notify
+
+vim.cmd [[highlight link NotifyERRORBorder DiagnosticError]]
+vim.cmd [[highlight link NotifyERRORIcon DiagnosticError]]
+vim.cmd [[highlight link NotifyERRORTitle DiagnosticError]]
+
+vim.cmd [[highlight link NotifyWARNBorder DiagnosticWarn]]
+vim.cmd [[highlight link NotifyWARNIcon DiagnosticWarn]]
+vim.cmd [[highlight link NotifyWARNTitle DiagnosticWarn]]
+
+vim.cmd [[highlight link NotifyINFOBorder DiagnosticInfo]]
+vim.cmd [[highlight link NotifyINFOIcon DiagnosticInfo]]
+vim.cmd [[highlight link NotifyINFOTitle DiagnosticInfo]]
+
+vim.cmd [[highlight link NotifyDEBUGBorder DiagnosticHint]]
+vim.cmd [[highlight link NotifyDEBUGIcon DiagnosticHint]]
+vim.cmd [[highlight link NotifyDEBUGTitle DiagnosticHint]]
+
+vim.cmd [[highlight link NotifyDEBUGBorder GruvboxPurple]]
+vim.cmd [[highlight link NotifyDEBUGIcon GruvboxPurple]]
+vim.cmd [[highlight link NotifyDEBUGTitle GruvboxPurple]]
+
+vim.notify = require("notify")
+
+-- Comment
+
+require('Comment').setup {}
+
 -- Local config
 
 function isModuleAvailable(name)