fixes to get darwin to build

modules/darwin/default.nix

@@ -1,5 +1,27 @@
-{ ... }: {
+{ lib, ... }: {
 
   imports = [ ./system.nix ./tmux.nix ./utilities.nix ./hammerspoon.nix ];
 
+
+  options = with lib; {
+
+    user = mkOption {
+      type = types.str;
+      description = "Primary user of the system";
+    };
+
+    gui = {
+      enable = mkEnableOption {
+        description = "Enable graphics";
+        default = false;
+      };
+
+      colorscheme = mkOption {
+        type = types.attrs;
+        description = "Base16 color scheme";
+      };
+
+    };
+  };
+
 }

modules/darwin/homebrew.nix

@@ -11,6 +11,8 @@
       "trash" # Delete files and folders to trash instead of rm
     ];
     casks = [
+      "firefox" # Firefox packaging on Nix is broken for MacOS
+      "1password" # 1Password packaging on Nix is broken for MacOS
       "scroll-reverser" # Different scroll style for mouse vs. trackpad
       "meetingbar" # Show meetings in menu bar
       "gitify" # Git notifications in menu bar

modules/darwin/system.nix

@@ -14,7 +14,7 @@
         AppleInterfaceStyle = "Dark";
 
         # Don't change from dark to light automatically
-        AppleInterfaceSwitchesAutomatically = false;
+        # AppleInterfaceSwitchesAutomatically = false;
 
         # Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)
         AppleKeyboardUIMode = 3;

modules/darwin/utilities.nix

@@ -2,7 +2,7 @@
 
   home-manager.users.${config.user} = {
 
-    home.packages = [
+    home.packages = with pkgs; [
       visidata # CSV inspector
       dos2unix # Convert Windows text files
       inetutils # Includes telnet
@@ -32,9 +32,11 @@
       ];
     };
 
-    fonts.fonts = with pkgs;
-      [ (nerdfonts.override { fonts = [ "fira-mono" ]; }) ];
-
   };
 
+
+    fonts.fonts = with pkgs;
+      [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
+
+
 }