diff --git a/configuration.nix b/configuration.nix
index ad531fa..3df1ad6 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,10 +14,8 @@
   old-nitrogen = pkg_with_working_nitrogen.nitrogen;
 in {
   imports = [
-    # Include the results of the hardware scan.
     # ./hardware-configuration.nix
     ./system/system.nix
-    # inputs.home-manager.nixosModules.default
   ];
 
   # Bootloader.
@@ -92,7 +90,7 @@ in {
     extraGroups = ["networkmanager" "wheel"];
     packages = with pkgs; [
       kdePackages.kate
-      firefox
+      # firefox
       git
       arandr
       procs
@@ -107,7 +105,7 @@ in {
       polybar
       sxhkd
       bspwm
-      librewolf
+      # librewolf
       eza
       flameshot
       neofetch
diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix
index 4fe8cf2..e886ad2 100644
--- a/home/programs/firefox/default.nix
+++ b/home/programs/firefox/default.nix
@@ -6,4 +6,6 @@
   programs.firefox = {
     enable = true;
   };
+
+  programs.librewolf.enable = true;
 }
diff --git a/home/services/gpg-agent/default.nix b/home/services/gpg-agent/default.nix
new file mode 100644
index 0000000..6b74667
--- /dev/null
+++ b/home/services/gpg-agent/default.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+    #TODO: determine if extraConfig is necessary for emacs.
+  };
+}
diff --git a/home/services/services.nix b/home/services/services.nix
index 9bdda7d..921dcc6 100644
--- a/home/services/services.nix
+++ b/home/services/services.nix
@@ -6,5 +6,6 @@
   imports = [
     ./picom/default.nix
     ./dunst/default.nix
+    ./gpg-agent/default.nix
   ];
 }