From fe49204e3fcb11fb66aa6bb46d438a618c022235 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 27 Sep 2025 14:28:56 -0400
Subject: [PATCH] Enable optimizations on some packages that are no longer
 broken.

---
 nix/configuration/hosts/quark/default.nix     |  2 +-
 .../roles/gpg/files/scdaemon.conf             |  4 +-
 .../roles/optimized_build/default.nix         | 55 -------------------
 3 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/nix/configuration/hosts/quark/default.nix b/nix/configuration/hosts/quark/default.nix
index fb27f79..ab04ea6 100644
--- a/nix/configuration/hosts/quark/default.nix
+++ b/nix/configuration/hosts/quark/default.nix
@@ -26,7 +26,7 @@
 
     me.optimizations = {
       enable = true;
-      arch = "znver5";
+      arch = "znver4";
       system_features = [
         "gccarch-znver4"
         "gccarch-znver5"
diff --git a/nix/configuration/roles/gpg/files/scdaemon.conf b/nix/configuration/roles/gpg/files/scdaemon.conf
index e0bfda2..b273850 100644
--- a/nix/configuration/roles/gpg/files/scdaemon.conf
+++ b/nix/configuration/roles/gpg/files/scdaemon.conf
@@ -1,6 +1,8 @@
 #reader-port Yubico Yubi
 disable-ccid
-pcsc-shared
+
+# This setting enables other backends like oct to access the pgp card simultaneously but it also means that gpg will ask for the pin for EVERY ssh session which is annoying in scripts.
+#pcsc-shared
 
 #log-file /home/talexander/scd.log
 #verbose
diff --git a/nix/configuration/roles/optimized_build/default.nix b/nix/configuration/roles/optimized_build/default.nix
index 0158945..8768e83 100644
--- a/nix/configuration/roles/optimized_build/default.nix
+++ b/nix/configuration/roles/optimized_build/default.nix
@@ -97,64 +97,9 @@
                 } prev.linux_6_16;
               }
             )
-            (final: prev: {
-              haskellPackages = prev.haskellPackages.extend (
-                final': prev': {
-                  inherit (pkgs-unoptimized.haskellPackages)
-                    crypto-token
-                    crypton
-                    crypton-connection
-                    crypton-x509
-                    crypton-x509-store
-                    crypton-x509-system
-                    crypton-x509-validation
-                    hspec-wai
-                    http-client-tls
-                    http2
-                    pandoc
-                    pandoc-cli
-                    pandoc-lua-engine
-                    pandoc-server
-                    servant-server
-                    tls
-                    tls-session-manager
-                    wai-app-static
-                    wai-extra
-                    warp
-                    warp-tls
-                    ;
-                }
-              );
-            })
-            # (final: prev: {
-            #   python = prev.python.override {
-            #     packageOverrides = python-final: python-prev: {
-            #       inherit (pkgs-unoptimized.pythonPackages) coverage;
-            #     };
-            #   };
-            # })
-            # (final: prev: {
-            #   pythonPackagesOverlays = prev.pythonPackagesOverlays.extend (
-            #     final': prev': {
-            #       inherit (pkgs-unoptimized.pythonPackagesOverlays)
-            #         coverage
-            #         ;
-            #     }
-            #   );
-            # })
-            # (final: prev: {
-            #   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-            #     (python-final: python-prev: {
-            #       inherit (pkgs-unoptimized.pythonPackages) coverage;
-            #     })
-            #   ];
-            # })
             (final: prev: {
               inherit (pkgs-unoptimized)
                 gsl
-                redis
-                valkey
-                nix-serve-ng
                 rapidjson
                 assimp
                 ;