nixos/home/modules/security/ssh/default.nix

@@ -15,6 +15,7 @@ in
     programs.ssh = {
       inherit (cfg) matchBlocks;
       enable = true;
+      # addKeysToAgent = "yes";
     };
   };
 }

nixos/profiles/global/users.nix

@@ -28,8 +28,12 @@ in
       ];
 
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIDJtqzSFK3MN12Lo3Y4DnzJV5NiygIPkR+gun5oEb2q jahanson@legiondary"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBsUe5YF5z8vGcEYtQX7AAiw2rJygGf2l7xxr8nZZa7w jahanson@durincore"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBsUe5YF5z8vGcEYtQX7AAiw2rJygGf2l7xxr8nZZa7w"
+      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBH3VVFenoJfnu+IFUlD79uxl7L8SFoRup33J2HGny4WEdRgGR41s0MpFKDBmxXZHy4O9Nh8NMMnpy5VhUefnIKI="
+      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPHFQ3hDjjrKsecn3jmSWYlRXy4IJCrepgU1HaIV5VcmB3mUFmIZ/pCZnPmIG/Gbuqf1PP2FQDmHMX5t0hTYG9A="
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETR70eQJiXaJuB+qpI1z+jFOPbEZoQNRcq4VXkojWfU"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATyScd8ZRhV7uZmrQNSAbRTs9N/Dbx+Y8tGEDny30sA"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyA/yMPPo+scxBaDFUk7WeEyMAMhXUro5vi4feOKsJT jahanson@durincore"
     ];
   };
 }

nixos/profiles/role-workstation.nix

@@ -6,7 +6,11 @@
 with config;
 {
   mySystem = {
+
     de.gnome.enable = true;
+
+    # Lets see if fish everywhere is OK on the pi's
+    # TODO decide if i drop to bash on pis?
     shell.fish.enable = true;
 
     system.resticBackup.local.enable = false;
@@ -19,16 +23,16 @@ with config;
   };
 
   nix.settings = {
+    # TODO factor out into mySystem
     # Avoid disk full issues
     max-free = lib.mkDefault (1000 * 1000 * 1000);
     min-free = lib.mkDefault (128 * 1000 * 1000);
   };
 
-  services = {
   # set xserver videodrivers if used
-    xserver.enable = true;
-    # Enable the Gnome keyring for auto unlocking ssh keys on login
-    gnome.gnome-keyring.enable = true;
+  services.xserver.enable = true;
+
+  services = {
     fwupd.enable = config.boot.loader.systemd-boot.enable; # fwupd does not work in BIOS mode
     thermald.enable = true;
     smartd.enable = true;
@@ -57,5 +61,4 @@ with config;
   };
 
   programs.mtr.enable = true;
-  programs.ssh.startAgent = true;
 }