diff --git a/common/linux.nix b/common/linux.nix
index 4a6720a..99e35d0 100644
--- a/common/linux.nix
+++ b/common/linux.nix
@@ -1,17 +1,16 @@
 { pkgs, ... }:
 
 {
+  boot.kernel.sysctl."kernel.unprivileged_userns_clone" = 1;
+  boot.kernelPackages = pkgs.linuxPackages_hardened;
+  boot.supportedFilesystems = [ "ntfs" ];
+
   system.stateVersion = "unstable";
   system.autoUpgrade.enable = true;
 
-  # Automatically optimize the Nix store.
   nix.autoOptimiseStore = true;
-
-  boot.kernel.sysctl."kernel.unprivileged_userns_clone" = 1;
-
-  # Enable Nix flake support.
-  nix.package = pkgs.nixUnstable;
   nix.extraOptions = "experimental-features = nix-command flakes";
+  nix.package = pkgs.nixUnstable;
 
   nixpkgs.config = {
     allowUnfree = true;
@@ -20,31 +19,20 @@
     ];
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_hardened;
-  # Enable support for additional filesystems
-  boot.supportedFilesystems = [ "ntfs" ];
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.dave = {
     isNormalUser = true;
     extraGroups = [ "wheel" "libvirtd" ];
     shell = pkgs.zsh;
   };
 
-  # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
     font = "Lat2-Terminus16";
     keyMap = "us";
   };
 
-  # Set your time zone.
   time.timeZone = "America/Toronto";
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound.
   sound.enable = true;
 
   # Enable 32bit for steam
diff --git a/common/packages.nix b/common/packages.nix
index 6a261e9..14384a2 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -191,7 +191,7 @@ in
         usbutils
         virtmanager
         vlc
-        # Unsupported or broken on darwin:
+        # Unsupported / broken on darwin:
         aws-sam-cli
         bitwarden
         brave
@@ -211,11 +211,10 @@ in
         teams
         wireshark-qt
         zoom-us
-        netdata # TODO: Enable launchd support with nix-darwin
+        netdata
       ]);
     in
     common;
 
-  # Install GnuPG agent.
   programs.gnupg.agent.enable = true;
 }