diff --git a/dotfiles/systems/fighter/hardware.nix b/dotfiles/systems/fighter/hardware.nix
index 32c8fe73..b15eec03 100644
--- a/dotfiles/systems/fighter/hardware.nix
+++ b/dotfiles/systems/fighter/hardware.nix
@@ -1,40 +1,19 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, sys, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  swapDevices = [ ];
-  networking = {
-    hostName = "${sys.hostname}";
-    defaultGateway = { address = "192.168.1.1"; interface = "${sys.networking.ifname}"; };
-    interfaces."${sys.networking.ifname}" = {
-      useDHCP = false;
-      macAddress = "${sys.networking.mac}";
-      ipv4.addresses = [ { address = "${sys.networking.ip}"; prefixLength = 24; } ];
-    };
-    nameservers = [
-      "10.0.0.1"
-    ];
+{ ... }: {
+  boot = { 
+    initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
   };
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
+  swapDevices = [
+    { device = "/.swapfile"; size = 32*1024;}
+  ];
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  nixpkgs.hostPlatform = "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = true;
+  hardware.enableRedistributableFirmware = true;
 }
\ No newline at end of file
diff --git a/dotfiles/systems/fighter/networking.nix b/dotfiles/systems/fighter/networking.nix
new file mode 100644
index 00000000..2afed0c1
--- /dev/null
+++ b/dotfiles/systems/fighter/networking.nix
@@ -0,0 +1,12 @@
+{ sys, ... }: {
+  networking = {
+    hostName = "fighter";
+    defaultGateway = { address = "192.168.1.1"; interface = "enp3s0"; };
+    interfaces."enp3s0" = {
+      useDHCP = false;
+      macAddress = "00:02:c9:56:bf:9a";
+      ipv4.addresses = [ { address = "192.168.1.23"; prefixLength = 24; } ];
+    };
+    nameservers = [ "10.0.0.1" ];
+  };
+}
\ No newline at end of file