home/features/cli/git.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   #Prefer IPv4 for ssh
-  # home.file.".ssh/config".text = "AddressFamily inet";
+  home.file.".ssh/config".text = "AddressFamily inet";
 
   programs.git = {
     enable = true;

hosts/adalbert/default.nix

@@ -75,7 +75,6 @@
 
   boot.binfmt.emulatedSystems = [
     "aarch64-linux"
-    "riscv64-linux"
   ];
 
   programs = {

hosts/common/global/default.nix

@@ -12,6 +12,7 @@
       ./fish.nix
       ./locale.nix
       ./nix.nix
+      ./podman.nix
       ./power-button.nix
       ./documentation.nix
     ]

hosts/eustachius/default.nix

@@ -5,7 +5,6 @@
 }: let
   vars = import ../../vars.nix;
 in {
-  imports = [../common/global/locale.nix];
   # NixOS wants to enable GRUB by default
   boot.loader.grub.enable = false;
   # Enables the generation of /boot/extlinux/extlinux.conf
@@ -91,7 +90,7 @@ in {
 
   # put your own configuration here, for example ssh keys:
   users.mutableUsers = true;
-  users.users.nixos = {
+  users.users.${vars.user} = {
     isNormalUser = true;
     password = "changeme";
     extraGroups = ["wheel" "docker"];
@@ -106,12 +105,5 @@ in {
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINCjLoirHMos7c9lRatWtSYAk68xbUGc8vPU0wFxIzj openpgp:0x7430326E"
     ];
   };
-  users.users.admin = {
-    isNormalUser = true;
-    extraGroups = ["wheel"]; # Enable ‘sudo’ for the user.
-    hashedPassword = "blablabla"; # generate with `mkpasswd`
-  };
-  nix.settings.trusted-users = ["admin" "ghoscht" "nixos"];
-
   system.stateVersion = "23.11";
 }