diff --git a/config/dev/default.nix b/config/dev/default.nix
index 0d50601..91b67df 100644
--- a/config/dev/default.nix
+++ b/config/dev/default.nix
@@ -6,22 +6,19 @@
 }:
 lib.optionalAttrs (!minimal) {
   imports = [
-    ./documentation.nix
-    ./embedded.nix
     ./yubikey.nix
   ];
 
+  documentation = {
+    dev.enable = true;
+    man.enable = true;
+    info.enable = lib.mkForce false;
+  };
+
   environment.systemPackages = [pkgs.man-pages pkgs.man-pages-posix];
   environment.enableDebugInfo = true;
 
-  # Add the agenix-rekey sandbox path permanently to avoid adding myself to trusted-users
-  nix.settings.extra-sandbox-paths = ["/var/tmp/agenix-rekey"];
-
   environment.persistence."/state".directories = [
-    {
-      directory = "/var/tmp/agenix-rekey";
-      mode = "1777";
-    }
     {
       directory = "/var/tmp/nix-import-encrypted"; # Decrypted repo-secrets can be kept
       mode = "1777";
@@ -29,4 +26,7 @@ lib.optionalAttrs (!minimal) {
   ];
 
   services.nixseparatedebuginfod.enable = true;
+
+  # For embedded development
+  services.udev.packages = [pkgs.stlink];
 }
diff --git a/config/dev/documentation.nix b/config/dev/documentation.nix
deleted file mode 100644
index 61904be..0000000
--- a/config/dev/documentation.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
-  environment.systemPackages = with pkgs; [man-pages];
-  documentation = {
-    dev.enable = true;
-    man.enable = true;
-    info.enable = lib.mkForce false;
-  };
-}
diff --git a/config/dev/embedded.nix b/config/dev/embedded.nix
deleted file mode 100644
index 692a653..0000000
--- a/config/dev/embedded.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  services.udev.packages = [pkgs.stlink];
-}
diff --git a/pkgs/git-fuzzy/default.nix b/pkgs/git-fuzzy/default.nix
index 954575f..b299313 100644
--- a/pkgs/git-fuzzy/default.nix
+++ b/pkgs/git-fuzzy/default.nix
@@ -10,7 +10,7 @@
 }: let
   binPath = lib.makeBinPath ([gitAndTools.hub gitAndTools.delta bc bat] ++ extraPackages);
 in
-  stdenvNoCC.mkDerivation rec {
+  stdenvNoCC.mkDerivation {
     pname = "git-fuzzy";
     version = "unstable-2023-09-18";
     src = fetchFromGitHub {