diff --git a/home-manager/modules/nvim.nix b/home-manager/modules/nvim.nix
index fe3b694..7c1cb8a 100644
--- a/home-manager/modules/nvim.nix
+++ b/home-manager/modules/nvim.nix
@@ -83,7 +83,7 @@
       prettierd
     ];
     plugins = {
-      comment-nvim.enable = true;
+      comment.enable = true;
 
       ts-context-commentstring.enable = true;
 
@@ -96,7 +96,7 @@
 
       indent-blankline = {
         enable = true;
-        scope.enabled = false;
+        settings.scope.enabled = false;
       };
 
       cmp = {
@@ -176,35 +176,37 @@
 
       oil = {
         enable = true;
-        defaultFileExplorer = true;
-        extraOptions = { show_hidden = true; };
+        settings = {
+          show_hidden = true;
+          default_file_explorer = true;
+        };
       };
 
       treesitter.enable = true;
 
       gitsigns = {
         enable = true;
-        signs = {
+        settings.signs = {
           add.text = "▎";
           change.text = "▎";
           changedelete.text = "▎";
           delete.text = "▎";
           topdelete.text = "▎";
           untracked.text = "▎";
-        };
-        onAttach.function = ''
-          function(buffer)
-            local gs = package.loaded.gitsigns
-            
-            local function map(mode, l, r, desc)
-            	vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
+          on_attach = ''
+            function(buffer)
+              local gs = package.loaded.gitsigns
+              
+              local function map(mode, l, r, desc)
+              	vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
+              end
+              
+              -- stylua: ignore start
+              map("n", "]g", gs.next_hunk, "Next git hunk")
+              map("n", "[g", gs.prev_hunk, "Previous git hunk")
             end
-            
-            -- stylua: ignore start
-            map("n", "]g", gs.next_hunk, "Next git hunk")
-            map("n", "[g", gs.prev_hunk, "Previous git hunk")
-          end
-        '';
+          '';
+        };
       };
 
       mini = {