From 3867f156bee4eccdfaa4aa5c6704d0d2c3b98b75 Mon Sep 17 00:00:00 2001
From: Christopher James Hayward <chris@chrishayward.xyz>
Date: Sat, 19 Jun 2021 08:04:11 -0400
Subject: [PATCH] Move boot loader into hardware config

---
 README.org                        | 1 -
 hosts/acernitro/configuration.nix | 8 +++-----
 hosts/acernitro/hardware.nix      | 5 +++--
 hosts/nixos/configuration.nix     | 4 ----
 hosts/nixos/hardware.nix          | 4 ++++
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/README.org b/README.org
index f06eff3..2d29d86 100644
--- a/README.org
+++ b/README.org
@@ -538,7 +538,6 @@ This configuration is nearly identical to the default, except for a few key diff
 
 *** Hardware
 
-+ Override the default =DPI=
 + Enables sound via PulseAudio
 + Adds support for the NVIDIA Hybrid GPU
 
diff --git a/hosts/acernitro/configuration.nix b/hosts/acernitro/configuration.nix
index 21c33a6..7404d17 100644
--- a/hosts/acernitro/configuration.nix
+++ b/hosts/acernitro/configuration.nix
@@ -2,9 +2,6 @@
 { config, pkgs, inputs, ... }:
 
 {
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   time.timeZone = "America/Toronto";
 
   networking.hostName = "acernitro";
@@ -19,6 +16,7 @@
   networking.wireless.networks.MyWiFi_5C1870.pskRaw =
     "409b3c85fef1c5737f284d2f82f20dc6023e41804e862d4fa26265ef8193b326";
 
+  services.xserver.dpi = 96;
   services.openssh.enable = true;
   services.printing.enable = true;
 
@@ -28,7 +26,7 @@
 
   users.users.chris = {
     shell = pkgs.fish;
-    isNormalUser = true;
-    extraGroups = [ "wheel" ];
+    isnormaluser = true;
+    extragroups = [ "wheel" ];
   };
 }
diff --git a/hosts/acernitro/hardware.nix b/hosts/acernitro/hardware.nix
index e2c17ba..9395c96 100644
--- a/hosts/acernitro/hardware.nix
+++ b/hosts/acernitro/hardware.nix
@@ -11,12 +11,13 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
   sound.enable = true;
   hardware.pulseaudio.enable = true;
   hardware.pulseaudio.support32Bit = true;
 
-  services.xserver.dpi = 96;
-
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/2f548eb9-47ce-4280-950f-9c6d1d162852";
       fsType = "ext4"; 
diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix
index be679e6..4e0ad10 100644
--- a/hosts/nixos/configuration.nix
+++ b/hosts/nixos/configuration.nix
@@ -2,10 +2,6 @@
 { config, pkgs, inputs, ... }:
 
 {
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/sda";
-
   time.timeZone = "America/Toronto";
 
   networking.hostName = "nixos";
diff --git a/hosts/nixos/hardware.nix b/hosts/nixos/hardware.nix
index b98dee7..7e6d369 100644
--- a/hosts/nixos/hardware.nix
+++ b/hosts/nixos/hardware.nix
@@ -11,6 +11,10 @@
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  boot.loader.grub.device = "/dev/sda";
+
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/fddc37ff-a442-41fa-afc4-abf878be7c5a";
       fsType = "ext4";