3 files changed, 53 insertions, 57 deletions
diff --git a/hosts/sparrow/default.nix b/hosts/sparrow/default.nix
index c7b175f..4eb87b0 100644
--- a/hosts/sparrow/default.nix
+++ b/hosts/sparrow/default.nix
@@ -1,8 +1,34 @@
-{ inputs, pkgs, ... }:
+{
+  inputs,
+  lib,
+  pkgs,
+  ...
+}:
 {
   system.stateVersion = "24.05";
 
-  imports = [ ./hardware.nix ];
+  imports = [ ./filesystems ];
+
+  hardware = {
+    enableRedistributableFirmware = true;
+    cpu.intel.updateMicrocode = true;
+  };
+
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.binfmt.emulatedSystems = [
+    "aarch64-linux"
+    "riscv64-linux"
+  ];
 
   home-manager = {
     useGlobalPkgs = true;
@@ -14,25 +40,13 @@
     };
   };
 
+  time.timeZone = "America/Detroit";
   networking = {
     hostName = "sparrow";
     networkmanager.enable = true;
   };
 
-  time.timeZone = "America/Detroit";
-
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    binfmt.emulatedSystems = [
-      "aarch64-linux"
-      "riscv64-linux"
-    ];
-  };
-
-  # Since I don't always carry my split keyboard, remap CAPS to left CTRL.
+  # Since I don't always use my split keyboard, remap CAPS to left CTRL.
   console.useXkbConfig = true;
   services = {
     xserver.xkb.options = "ctrl:swapcaps";
diff --git a/hosts/sparrow/filesystems/default.nix b/hosts/sparrow/filesystems/default.nix
new file mode 100644
index 0000000..3e83293
--- /dev/null
+++ b/hosts/sparrow/filesystems/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  ...
+}:
+{
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/d296f7a3-68d2-406f-963d-8ec39ab0ea64";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/B159-723B";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
+
+  swapDevices = lib.singleton {
+    device = "/.swapfile";
+  };
+}
diff --git a/hosts/sparrow/hardware.nix b/hosts/sparrow/hardware.nix
deleted file mode 100644
index d40b232..0000000
--- a/hosts/sparrow/hardware.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/d296f7a3-68d2-406f-963d-8ec39ab0ea64";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B159-723B";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices = [{
-    device = "/.swapfile";
-  }];
-
-  # 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.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp59s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}