diff --git a/systems/x86_64-linux/gallifrey/default.nix b/systems/x86_64-linux/gallifrey/default.nix
index c841dda..85ebd95 100644
--- a/systems/x86_64-linux/gallifrey/default.nix
+++ b/systems/x86_64-linux/gallifrey/default.nix
@@ -9,11 +9,6 @@
     ./hardware.nix
   ];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
-
   hardware.opengl = {
     enable = true;
     driSupport = true;
@@ -34,7 +29,6 @@
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
     font = "Lat2-Terminus16";
-  #  keyMap = "us";
     useXkbConfig = true; # use xkbOptions in tty.
   };
 
@@ -61,7 +55,6 @@
     desktopManager.gnome.enable = true;
   };
 
-
   environment.systemPackages = with pkgs; [
     coreutils mime-types file gitFull
     usbutils pciutils
@@ -121,7 +114,6 @@
     backupFileExtension = "hm-bak";
   };
 
-
   programs.fish.enable = true;
   users.defaultUserShell = pkgs.fish;
   users.users = {
diff --git a/systems/x86_64-linux/gallifrey/hardware.nix b/systems/x86_64-linux/gallifrey/hardware.nix
index 736d237..82ecb67 100644
--- a/systems/x86_64-linux/gallifrey/hardware.nix
+++ b/systems/x86_64-linux/gallifrey/hardware.nix
@@ -1,43 +1,42 @@
 { 
-  config,
-  lib,
+  pkgs,
   modulesPath,
   ...
 }:
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
   boot.initrd.availableKernelModules = [
     "ehci_pci" "ahci" "xhci_pci" "sd_mod" "ohci_pci"
     "usb_storage" "usbhid"
   ];
-
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/4f33f0b4-32c3-48a9-8052-92fd51ace8af";
-      fsType = "ext4";
-    };
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/4060-6415";
-      fsType = "vfat";
-    };
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/943c804b-0f95-4e99-98f3-cb63c6d37a15"; }
-    ];
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/4f33f0b4-32c3-48a9-8052-92fd51ace8af";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/4060-6415";
+    fsType = "vfat";
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/943c804b-0f95-4e99-98f3-cb63c6d37a15"; }
+  ];
 
-  # 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.enp3s0f0.wakeOnLan.enable = true;
-  # networking.interfaces.enp3s0f0.useDHCP = lib.mkDefault true;
+  networking.useDHCP = true;
 
-  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;
 }