diff --git a/flake.lock b/flake.lock
index a6538463..64bfb239 100644
--- a/flake.lock
+++ b/flake.lock
@@ -179,11 +179,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732742778,
-        "narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=",
+        "lastModified": 1733168902,
+        "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8",
+        "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
         "type": "github"
       },
       "original": {
@@ -254,22 +254,6 @@
       }
     },
     "flake-compat_5": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_6": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -367,6 +351,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -385,7 +387,10 @@
     },
     "git-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
         "gitignore": "gitignore_2",
         "nixpkgs": [
           "nixvim",
@@ -397,11 +402,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730302582,
-        "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
+        "lastModified": 1732021966,
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
         "type": "github"
       },
       "original": {
@@ -478,16 +483,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1733050161,
+        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -500,16 +505,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1733050161,
+        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -556,6 +561,34 @@
         "type": "github"
       }
     },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729958008,
+        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.0.6",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
     "jovian": {
       "inputs": {
         "nix-github-actions": "nix-github-actions",
@@ -606,11 +639,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1732450403,
-        "narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=",
+        "lastModified": 1733055216,
+        "narHash": "sha256-yB2y7tGJxDI/SDQ0D7b6ocRtLTPm93u8ybdIKQGXRDE=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "c817444fb8a3042c26be57d8640fb744bc1b516c",
+        "rev": "f67bf0781c69a46bf3a1469f83c98518aa3054c3",
         "type": "github"
       },
       "original": {
@@ -627,11 +660,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730448474,
-        "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=",
+        "lastModified": 1733105089,
+        "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e",
+        "rev": "c6b65d946097baf3915dd51373251de98199280d",
         "type": "github"
       },
       "original": {
@@ -707,11 +740,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1732410305,
-        "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=",
+        "lastModified": 1733015484,
+        "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "87b6978992e2eb605732fba842cad0a7e14b2047",
+        "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e",
         "type": "github"
       },
       "original": {
@@ -728,11 +761,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732496924,
-        "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=",
+        "lastModified": 1733101779,
+        "narHash": "sha256-Qqnfnb/RFxBbD25UYJ/yibvl9kIZNK5WkyLsUcb2byk=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a",
+        "rev": "a471acc460d4c238936a5116c8cc48a3c431dd66",
         "type": "github"
       },
       "original": {
@@ -743,11 +776,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1732483221,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "lastModified": 1733217105,
+        "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
         "type": "github"
       },
       "original": {
@@ -775,11 +808,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1732410305,
-        "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=",
+        "lastModified": 1733015484,
+        "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "87b6978992e2eb605732fba842cad0a7e14b2047",
+        "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e",
         "type": "github"
       },
       "original": {
@@ -806,11 +839,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1733015953,
+        "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
         "type": "github"
       },
       "original": {
@@ -827,11 +860,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1732803609,
-        "narHash": "sha256-k8N4oGnoVP3W4wH2fEIPOw9oGsoUhSUhJ+Si+j5qMTE=",
+        "lastModified": 1733125169,
+        "narHash": "sha256-OugU1Egr6ThDlzD8LOiDzgeUEEPPLCTMu0Aqvt1l6AE=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "790e2744814101364d435eee99fe1d0112abc686",
+        "rev": "7c13b14d3918f2d8775b966ffd1ba531d1462f7b",
         "type": "github"
       },
       "original": {
@@ -842,16 +875,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1732749044,
-        "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
+        "lastModified": 1733120037,
+        "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
+        "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "type": "indirect"
       }
     },
@@ -873,11 +906,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1733015953,
+        "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
         "type": "github"
       },
       "original": {
@@ -889,16 +922,16 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1730327045,
-        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
+        "lastModified": 1733120037,
+        "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
+        "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -919,22 +952,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1714912032,
-        "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -944,30 +961,31 @@
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs_5",
+        "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1732295842,
-        "narHash": "sha256-kH3532gNJ89+9fNJSedXuMPhUBxtiFLCUH9hIVR3N/Q=",
+        "lastModified": 1733221381,
+        "narHash": "sha256-6y4BxKhPNlsBZStrOLkZR5fUgJ1wMPH0zZiS7/CCLqA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "07f23a60fdd0ea402bb0d0b6c4c9df89fa638c81",
+        "rev": "667b2a5f7a7925fb3247fd3201f4a9e0bcebcd48",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixvim",
         "type": "github"
       }
     },
     "nur": {
       "locked": {
-        "lastModified": 1732805641,
-        "narHash": "sha256-dt62iVgFbADlCT4j6XgUkwhejWU55kVQG5040HyA/bc=",
+        "lastModified": 1733231429,
+        "narHash": "sha256-2ekVchNHMyTg/YRXLRj3OO3CU5t0HiEQnr27GMUs1uA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5bfc920efdaa5044521000b95409a2594c1f3603",
+        "rev": "5a1c6c849704bbbdfc60289e7107bba4b9995b91",
         "type": "github"
       },
       "original": {
@@ -976,6 +994,29 @@
         "type": "github"
       }
     },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "ixx": "ixx",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733006402,
+        "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
     "plasma-manager": {
       "inputs": {
         "home-manager": "home-manager_3",
@@ -984,11 +1025,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732639391,
-        "narHash": "sha256-kFtXjoCIqx9xe0ZryPXpqS6l/HVg71aNcuL8Y5e8+pI=",
+        "lastModified": 1733005589,
+        "narHash": "sha256-NAym0oWYwKgFuAif6Z7HacU6Su/SJNTW4wEYC5urSYU=",
         "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "06e3209d11797d9c741e25df06ab61048746bf93",
+        "rev": "88ca377ff58b5c30a2879745829842554d4b21d5",
         "type": "github"
       },
       "original": {
@@ -1069,11 +1110,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1732575825,
-        "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
+        "lastModified": 1733128155,
+        "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
+        "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
         "type": "github"
       },
       "original": {
@@ -1091,10 +1132,12 @@
         "base16-kitty": "base16-kitty",
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat_6",
+        "flake-compat": "flake-compat_5",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_4",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1718122552,
@@ -1141,6 +1184,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1171,11 +1229,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730321837,
-        "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
+        "lastModified": 1732894027,
+        "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
+        "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a5c8af36..9c9cd267 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,16 +2,17 @@
   description = "NixOS System Config";
   inputs = {
     # Stable Packages
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
     # Unstable Packages
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     # home-manager - Dotfile mnagement - add /master at the end to pull from master 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     # Nix colorizer / themer 
-    stylix.url = "github:danth/stylix/release-24.05";
+    stylix.url = "github:danth/stylix/release-24.11";
+    stylix.inputs.nixpkgs.follows = "nixpkgs";
     # nixvim - neovim configuration management in nix
-    nixvim.url = "github:nix-community/nixvim/nixos-24.05";
+    nixvim.url = "github:nix-community/nixvim/nixos-24.11";
     # lanzaboote - Secureboot Configuration
     lanzaboote.url = "github:nix-community/lanzaboote";
     lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
@@ -61,7 +62,7 @@
       nuc-server          = libx.mkHost { hostname = "nuc-server"; };
 
       # User Machines
-      nixos-desktop       = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "plasma6"; theme = "gruvbox"; };
+      nixos-desktop       = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "plasma6"; };
       nixos-framework     = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; };
       steamdeck           = libx.mkDeck { hostname = "steamdeck";                      desktop = "plasma6"; };
       
diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index fe8ec5cc..ae650626 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -130,7 +130,10 @@
     };
  
     shellAliases = {
-     
+      # Tsilcale helpers 
+      ts-dns-disable ="sudo tailscale set --accept-dns=false";
+      ts-dns-enable  ="sudo tailscale set --accept-dns=true";
+
       # GPG Related 
       sign = "gpg -u $PGP_KEY_ID --armor --detach-sig";
       verify = "gpg -u $PGP_KEY_ID --verify";
diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index 52e6c04a..341f3caf 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -33,9 +33,10 @@
       vim.diagnostic.config({ virtual_text = false })
     '';
 
+    diagnostics.virtual_lines.only_current_line = true;
+    
     plugins = {
       lsp-lines.enable = true;
-      lsp-lines.currentLine = true;
       crates-nvim.enable = true;
       lspsaga = {
         enable = false;
@@ -45,7 +46,7 @@
       lsp = {
         enable = true;
         servers = {
-          rust-analyzer = {
+          rust_analyzer = {
             enable = true;
             installCargo = true;
             installRustc = true;
@@ -74,7 +75,7 @@
           bashls.enable = false;
           tailwindcss.enable = true;
           svelte.enable = true;
-          docker-compose-language-service.enable = true;
+          docker_compose_language_service.enable = true;
           marksman.enable = true;
         };
 
diff --git a/home-manager/common/software/cli/nixvim/alpha.nix b/home-manager/common/software/cli/nixvim/alpha.nix
index 4d1f020f..84ff4f48 100644
--- a/home-manager/common/software/cli/nixvim/alpha.nix
+++ b/home-manager/common/software/cli/nixvim/alpha.nix
@@ -1,7 +1,6 @@
 { ... }: { 
   programs.nixvim.plugins.alpha = {
     enable = true;
-    iconsEnabled = true;
 
     layout =
       let
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 37ad1814..f04a41c3 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -42,6 +42,7 @@
     '';
 
     plugins = {
+      web-devicons.enable = true;
     # Git related
       # Gutter information for git modifications
       gitsigns.enable = true;
@@ -58,14 +59,16 @@
       # Fancy popups, etc for vim
       noice = {
         enable = true;
-        popupmenu.enabled = false;
-        lsp.hover.enabled = false;
-        presets = { 
-          bottom_search = true; 
-          command_palette = true; 
-          long_message_to_split = false; 
-          inc_rename = false; 
-          lsp_doc_border = true; 
+        settings = {
+          presets = { 
+            bottom_search = true; 
+            command_palette = true; 
+            long_message_to_split = false; 
+            inc_rename = false; 
+            lsp_doc_border = true; 
+          };
+          lsp.hover.enabled = false;
+          popupmenu.enabled = false;
         };
       };
       notify = {
@@ -89,7 +92,7 @@
       # Indentation guides 
       indent-blankline.enable = true;
       # Surround text blocks 
-      surround.enable = true;
+      vim-surround.enable = true;
       # Automatic indent
       intellitab.enable = true;
       # Better yank 
@@ -101,15 +104,19 @@
       # tab bar like Firefox or Chrome
       bufferline = { 
         enable = true;
-        hover.enabled = true;
-        separatorStyle = "slant";
-        offsets = [{
-          filetype = "NvimTree";
-          text = "File Explorer";
-          highlight = "EcovimNvimTreeTitle";
-          text_align = "center";
-          separator = true;
-        }];
+        settings = {
+          options = {
+            hover.enabled = true;
+            separatorStyle = "slant";
+             offsets = [{
+              filetype = "NvimTree";
+              text = "File Explorer";
+              highlight = "EcovimNvimTreeTitle";
+              text_align = "center";
+              separator = true;
+            }];
+         };
+        };
       };
 
       # sidebar file browser
@@ -130,11 +137,11 @@
         enable = true;
         settings = {
           auto_close = true;
-          cycle_results = false;
-          height = 14;
-          win_config = {
-            border = "rounded";
-          };
+          # cycle_results = false;
+          # height = 14;
+          # win_config = {
+          #   border = "rounded";
+          # };
          };
       };
 
@@ -211,32 +218,89 @@
       # Popup to show shortcuts
       which-key = {
         enable = true;
-        window.border = "rounded";
-        registrations = {
-          "<leader>b" = "Manage buffers...";
-          "<leader>c" = "Colorscheme...";
-          "<leader>g" = "Git Options...";
-          "<leader>l" = "LSP Options...";
-          "<leader>n" = "NvimTree / Noice...";
-          "<leader>t" = "Trouble...";
-          "<leader>T" = "ToggleTerm...";
-          "<leader>w" = "Manage Windows...";
-          "<leader>wo" = "Open New...";
-          "<leader>wr" = "Resize...";
-          "<leader>m" = "Multicursor...";
-        };
+        settings.win.border = "rounded";
+        settings.spec = [
+#            "<leader>b" = "Manage buffers...";
+          {
+            __unkeyed-1 = "<leader>b";
+            group = "Buffers";
+            icon = "󰓩 ";
+          }
+#            "<leader>c" = "Colorscheme...";
+          {
+            __unkeyed-1 = "<leader>c";
+            group = "Colorschemes";
+            icon = "󰉦 ";
+          }
+#            "<leader>g" = "Git Options...";
+          {
+            __unkeyed-1 = "<leader>g";
+            group = "Git";
+            icon = " ";
+          }
+#            "<leader>l" = "LSP Options...";
+          {
+            __unkeyed-1 = "<leader>l";
+            group = "LSP";
+            icon = "" ;
+          }
+#            "<leader>n" = "NvimTree / Noice...";
+          {
+            __unkeyed-1 = "<leader>n";
+            group = "NvimTree / Noice";
+            icon = " ";
+          }
+#            "<leader>t" = "Trouble...";
+          {
+            __unkeyed-1 = "<leader>t";
+            group = "Trouble";
+            icon = " ";
+          }
+#            "<leader>T" = "ToggleTerm...";
+          {
+            __unkeyed-1 = "<leader>T";
+            group = "ToggleTerm";
+            icon = " ";
+          }
+#            "<leader>w" = "Manage Windows...";
+          {
+            __unkeyed-1 = "<leader>w";
+            group = "Windows";
+            icon = " ";
+          }
+#            "<leader>wo" = "Open New...";
+          {
+            __unkeyed-1 = "<leader>wo";
+            group = "Open New...";
+            icon = " ";
+          }
+#            "<leader>wr" = "Resize...";
+          {
+            __unkeyed-1 = "<leader>wr";
+            group = "Resize";
+            icon = "󰩨 ";
+          }
+#            "<leader>m" = "Multicursor...";
+          {
+            __unkeyed-1 = "<window>m";
+            group = "Milticursor";
+            icon = "󰇀 ";
+          }
+        ];
       };
 
       # Airline / Powerline alternative
       lualine = {
         enable = true;
-        componentSeparators = {
-          right = "«";
-          left = "»";
-        };
-        sectionSeparators = {
-          right = "";
-          left = "";
+        settings = {
+          componentSeparators = {
+            right = "«";
+            left = "»";
+          };
+          sectionSeparators = {
+            right = "";
+            left = "";
+          };
         };
       };
 
diff --git a/lib/packages.nix b/lib/packages.nix
index a47d1a2f..2b7f3b8a 100644
--- a/lib/packages.nix
+++ b/lib/packages.nix
@@ -6,7 +6,9 @@
       allowUnfree = unfree;
       permittedInsecurePackages = [
         "electron-27.3.11" # Logseq 
-        "olm-3.2.16" # Unknown
+        # "olm-3.2.16" # Unknown
+        "dotnet-runtime-wrapped-7.0.20"
+        "dotnet-runtime-7.0.20"
       ];
     };
     hostPlatform = system;
@@ -18,7 +20,9 @@
       allowUnfree = unfree;
       permittedInsecurePackages = [
         "electron-27.3.11" # Logseq 
-        "olm-3.2.16" # Unknown
+        # "olm-3.2.16" # Unknown
+        "dotnet-runtime-wrapped-7.0.20"
+        "dotnet-runtime-7.0.20"
       ];
     };
     hostPlatform = system;
diff --git a/nixos/common/modules/fonts.nix b/nixos/common/modules/fonts.nix
index a6421f14..8fc51057 100644
--- a/nixos/common/modules/fonts.nix
+++ b/nixos/common/modules/fonts.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:  {
+{ pkgs-unstable, config, ... }:  {
   # Fonts
   fonts = {
     fontconfig = {
@@ -11,11 +11,14 @@
       includeUserConf = false;
     };
 
-    packages = with pkgs; [
-      (nerdfonts.override { fonts = [ "Arimo" "JetBrainsMono" ]; })
+    packages = with pkgs-unstable; [
+      # (nerdfonts.override { fonts = [ "Arimo" "JetBrainsMono" ]; })
+      # nerdfonts
+      nerd-fonts.jetbrains-mono 
+      nerd-fonts.arimo
       # noto-fonts-emoji
       # sarasa-gothic
       font-awesome
     ];
   };
-}
\ No newline at end of file
+}
diff --git a/nixos/common/modules/nvidia-535.nix b/nixos/common/modules/nvidia-535.nix
index e0c571a6..02c33581 100644
--- a/nixos/common/modules/nvidia-535.nix
+++ b/nixos/common/modules/nvidia-535.nix
@@ -3,7 +3,7 @@
 {
 
 # Enable OpenGL
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
   };
 
diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix
index 085ab9f7..d632fe62 100644
--- a/nixos/hosts/nixos-desktop/default.nix
+++ b/nixos/hosts/nixos-desktop/default.nix
@@ -50,7 +50,7 @@
   };
 
   hardware = {
-    opengl = {
+    graphics = {
       enable = true;
     };
     nvidia = {
diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix
index ba295d80..440d49f1 100644
--- a/nixos/hosts/nixos-framework/default.nix
+++ b/nixos/hosts/nixos-framework/default.nix
@@ -44,10 +44,8 @@
   # Set the networking hostname:
   networking.hostName = "nixos-framework";
   hardware = {
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport32Bit = true;
-      driSupport = true;
     };
   };