diff --git a/home/git.nix b/home/git.nix
index 4ce2355..abfa479 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -2,20 +2,19 @@
 {
   programs.git = {
     enable = true;
-    userName = "DerGrumpf"; # TODO replace
-    userEmail = "p.keier@beyerstedt-it.de"; # TODO replace
-
-    lfs.enable = true;
-
-    ignores = [ "**/.DS_STORE" ];
-
-    extraConfig = {
-      github = {
+    settings = {
+	user = {
+	    name = "DerGrumpf"; # TODO replace
+	    email = "p.keier@beyerstedt-it.de"; # TODO replace
+        };
+	github = {
         user = primaryUser;
       };
       init = {
         defaultBranch = "main";
       };
     };
+    lfs.enable = true;
+    ignores = [ "**/.DS_STORE" ];
   };
 }
diff --git a/home/packages.nix b/home/packages.nix
index 31c73e4..b9ceeb2 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -23,7 +23,6 @@
       # misc
       nil # move to nixvim
       biome # move to nixvim
-      nixfmt-rfc-style # move to nixvim
       yt-dlp
       ffmpeg
     ];
diff --git a/nixos/default.nix b/nixos/default.nix
index 177abe0..c7d99ed 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -39,7 +39,6 @@
     settings = {
       experimental-features = [ "nix-command" "flakes" ];
       auto-optimise-store = true;
-      builders = "ssh://phil@192.168.2.40 aarch64-linux";
       builders-use-substitutes = true;
     };
     gc = {
@@ -47,6 +46,17 @@
       dates = "weekly";
       options = "--delete-older-than 30d";
     };
+    buildMachines = [
+	{
+		hostName = "192.168.2.40";
+		system = "aarch64-linux";
+		user = "phil";
+		maxJobs = 4;
+		speedFactor = 2;
+		supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
+		mandatoryFeatures = [ ];
+	}
+    ];
   };
 
   system.stateVersion = "24.11";