ctucx.git: nixfiles

cleanup

diff --git a/machines/briefkasten/default.nix b/machines/briefkasten/default.nix
@@ -90,9 +90,12 @@
     email-notify.enable = true;
   };
 
-  ctucxConfig = {
-    programs.yt-dlp.enable   = true;
-    programs.ocrmypdf.enable = true;
+  ctucxConfig.programs = {
+    yt-dlp.enable   = true;
+    ocrmypdf.enable = true;
+    gpg.enable      = false;
+    ssh.enable      = false;
+    git.enable      = false;
   };
 
   system.stateVersion = "22.11"; # Did you read the comment?

diff --git a/machines/briefkasten/impermanence.nix b/machines/briefkasten/impermanence.nix
@@ -11,10 +11,20 @@
     configDir  = "/nix/persist/home/katja/.config/syncthing";
   };
 
-  age.identityPaths = [
-    "/nix/persist/etc/ssh/ssh_host_ed25519_key"
+  services.openssh.hostKeys = [
+    {
+      bits = 4096;
+      path = "/nix/persist/etc/ssh/ssh_host_rsa_key";
+      type = "rsa";
+    }
+    {
+      path = "/nix/persist/etc/ssh/ssh_host_ed25519_key";
+      type = "ed25519";
+    }
   ];
 
+  age.identityPaths = [ "/nix/persist/etc/ssh/ssh_host_ed25519_key" ];
+
   environment.persistence."/nix/persist" = {
     directories = [
       "/var/log"

@@ -22,10 +32,6 @@
     ];
     files = [
       "/etc/machine-id"
-      "/etc/ssh/ssh_host_ed25519_key"
-      "/etc/ssh/ssh_host_ed25519_key.pub"
-      "/etc/ssh/ssh_host_rsa_key"
-      "/etc/ssh/ssh_host_rsa_key.pub"
     ];
   };
 

diff --git a/machines/wanderduene/default.nix b/machines/wanderduene/default.nix
@@ -47,11 +47,13 @@
 
       postCommands = ''
         ip link set dev ens3 up
+
         ip addr add ${config.networking.primaryIP}/128 dev ens3
         ip route add default via fe80::1 dev ens3 onlink
 
         ip addr add ${config.networking.primaryIP4}/22 dev ens3
         ip route add default via 194.36.144.1 dev ens3 onlink
+
         echo 'cryptsetup-askpass' >> /root/.profile
       '';
     };

@@ -107,7 +109,7 @@
         address = [ "${config.networking.primaryIP4}/24" "${config.networking.primaryIP}/64" ];
 
         networkConfig = {
-          DNS                 = [ "8.8.8.8" "1.1.1.1" ];
+          DNS = [ "8.8.8.8" "1.1.1.1" ];
         };
 
         routes = [

@@ -148,4 +150,3 @@
   home-manager.users.katja.home.stateVersion = "23.05";
 
 }
-