diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix
index 2cccd7b0..682282d7 100644
--- a/modules-overlays/default.nix
+++ b/modules-overlays/default.nix
@@ -10,7 +10,7 @@
 
   nixpkgs.overlays = [
     (final: prev: {
-      bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs-tools;
+      # bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs-tools;
     })
   ];
 }
diff --git a/system/services/ananicy-cpp.nix b/system/services/ananicy-cpp.nix
index cbc440a3..97beb05d 100644
--- a/system/services/ananicy-cpp.nix
+++ b/system/services/ananicy-cpp.nix
@@ -1,7 +1,8 @@
-{pkgs, ...}: {
+{pkgs, pkgs-edge, ...}: {
   # Enable Ananicy CPP for better system performance
   services.ananicy = {
     enable = true;
+    package = pkgs-edge.ananicy-cpp;
     # from nixpkgs: ananicy-rules-cachyos
     rulesProvider = pkgs.ananicy-cpp-rules.overrideAttrs (prevAttrs: {
       patches = [
diff --git a/system/services/default.nix b/system/services/default.nix
index dd91227b..7d4fa215 100644
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -11,6 +11,7 @@
       ./apparmor.nix
       ./console-tty.nix
       ./gnome-keyring.nix
+      ./gnupg-ssh.nix
     ]
     ++ lib.optionals systemSettings.containers [./containers.nix];
 
@@ -69,10 +70,6 @@
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
 
   # List services that you want to enable:
 
diff --git a/system/services/gnome-keyring.nix b/system/services/gnome-keyring.nix
index 9f8e9631..256cf727 100644
--- a/system/services/gnome-keyring.nix
+++ b/system/services/gnome-keyring.nix
@@ -4,4 +4,5 @@
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.gdm-password.enableGnomeKeyring = true; # load gnome-keyring at startup
   programs.seahorse.enable = true; # enable the graphical frontend for managing
+  # NOTE: GNOME keyring does not enable a ssh agent/GPG agent in NixOS
 }
diff --git a/system/services/gnupg-ssh.nix b/system/services/gnupg-ssh.nix
new file mode 100644
index 00000000..1eca775b
--- /dev/null
+++ b/system/services/gnupg-ssh.nix
@@ -0,0 +1,16 @@
+{
+  # GPG agent for managing GPG keys and SSH agent emulation
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+  # disable the above if you want to use gpg-agent
+  # environment.sessionVariables.SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/ssh-agent";
+  /*
+  programs.ssh.extraConfig = ''
+    AddKeysToAgent yes
+    UseKeychain yes
+    IdentityFile ~/.ssh/id_ed25519
+  '';
+  */
+}
\ No newline at end of file