diff --git a/home-manager/users/nathan/default.nix b/home-manager/users/nathan/default.nix
index eb5ca6f..db5758b 100644
--- a/home-manager/users/nathan/default.nix
+++ b/home-manager/users/nathan/default.nix
@@ -38,27 +38,16 @@
             defaultSopsFile = ./secrets.yaml;
             defaultSopsFormat = "yaml";
         };
-/*
-        nix = {
+
+        nix = lib.mkIf config.homeconfig.standalone.enable {
             nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
             settings = {
                 experimental-features = [ "nix-command" "flakes" ];
-                builders = ''
-                    ssh://remote-builder@blunkall.us
-                '';
+                builders = "ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -";
                 builders-use-substituters = true;
             };
         };
 
-        programs.ssh.matchBlocks = {
-            "builder" = {
-                hostname = "blunkall.us";
-                user = "remote-builder";
-                identityFile = config.sops.secrets."".path;
-                port = 2222;
-            };
-        };
-*/
         services.mpris-proxy.enable = true;
 
         programs.ssh = {
diff --git a/system-config/configuration/pi4/default.nix b/system-config/configuration/pi4/default.nix
index df28481..ad5bf77 100644
--- a/system-config/configuration/pi4/default.nix
+++ b/system-config/configuration/pi4/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ pkgs, inputs, ... }: {
 
     imports = [
         ./hardware-configuration.nix
@@ -14,30 +14,46 @@
 
     config = {
 
+        users.users.nathan.initialPassword = "7567";
+
         sysconfig = {
             remoteBuildClient = true;
-            openssh.enable = true;
-            #pipewire.enable = true;
-            git.enable = true;
-            nh.enable = true;
-            netbird.enable = true;
-        };
 
-        home-manager = {
-            backupFileExtension = "backup";
-            extraSpecialArgs = { inherit inputs; };
-            sharedModules = [ inputs.sops-nix.homeManagerModules.sops ];
             users = {
-                "nathan" = lib.mkMerge [
-                    {
-                        config.homeconfig = {
-                            homeScripts.enable = false;
-                            minimal = true;
-                            mpd.enable = true;
-                        };
-                    }
-                    inputs.nathan-home-manager
-                ];
+                nathan = {
+                    #hashedPasswordFile = config.sops.secrets."nathan/pass".path;
+                    shell = pkgs.zsh;
+                    extraGroups = [
+                        "wheel"
+                        "networkmanager"
+                        "gpio"
+                        "spi"
+                        "audio"
+                        "pulse"
+                        "pulse-access"
+                    ];
+                    home-manager = {
+                        enable = true;
+                        standalone = false;
+                        extraModules = [
+                        {
+                            homeconfig = {
+                                scripts.enable = false;
+                                minimal = true;
+                                mpd.enable = true;
+                                git.enable = true;
+                                nh.enable = true;
+                            };
+                        } 
+                        ];
+                    };
+                };
+            };
+
+            services = {
+                openssh.enable = true;
+                #pipewire.enable = true;
+                netbird.enable = true;
             };
         };
 
@@ -80,26 +96,7 @@
         environment.shells = with pkgs; [ zsh ];
         
         users = { 
-            defaultUserShell = pkgs.zsh;
-
             groups.gpio = {};
-
-            users = {
-                nathan = {
-                    isNormalUser = true;
-                    description = "Nathan";
-                    initialPassword = "7567";
-                    extraGroups = [
-                        "wheel"
-                            "networkmanager"
-                            "gpio"
-                            "spi"
-                            "audio"
-                            "pulse"
-                            "pulse-access"
-                    ];
-                };
-            };
         };
 
         services = {