diff --git a/src/system/machines/desktop/system.nix b/src/system/machines/desktop/system.nix
index a36eece..87a4d74 100644
--- a/src/system/machines/desktop/system.nix
+++ b/src/system/machines/desktop/system.nix
@@ -51,8 +51,7 @@
   ];
 
   fonts.packages = with pkgs; [
-    terminus_font
-    terminus-nerdfont
+    nerd-fonts.terminess-ttf
   ];
 
   security = {
diff --git a/src/user/modules/gui/modules/browsers/firefox/default.nix b/src/user/modules/gui/modules/browsers/firefox/default.nix
index b783195..d414e87 100644
--- a/src/user/modules/gui/modules/browsers/firefox/default.nix
+++ b/src/user/modules/gui/modules/browsers/firefox/default.nix
@@ -22,7 +22,7 @@ let
     };
     assertions =
     let
-      pinentry = config.services.gpg-agent.pinentryPackage;
+      pinentry = config.services.gpg-agent.pinentry.package;
     in
     [
       {
@@ -43,25 +43,27 @@ in
           isDefault = true;
           #bookmarks = config.user.bookmarks;
 
-          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-            ublock-origin
-            tridactyl
-            #darkreader
-            tampermonkey
-            clearurls
-            passff
-            multi-account-containers
-          ];
+          extensions = {
+            packages = with pkgs.nur.repos.rycee.firefox-addons; [
+              ublock-origin
+              tridactyl
+              #darkreader
+              tampermonkey
+              clearurls
+              passff
+              multi-account-containers
+            ];
+          };
 
           search = {
             force = true;
-            default = "Google";
+            default = "google";
             engines = {
               "Startpage" = {
                 urls = [{
                   template = "https://www.startpage.com/sp/search?q={searchTerms}";
                 }];
-                iconUpdateURL = "https://www.startpage.com/sp/cdn/favicons/favicon--default.ico";
+                icon = "https://www.startpage.com/sp/cdn/favicons/favicon--default.ico";
               };
             };
           };
diff --git a/src/user/modules/gui/wm/hyprland/default.nix b/src/user/modules/gui/wm/hyprland/default.nix
index ea18768..2b1eb75 100644
--- a/src/user/modules/gui/wm/hyprland/default.nix
+++ b/src/user/modules/gui/wm/hyprland/default.nix
@@ -149,7 +149,7 @@ in
         ranger
         highlight
 
-        terminus-nerdfont
+        nerd-fonts.terminess-ttf
         noto-fonts
         noto-fonts-cjk-sans
         noto-fonts-emoji
diff --git a/src/user/modules/gui/wm/i3/default.nix b/src/user/modules/gui/wm/i3/default.nix
index 991b4b6..eaea068 100644
--- a/src/user/modules/gui/wm/i3/default.nix
+++ b/src/user/modules/gui/wm/i3/default.nix
@@ -129,7 +129,7 @@ in
       ranger
       highlight
 
-      terminus-nerdfont
+      nerd-fonts.terminess-ttf
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-emoji
diff --git a/src/user/modules/gui/wm/sway/default.nix b/src/user/modules/gui/wm/sway/default.nix
index a433495..bf27a57 100644
--- a/src/user/modules/gui/wm/sway/default.nix
+++ b/src/user/modules/gui/wm/sway/default.nix
@@ -153,7 +153,7 @@ in
       ranger
       highlight
 
-      terminus-nerdfont
+      nerd-fonts.terminess-ttf
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-emoji
diff --git a/src/user/modules/utils/modules/neovim/config/pkgs.nix b/src/user/modules/utils/modules/neovim/config/pkgs.nix
index d92bb24..94ef1fc 100644
--- a/src/user/modules/utils/modules/neovim/config/pkgs.nix
+++ b/src/user/modules/utils/modules/neovim/config/pkgs.nix
@@ -16,7 +16,7 @@ let
     typescript-language-server
     vscode-langservers-extracted
     bash-language-server
-    vls
+    #vls
   ];
 
   extraPackages = with pkgs; [