From 9c4a72ebb1d2a6eb9497ecf2e0f7a9a84ab2faff Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotip.com>
Date: Tue, 24 Jan 2023 19:06:00 -0800
Subject: [PATCH] cleanup

---
 systems/common.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/systems/common.nix b/systems/common.nix
index 50ffdcc..b1fce9e 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -2,21 +2,18 @@
 { config, pkgs, ... }:
 
 {
-
   fileSystems."/" =
     { device = "/dev/disk/by-partlabel/primary";
       fsType = "btrfs";
     };
-
   fileSystems."/boot" =
     { device = "/dev/disk/by-partlabel/ESP";
       fsType = "vfat";
     };
 
-  nixpkgs.config.allowUnfree = true;
-
   # hardware
   hardware.enableRedistributableFirmware = true;
+  networking.networkmanager.enable = true;
 
   # Bootloader
   boot.loader.systemd-boot.enable = true;
@@ -25,17 +22,14 @@
   # Kernel
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  # Flakes
+  # Nix
+  system.stateVersion = "23.05";
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nixpkgs.config.allowUnfree = true;
 
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
+  # Location & internationalisation
   time.timeZone = "America/Los_Angeles";
-
-  # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
-
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "en_US.UTF-8";
     LC_IDENTIFICATION = "en_US.UTF-8";
@@ -58,8 +52,6 @@
     xkbVariant = "";
   };
   services.printing.enable = true;
-
-  # Enable sound with pipewire.
   sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -116,6 +108,7 @@
   ]);
   services.xserver.excludePackages = [ pkgs.xterm ];
   documentation.nixos.enable = false; 
+
   # GNUPG Stuff 
   services.pcscd.enable = true;
     programs.gnupg.agent = {
@@ -126,6 +119,5 @@
 
   services.openssh.enable = true;
 
-  system.stateVersion = "23.05";
 
 }