diff --git a/modules/home/doom/doom.nix b/modules/home/doom/doom.nix
index 5db35a3..ca5d668 100644
--- a/modules/home/doom/doom.nix
+++ b/modules/home/doom/doom.nix
@@ -9,7 +9,7 @@
     cmake
     emacs-all-the-icons-fonts
     fira
-    fira-code-nerdfont
+    nerd-fonts.fira-code
     gcc
   ];
   default-core-pkgs = with pkgs; [
diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix
index 3983a70..6d33f0b 100644
--- a/modules/home/firefox.nix
+++ b/modules/home/firefox.nix
@@ -24,8 +24,8 @@ in {
 
         # Search
         search = {
-          default = "DuckDuckGo";
-          order = ["DuckDuckGo" "Google"];
+          default = "ddg";
+          order = ["ddg" "google"];
           force = true;
           engines = {
             "Nix Packages" = {
@@ -45,11 +45,45 @@ in {
                 }
               ];
             };
+            "Noogle" = {
+              urls = [
+                {
+                  template = "https://noogle.dev/q";
+                  params = [
+                    {
+                      name = "term";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+            };
+            "cppreference" = {
+              urls = [
+                {
+                  template = "https://en.cppreference.com/mwiki/index.php";
+                  params = [
+                    {
+                      name = "title";
+                      value = "Special%3ASearch";
+                    }
+                    {
+                      name = "search";
+                      value = "{searchTerms}";
+                    }
+                    {
+                      name = "Go";
+                      value = "go";
+                    }
+                  ];
+                }
+              ];
+            };
           };
         };
 
         # Extensions
-        extensions = with inputs.firefox-addons.packages."x86_64-linux"; ([
+        extensions.packages = with inputs.firefox-addons.packages."x86_64-linux"; ([
             ublock-origin
             violentmonkey
           ]
diff --git a/modules/home/kitty/default.nix b/modules/home/kitty/default.nix
index 793bfd6..d8de06b 100644
--- a/modules/home/kitty/default.nix
+++ b/modules/home/kitty/default.nix
@@ -14,7 +14,7 @@ in {
       enable = true;
       shellIntegration.enableZshIntegration = true;
       font = {
-        package = pkgs.fira-code-nerdfont;
+        package = pkgs.nerd-fonts.fira-code;
         name = "Fira Code Nerd Font";
         size = 12;
       };
diff --git a/modules/home/yubikey.nix b/modules/home/yubikey.nix
index 14cb14a..aebf548 100644
--- a/modules/home/yubikey.nix
+++ b/modules/home/yubikey.nix
@@ -31,7 +31,7 @@ in {
       enable = true;
       enableSshSupport = true;
       enableZshIntegration = true;
-      pinentryPackage =
+      pinentry.package =
         if cfg.pinentry == "qt"
         then pkgs.pinentry-qt
         else pkgs.pinentry.gnome3;
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
index 3f8a924..412f00f 100644
--- a/modules/home/zsh/default.nix
+++ b/modules/home/zsh/default.nix
@@ -27,7 +27,6 @@ in {
     # fancy ls command
     programs.lsd = {
       enable = true;
-      enableAliases = true;
     };
 
     # Zsh