From b1be94eda182e4c9462b844cf50bcdb2891555c1 Mon Sep 17 00:00:00 2001
From: Matthew Ess <mess@yelp.com>
Date: Thu, 2 Jan 2020 17:54:21 -0500
Subject: [PATCH] Clean up system config

---
 configuration.nix | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 313ba6e..56b5176 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,15 +11,7 @@
     <home-manager/nixos>
   ];
 
-  # Use the GRUB 2 boot loader.
-  # boot.loader.grub.enable = true;
-  # boot.loader.grub.version = 2;
-  # boot.loader.grub.efiSupport = true;
-  # boot.loader.grub.efiInstallAsRemovable = true;
-  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  # Define on which hard drive you want to install Grub.
-  # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
-  # systemd-boot
+  # Bootloader
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.configurationLimit = 64;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -28,18 +20,23 @@
 
   system.autoUpgrade.enable = true;
 
-  networking.hostName = "nixpad"; # Define your hostname.
-  networking.networkmanager.enable = true;
-  networking.networkmanager.wifi.scanRandMacAddress = false;
-
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = false;
-  networking.interfaces.enp0s25.useDHCP = true;
-  networking.interfaces.wlp3s0.useDHCP = true;
-  networking.interfaces.wwp0s20u4c2i12.useDHCP = true;
+  networking = {
+    hostName = "nixpad"; # Define your hostname.
+    networkmanager = {
+      enable = true;
+      wifi.scanRandMacAddress = false;
+    };
 
+    # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+    # Per-interface useDHCP will be mandatory in the future, so this generated config
+    # replicates the default behaviour.
+    useDHCP = false;
+    interfaces = {
+      enp0s25.useDHCP = true;
+      wlp3s0.useDHCP = true;
+      wwp0s20u4c2i12.useDHCP = true;
+    };
+  };
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";