bulk of the refactor

modules/common/environment.nix

@@ -6,14 +6,19 @@
     neovim
     usbutils
     coreutils
-    lshw
-    systemd
-    dmidecode
     pciutils
-    nix-ld
     patchelf
     htop
-  ];
+  ] ++ 
+  lib.optionals pkgs.stdenv.isLinux (with pkgs; [
+    systemd
+    lshw
+    dmidecode
+    nix-ld
+  ]) ++
+  lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
+      # nothing here, yet
+  ]);
 
   # Common environment variables that every system will use
   environment.variables.EDITOR = "nvim";

modules/common/users.nix

@@ -1,30 +1,23 @@
+{ lib, pkgs, userName, hostname, ... }:
+
 {
-  lib,
-  pkgs,
-  userName,
-  hostname,
-  ...
-} @ args: {
   networking.hostName = hostname;
   
-  # Don't forget to set a password with ‘passwd’!
+  users.users."${userName}" = {
-  users.users."${userName}" = lib.mkMerge [
+    home = if pkgs.stdenv.isDarwin 
-    {
+           then "/Users/${userName}" 
-      home =
+           else "/home/${userName}";
-        if pkgs.stdenv.isDarwin
+    description = userName;
-        then "/Users/${userName}"
+  } // lib.optionalAttrs pkgs.stdenv.isLinux {
-        else "/home/${userName}";
+    group = "${userName}";
-      description = userName;
+    isNormalUser = true;
-    }
+  };
   
-    (lib.mkIf (pkgs.stdenv.isLinux) {
+  users.groups.wyatt = {};
-      group = "${userName}";
+  nix.settings.trusted-users = [userName];
-      isNormalUser = true;
-    })
-  ];
 
-  security.sudo = {
+  security = lib.optionalAttrs pkgs.stdenv.isLinux {
-    extraRules = [
+    sudo.extraRules = [
       {
         groups = [ "wheel" ];
         commands = [
@@ -37,7 +30,9 @@
     ];
   };
 
-  users.groups.wyatt = {};
+  environment = lib.optionalAttrs pkgs.stdenv.isDarwin {
-
+    etc."sudoers.d/wheel-nopasswd".text = ''
-  nix.settings.trusted-users = [userName];
+      %wheel ALL=(ALL:ALL) NOPASSWD: SETENV: ALL
+    '';
+  };
 }