jahanson/mochi
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: jahanson:36b25377f55fca2e4abb8961621b5721baec57c9
Branches Tags
jahanson:main
jahanson:talos-pxe-bootstrap
jahanson:update_flake_lock_action
jahanson:renovate/lock-file-maintenance
..
compare: jahanson:94c5f2a8c9ae344c2b4006d6637bb75d705cd28f
Branches Tags
jahanson:main
jahanson:talos-pxe-bootstrap
jahanson:update_flake_lock_action
jahanson:renovate/lock-file-maintenance

No commits in common. "36b25377f55fca2e4abb8961621b5721baec57c9" and "94c5f2a8c9ae344c2b4006d6637bb75d705cd28f" have entirely different histories.
36b25377f5 ... 94c5f2a8c9

3 changed files with 15 additions and 7 deletions
Show stats Expand all files Collapse all files

1
nixos/home/modules/security/ssh/default.nix
View file

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

8
nixos/profiles/global/users.nix
View file

@ -28,8 +28,12 @@ in
]; ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIDJtqzSFK3MN12Lo3Y4DnzJV5NiygIPkR+gun5oEb2q jahanson@legiondary" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBsUe5YF5z8vGcEYtQX7AAiw2rJygGf2l7xxr8nZZa7w"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBsUe5YF5z8vGcEYtQX7AAiw2rJygGf2l7xxr8nZZa7w jahanson@durincore" "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"
]; ];
}; };
} }

13
nixos/profiles/role-workstation.nix
View file

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