nix-os/account.nix

@@ -14,7 +14,8 @@
       (if config.programs.adb.enable then "adbusers" else null)
     ];
     linger = true;
-    initialPassword = "nixos";
+    # Initial password for the account
+    password = "nixos";
     packages = with pkgs; [
       firefox
       vivaldi

nix-os/core.nix

@@ -29,12 +29,6 @@
     ddrescue
   ];
 
-  programs.git.config = {
-    init.defaultBranch = "main";
-    merge.conflictstyle = "diff3";
-    rerere.enabled = true;
-  };
-
   # Enable fail2ban because of the OpenSSH server
   services.fail2ban = {
     enable = true;

nix-os/shell.nix

@@ -120,9 +120,6 @@ in
         truncation_length = 5;
         truncation_symbol = "…/";
       };
-      hostname = {
-        ssh_only = false;
-      };
       username = {
         show_always = true;
       };