diff --git a/home/nvim/comment.nix b/home/nvim/comment.nix
new file mode 100644
index 0000000..2caa124
--- /dev/null
+++ b/home/nvim/comment.nix
@@ -0,0 +1 @@
+{ programs.nixvim.plugins.comment = { enable = true; }; }
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index 818a387..bde8042 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -19,6 +19,9 @@
     ./whichkey.nix
     ./alpha.nix
     ./keymaps.nix
+    ./comment.nix
+    ./oil.nix
+    ./trouble.nix
   ];
 
   programs.nixvim = {
diff --git a/home/nvim/keymaps.nix b/home/nvim/keymaps.nix
index 8efc76c..659f9fa 100644
--- a/home/nvim/keymaps.nix
+++ b/home/nvim/keymaps.nix
@@ -34,6 +34,33 @@
       action = "<cmd>ObsidianPasteImg<cr>";
     }
 
+    {
+      key = "<leader>E";
+      action = "<cmd>Oil<cr>";
+    }
+
+    {
+      key = "<leader>t";
+      action = "<cmd>TroubleToggle<cr>";
+    }
+
+    {
+      key = "<C-h>";
+      action = "<C-w>h";
+    }
+    {
+      key = "<C-j>";
+      action = "<C-w>j";
+    }
+    {
+      key = "<C-k>";
+      action = "<C-w>k";
+    }
+    {
+      key = "<C-l>";
+      action = "<C-w>l";
+    }
+
     # Terminal Mappings
     {
       mode = "t";
diff --git a/home/nvim/oil.nix b/home/nvim/oil.nix
new file mode 100644
index 0000000..7b60898
--- /dev/null
+++ b/home/nvim/oil.nix
@@ -0,0 +1 @@
+{ programs.nixvim.plugins.oil = { enable = true; }; }
diff --git a/home/nvim/trouble.nix b/home/nvim/trouble.nix
new file mode 100644
index 0000000..831382a
--- /dev/null
+++ b/home/nvim/trouble.nix
@@ -0,0 +1 @@
+{ programs.nixvim.plugins.trouble = { enable = true; }; }
diff --git a/home/scripts/startup.nix b/home/scripts/startup.nix
index f366e7c..6a04e82 100644
--- a/home/scripts/startup.nix
+++ b/home/scripts/startup.nix
@@ -48,7 +48,7 @@ let
 
     nextcloud-watch &
     battery-notif &
-    waybar &
+    ${pkgs.waybar}/bin/waybar &
   '';
 
 in {
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index fa206ea..9529278 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -40,7 +40,7 @@
     dates = "04:00";
     flake = "${config.users.users.hadi.home}/.config/nixos"; # CHANGEME
     flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ];
-    allowReboot = true;
+    allowReboot = false;
   };
 
   ##############