diff --git a/flake.lock b/flake.lock
index 8308b53..e8e9921 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,11 +69,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741010256,
-        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
+        "lastModified": 1741513245,
+        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
+        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
         "nuschtosSearch": "nuschtosSearch"
       },
       "locked": {
-        "lastModified": 1741098523,
-        "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
+        "lastModified": 1741709061,
+        "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
+        "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0ce1dd7..b503026 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,8 @@
   description = "Opinionated Nixvim config as a flake";
 
   inputs = {
+    ## nixvim uses it's own version, so this is only
+    ## for explicitly installed packages and non nixvim config
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     nixvim = {
diff --git a/nixvim.nix b/nixvim.nix
index 3dcf8b8..39c695e 100644
--- a/nixvim.nix
+++ b/nixvim.nix
@@ -21,5 +21,6 @@
   environment.interactiveShellInit = if config.nixvim-config.enable then  ''
     alias vi='nvim'
     alias vim='nvim'
+    alias vimdiff='nvim -d'
   '' else "";
 }
diff --git a/options.nix b/options.nix
index 9f09915..9fc9d2b 100644
--- a/options.nix
+++ b/options.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
   programs.nixvim = {
     enable = config.nixvim-config.enable;
@@ -88,10 +88,15 @@
     ## ------------------------------------------------
 
     colorschemes.tokyonight.enable = true;
-
-    # colorschemes.gruvbox.enable = true;
     ## Or:
     # extraPlugins = [ pkgs.vimPlugins.gruvbox ];
     # colorscheme = "gruvbox";
+
+    # extraConfigLua = ''
+    #   -- Check if we're in diff mode
+    #   if vim.opt.diff:get() then
+    #     vim.cmd('gruvbox')
+    #   end
+    # '';
   };
 }
diff --git a/plugins/avante.nix b/plugins/avante.nix
index 02def44..27acd51 100644
--- a/plugins/avante.nix
+++ b/plugins/avante.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
   programs.nixvim.plugins = if config.nixvim-config.enable-ai then {
     ## required dependencies
@@ -16,6 +16,8 @@
     avante = {
       enable = true;
 
+      package = pkgs.vimPlugins.avante-nvim;
+
       settings = {
         provider = "copilot";
         cursor_applying_provider = "copilot";
diff --git a/plugins/default.nix b/plugins/default.nix
index a277a6c..2419f9f 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -43,9 +43,13 @@
       ## disable, very annoying as notifications block content and
       ## are part of the buffer rotation
       notify = {
-        enable = false;
+        enable = true;
         settings = {
           top_down = false;
+          on_open = {
+            ## Don't treat notify as a buffer
+            __raw = "function(win) vim.api.nvim_win_set_config(win, { focusable = false }) end";
+          };
         };
       };
       ## needed by avante.