diff --git a/nix-os/account.nix b/nix-os/account.nix
index 2b603c6..a9ea40c 100644
--- a/nix-os/account.nix
+++ b/nix-os/account.nix
@@ -14,8 +14,7 @@
       (if config.programs.adb.enable then "adbusers" else null)
     ];
     linger = true;
-    # Initial password for the account
-    password = "nixos";
+    initialPassword = "nixos";
     packages = with pkgs; [
       firefox
       vivaldi
diff --git a/nix-os/core.nix b/nix-os/core.nix
index d79f6e9..a5633da 100644
--- a/nix-os/core.nix
+++ b/nix-os/core.nix
@@ -29,6 +29,12 @@
     ddrescue
   ];
 
+  programs.git.config = {
+    init.defaultBranch = "main";
+    merge.conflictstyle = "diff3";
+    rerere.enabled = true;
+  };
+
   # Enable fail2ban because of the OpenSSH server
   services.fail2ban = {
     enable = true;
diff --git a/nix-os/shell.nix b/nix-os/shell.nix
index c13ffbe..cee283b 100644
--- a/nix-os/shell.nix
+++ b/nix-os/shell.nix
@@ -120,6 +120,9 @@ in
         truncation_length = 5;
         truncation_symbol = "…/";
       };
+      hostname = {
+        ssh_only = false;
+      };
       username = {
         show_always = true;
       };