diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix
index 257d51c..87186d4 100644
--- a/nixos/hosts/Tibo-NixFat/default.nix
+++ b/nixos/hosts/Tibo-NixFat/default.nix
@@ -9,7 +9,6 @@
     desktop.sway.enable = true;
 
     hardware = {
-      eid.enable = true;
       nvidia = {
         enable = true;
         model = "Quadro T2000";
diff --git a/nixos/modules/hardware/default.nix b/nixos/modules/hardware/default.nix
index 2d38b1e..f77ad04 100644
--- a/nixos/modules/hardware/default.nix
+++ b/nixos/modules/hardware/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./eid
     ./nvidia
     ./yubikey
   ];
diff --git a/nixos/modules/hardware/eid/default.nix b/nixos/modules/hardware/eid/default.nix
deleted file mode 100644
index 5249adf..0000000
--- a/nixos/modules/hardware/eid/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.sisyphus.hardware.eid;
-in {
-  options.sisyphus.hardware.eid.enable = lib.mkEnableOption "Electronic identity card (eID)";
-
-  config = lib.mkIf cfg.enable {
-    services.pcscd = {
-      enable = true;
-      plugins = [ pkgs.ccid ];
-    };
-
-    environment.systemPackages = with pkgs; [
-      eid-mw
-    ];
-  };
-}
diff --git a/nixos/users/tdpeuter/firefox.nix b/nixos/users/tdpeuter/firefox.nix
index 4c4a88c..ba1e9e2 100644
--- a/nixos/users/tdpeuter/firefox.nix
+++ b/nixos/users/tdpeuter/firefox.nix
@@ -18,46 +18,42 @@ in {
           DisableFirefoxStudies = true;
           DisablePocket = true;
           DisableTelemetry = true;
+          ExtensionSettings = {};
           OfferToSaveLogins = false;
         };
-
-        # Support smart cards
-        pkcs11Modules = with pkgs-unstable; [
-          eid-mw
-        ];
       };
-
-      profiles.tdpeuter.search= {
-        default = "DuckDuckGo";
-        force = true;
-        engines = {
-          "Bing".metaData.hidden = true;
-          "eBay".metaData.hidden = true;
-          "Qwant".metaData.hidden = true;
-
-          "Nix Packages" = {
-            urls = [{
-              template = "https://search.nixos.org/packages";
-              params = [
-                { name = "type"; value = "packages"; }
-                { name = "query"; value = "{searchTerms}"; }
-              ];
-            }];
-
-            icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-            definedAliases = [ "@np" ];
-          };
-          "GitHub" = {
-            urls = [{
-              template = "https://github.com/search";
-              params = [
-                { name = "q"; value = "{searchTerms}"; }
-                { name = "type"; value = "repositories"; }
-              ];
-            }];
-
-            icon = "${pkgs.icosystem}/share/icons/icosystem/scalable/apps/github-mark.svg";
-            definedAliases = [ "@gh" ];
+      profiles.tdpeuter = {
+        search = {
+          default = "DuckDuckGo";
+          force = true;
+          engines = {
+            "Bing".metaData.hidden = true;
+            "eBay".metaData.hidden = true;
+  
+            "Nix Packages" = {
+              urls = [{
+                template = "https://search.nixos.org/packages";
+                params = [
+                  { name = "type"; value = "packages"; }
+                  { name = "query"; value = "{searchTerms}"; }
+                ];
+              }];
+  
+              icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = [ "@np" ];
+            };
+            "GitHub" = {
+              urls = [{
+                template = "https://github.com/search";
+                params = [
+                  { name = "q"; value = "{searchTerms}"; }
+                  { name = "type"; value = "repositories"; }
+                ];
+              }];
+  
+              icon = "${pkgs.icosystem}/share/icons/icosystem/scalable/apps/github-mark.svg";
+              definedAliases = [ "@gh" ];
+            };
           };
         };
       };