From bc679874a2fb203ad150b9ec0c3ca9a855bb7440 Mon Sep 17 00:00:00 2001
From: Benson Chu <bensonchu457@gmail.com>
Date: Fri, 26 Jan 2024 08:33:02 -0600
Subject: [PATCH] Cleaned up configuration

---
 configuration.nix | 94 +++++++++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 40 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index f650146..4f294e9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -7,25 +7,32 @@ in
     ./hardware-configuration.nix
   ];
 
-  networking.hostId = "7be305c3";
-  networking.hostName = "sandy";
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  networking = {
+    hostId = "7be305c3";
+    hostName = "sandy";
+    networkmanager.enable = true;
+  };
+
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
 
-  networking.networkmanager.enable = true;
   time.timeZone = "America/Chicago";
 
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "en_US.UTF-8";
+      LC_IDENTIFICATION = "en_US.UTF-8";
+      LC_MEASUREMENT = "en_US.UTF-8";
+      LC_MONETARY = "en_US.UTF-8";
+      LC_NAME = "en_US.UTF-8";
+      LC_NUMERIC = "en_US.UTF-8";
+      LC_PAPER = "en_US.UTF-8";
+      LC_TELEPHONE = "en_US.UTF-8";
+      LC_TIME = "en_US.UTF-8";
+    };
   };
 
   nixpkgs.config.allowUnfree = true;
@@ -37,10 +44,15 @@ in
     '';
   };
 
+  programs.zsh.enable = true;
+
   services = {
     openssh.enable = true;
     tailscale.enable = true;
     zfs.autoSnapshot.enable = true;
+    hardware.bolt.enable = true;
+    nscd.enable = true;
+
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -48,8 +60,6 @@ in
       pulse.enable = true;
     };
 
-    hardware.bolt.enable = true;
-
     xserver = {
       enable = true;
       displayManager.lightdm.enable = true;
@@ -67,32 +77,36 @@ in
       startWithGraphical = true;
     };
 
-    nscd.enable = true;
-    printing.enable = true;
-  };
-
-  programs.zsh.enable = true;
-  services.avahi = {
-    enable = true;
-    nssmdns = true;
-    openFirewall = true;
-    publish = {
+    avahi = {
       enable = true;
-      userServices = true;
+      nssmdns = true;
+      openFirewall = true;
+      publish = {
+        enable = true;
+        userServices = true;
+      };
+    };
+
+    printing = {
+      enable = true;
+      listenAddresses = [ "*:631" ];
+      allowFrom = [ "all" ];
+      browsing = true;
+      defaultShared = true;
+      openFirewall = true;
+      drivers = with pkgs; [
+        epson-escpr2 epson-escpr epson-201106w
+        gutenprint
+      ];
     };
   };
-  services.printing = {
-    listenAddresses = [ "*:631" ];
-    allowFrom = [ "all" ];
-    browsing = true;
-    defaultShared = true;
-    openFirewall = true;
-    drivers = [ pkgs.epson-escpr2 pkgs.epson-escpr pkgs.epson-201106w pkgs.gutenprint ];
-  };
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  hardware.printers = {
 
+  sound.enable = true;
+  hardware = {
+    pulseaudio.enable = false;
+    printers = {
+
+    };
   };
 
   security = {