common.nix

@@ -29,11 +29,6 @@ with builtins; {
 
   environment = {
     systemPackages = with pkgs; [
-      pynitrokey
-      nitrokey-app2
-
-      veracrypt
-
       htmlq
 
       wget
@@ -109,19 +104,14 @@ with builtins; {
     "ebdbb2"
   ];
 
-  # nitrokey
-  services.udev.packages = [pkgs.nitrokey-udev-rules];
-  services.pcscd.enable = true;
-
   programs = {
-    ssh.startAgent = false;
+    dconf.enable = true;
+
+    mtr.enable = true;
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
     };
-
-    dconf.enable = true;
-    mtr.enable = true;
   };
 
   time.timeZone = "Europe/Berlin";

hosts/potatobook-g/configuration.nix

@@ -53,6 +53,7 @@
       evremap.enable = true;
     };
     terminal.enable = true;
+    git.signingKey = "08F0 E7C9 6941 84C2 D514 7F31 5621 290C A02C 7BD8";
   };
 
   fileSystems = {

modules/git.nix

@@ -1,9 +1,12 @@
 {
   config,
   lib,
-  pkgs,
   ...
-}: {
+}: let
+  cfg = config.jade.git;
+in {
+  options.jade.git.signingKey = lib.mkOption {type = lib.types.str;};
+  config = {
     home-manager.users.jade = {pkgs, ...}: {
       programs.git = {
         enable = true;
@@ -18,14 +21,9 @@
           s = "status";
         };
         signing = {
-        key = "${pkgs.writeText "red_nk3.pub" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaE8TFsIazpn4OnHvHcRpOFr9FfvMaWOiEjmHsmnAoE cardno:000F_70CD7D05"}";
+          key = cfg.signingKey;
           signByDefault = true;
         };
-      extraConfig = {
-        gpg = {
-          format = "ssh";
-        };
-      };
       };
       programs.gitui = {
         enable = true;
@@ -64,4 +62,5 @@
         '';
       };
     };
+  };
 }