diff --git a/flake.lock b/flake.lock
index 10085f2..9d942fd 100755
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1764561884,
-        "narHash": "sha256-vQ3iFPPhxsLqV3c5kgmYP53mVD6id6gsP0tN+oTmqok=",
+        "lastModified": 1764648280,
+        "narHash": "sha256-xniOnxIx/qhm+maO4mb9BZ7FytcUhNeTm1Y/QBjNf8o=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "aba4621459aec251d90d6452e3495b58a8a5e185",
+        "rev": "119826bd51ad1a8012e0585f3a073571a35a812e",
         "type": "gitlab"
       },
       "original": {
@@ -147,16 +147,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764560356,
-        "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
+        "lastModified": 1764522689,
+        "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
+        "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index c7ed358..0ea2423 100755
--- a/flake.nix
+++ b/flake.nix
@@ -2,13 +2,13 @@
   description = "System Wide Config Controller";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";	
     };    
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     disko = {
@@ -45,7 +45,7 @@
           home-manager.users.roy = { ... }: {
             imports = [
               ./home.nix
-              nixvim.homeManagerModules.nixvim
+              nixvim.homeModules.nixvim
 	            impermanence.homeManagerModules.impermanence
               sops-nix.homeManagerModules.sops
             ];
diff --git a/home.nix b/home.nix
index ead858c..204d98a 100755
--- a/home.nix
+++ b/home.nix
@@ -104,7 +104,7 @@
       };
 
       extensions.force = true;
-      extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [
+      extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
 	      ublock-origin
         vimium-c
 	    ];
@@ -304,10 +304,8 @@
         options.silent = true;
         options.desc = "Focus up";
       }
-
     ];
 
-    # LSP settings
     lsp = {
       inlayHints.enable = true;
       servers = {
@@ -325,8 +323,6 @@
         rust_analyzer = {
           enable = true;
           config = {
-            installRustc = true;
-            installCargo = true;
             cargo = {
               features = "all";
             };
@@ -338,72 +334,73 @@
         {
           key = "gd";
           lspBufAction = "definition";
-          desc = "Goto Definition";
+          options.desc = "Goto Definition";
           options.silent = true;
           mode = [ "n" ];
         }
         {
           key = "gr"; 
           lspBufAction = "references";
-          desc = "Goto References";
+          options.desc = "Goto References";
           options.silent = true;
           mode = [ "n" ];
         }
         {
           key = "gD"; 
           lspBufAction = "declaration";
-          desc = "Goto Declaration";
+          options.desc = "Goto Declaration";
           options.silent = true;
           mode = [ "n" ];
         }
         {
           key = "gI"; 
           lspBufAction = "implementation";
-          desc = "Goto Implementation";
+          options.desc = "Goto Implementation";
           options.silent = true;
           mode = [ "n" ];
         }
         {
           key = "gT"; 
           lspBufAction = "type_definition";
-          desc = "Type Definition";
+          options.desc = "Type Definition";
           options.silent = true;
           mode = [ "n" ];
         }
         {
           key = "K"; 
           lspBufAction = "hover";
-          desc = "Hover";
+          options.desc = "Hover";
           options.silent = true;
           mode = [ "n" ];
         }
         {
           key = "<leader>cw";
           action = "workspace_symbol";
-          desc = "Workspace Symbol";
+          options.desc = "Workspace Symbol";
           mode = [ "n" ];
         }
         {
           key = "<leader>r";
           action = "rename";
+          options.desc = "Rename variable";
           mode = [ "n" ];
         }
         {
           key = "<leader>cd";
           action = "open_float";
-          desc = "Line Diagnostics";
+          options.desc = "Line Diagnostics";
           mode = [ "n" ];
         }
         {
           key = "]d";
           action = "goto_next";
-          desc = "Next Diagnostic";
+          options.desc = "Next Diagnostic";
           mode = [ "n" ];
         }
         {
           key = "[d";
           action = "goto_prev";
-          desc = "Previous Diagnostic";
+          options.desc = "Previous Diagnostic";
           mode = [ "n" ];
         }
       ];
@@ -411,8 +408,6 @@
 
     plugins = {
       lualine.enable = true;
-      lsp-lines.enable = true;
-      lsp-format.enable = true;
 
       neo-tree = {
         enable = true;
@@ -431,7 +426,6 @@
             {name = "buffer";}
             {name = "luasnip";}
           ];
-
           mapping = {
             "<C-Space>" = "cmp.mapping.complete()";
             "<C-d>" = "cmp.mapping.scroll_docs(-4)";
@@ -444,7 +438,6 @@
         };
       };
     };
-
     extraConfigLua = ''
       local _border = "rounded"