oops. dense commit

hosts/server/default.nix

@@ -4,20 +4,18 @@ let
 
 in {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
     ./webapps/default.nix
   ];
 
   users.groups.dotfiles = {};
 
-  # HACK HACK HACK
-  services.logrotate.checkConfig = false;
-  # HACK HACK HACK
-
   normalUsers = {
     reidlab = {
       conf = {
-        packages = with pkgs; [ bat tree micro duf ];
+        packages = with pkgs; [
+          bat btop duf file micro nix-output-monitor tree which
+        ];
         extraGroups = [ "wheel" "dotfiles" ];
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICmwWuwS+a1GzYFSNOkgk/zF5bolXqat1RP5FXJv+vto reidlab@rei-pc"
@@ -33,11 +31,6 @@ in {
     };
   };
 
-  keyboard = {
-    locale = "en_US.UTF-8";
-    variant = "qwerty";
-  };
-
   modules = {
     services = {
       ssh = {
@@ -55,6 +48,7 @@ in {
     security.useDoas = false;
   };
 
+  # enable networking
   networking = {
     hostName = "nixos-server-reid";
     networkmanager.enable = true;

hosts/server/hardware.nix

@@ -7,10 +7,12 @@
     ];
 
   boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" ];
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
 	initrd.kernelModules = [ ];
-    kernelPackages = pkgs.linuxPackages_latest;
 	kernelModules = [ ];
+	extraModulePackages = [ ];
+	# TODO: move bootloader, networking, boot speed to another file?
+    kernelPackages = pkgs.linuxPackages_latest;
     loader = {
       # use u-boot over grub
       grub.enable = lib.mkForce false;
@@ -18,14 +20,13 @@
     };
   };
 
-  fileSystems = {
-  	"/" = {
+  fileSystems."/" = {
   	  device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
       fsType = "ext4";
     };
-  };
 
-  swapDevices = [ ];
+  swapDevices = 
+    [ ];
 
   # 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