diff --git a/configuration.nix b/configuration.nix
index cc91394..d9bfe22 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,17 +1,20 @@
-{ config, lib, pkgs, ... }:
-{
-  imports = [
-      ./hardware-configuration.nix
-  ];
+{ config, lib, pkgs, ... }: {
+  imports = [ ./hardware-configuration.nix ];
 
-  boot.loader.systemd-boot.enable      = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  boot = {
+    loader.systemd-boot.enable = true;
+    loader.efi.canTouchEfiVariables = true;
+  };
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix = {
+    buildMachines = [ ];
+    distributedBuilds = false;
+    settings.experimental-features = [ "nix-command" "flakes" ];
+  };
 
   networking = {
     hostName = "eve-psr-nix0";
-    firewall = { 
+    firewall = {
       allowedTCPPorts = [ 22 80 443 ];
       allowedUDPPorts = [ 22 80 443 ];
     };
@@ -20,63 +23,30 @@
   time.timeZone = "America/Chicago";
 
   services.openssh.enable = true;
-  virtualisation.docker   = {
+  virtualisation.docker = {
     enable = true;
     liveRestore = false;
   };
 
-  environment.systemPackages = with pkgs; [
-    git
-    pciutils
-    vim
-    wget
-  ];
+  environment.systemPackages = with pkgs; [ git pciutils vim wget ];
 
-
-  programs.zsh.enable    = true;
-  users.defaultUserShell = pkgs.zsh;
-  users.users 	         = {
-    sezycei = {
-      isNormalUser         = true;
-      initialPassword      = "bootMaster";
-      extraGroups          = [ "wheel" "docker" ];
-      packages             = with pkgs; [
-        byobu
-        tmux
-	stack
-      ];
-    };
-    torrent = {
-      isNormalUser         = true;
-      initialPassword      = "torrentUserTemp";
+  programs.zsh.enable = true;
+  users = {
+    defaultUserShell = pkgs.zsh;
+    users = {
+      sezycei = {
+        isNormalUser = true;
+        initialPassword = "bootMaster";
+        extraGroups = [ "wheel" "docker" ];
+        packages = with pkgs; [ byobu tmux stack ];
+      };
+      torrent = {
+        isNormalUser = true;
+        initialPassword = "torrentUserTemp";
+      };
     };
 
   };
 
-  # NixBuild.net Configuration
-  programs.ssh.extraConfig = ''
-    Host eu.nixbuild.net
-      PubkeyAcceptedKeyTypes ssh-ed25519
-      IdentityFile /home/sezycei/.ssh/nixbuilds
-  '';
-  
-  programs.ssh.knownHosts = {
-    nixbuild = {
-      hostNames = [ "eu.nixbuild.net" ];
-      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM";
-    };
-  };
-  
-  nix = {
-    distributedBuilds = false;
-    buildMachines = [
-      { hostName = "eu.nixbuild.net";
-        system = "x86_64-linux";
-        maxJobs = 100;
-        supportedFeatures = [ "benchmark" "big-parallel" ];
-      }
-    ];
-  };
-
   system.stateVersion = "22.11";
 }
diff --git a/flake.nix b/flake.nix
index a908eb5..c7f7000 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,15 +1,11 @@
 {
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
-  };
+  inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; };
 
   outputs = { self, nixpkgs }: {
     nixosConfigurations = {
       eve-psr-nix0 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [ 
-          ./configuration.nix
-        ];
+        modules = [ ./configuration.nix ];
       };
     };
   };
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 9e7aa23..74868ed 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -4,24 +4,23 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/NIXROOT";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-label/NIXBOOT";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/NIXBOOT";
+    fsType = "vfat";
+  };
 
   swapDevices = [ ];
 
@@ -35,5 +34,6 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }