initial refactoring

platforms/nix-darwin/modules/nmasur/presets/programs/doas.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.doas;
+in
+
+{
+
+  options.nmasur.presets.programs.doas.enable = lib.mkEnableOption "doas sudo alternative";
+
+  config = lib.mkIf cfg.enable {
+
+    # Alias sudo to doas for convenience
+    fish.shellAliases = {
+      sudo = "doas";
+    };
+
+    # Disable overriding our sudo alias with a TERMINFO alias
+    kitty.settings.shell_integration = "no-sudo";
+  };
+
+}

platforms/nix-darwin/modules/nmasur/presets/programs/fish.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.fish;
+in
+
+{
+
+  options.nmasur.presets.programs.fish.enable = lib.mkEnableOption "Fish shell";
+
+  config = lib.mkIf cfg.enable {
+    programs.fish.enable = true;
+
+    environment.shells = [ pkgs.fish ];
+
+    users.users.${config.user}.shell = pkgs.fish;
+
+    # Speeds up fish launch time on macOS
+    programs.fish.useBabelfish = true;
+  };
+}

platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix

@@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.homebrew;
+in
+
+{
+
+  options.nmasur.presets.programs.homebrew.enable =
+    lib.mkEnableOption "Homebrew macOS package manager";
+
+  config = lib.mkIf cfg.enable {
+    # Requires Homebrew to be installed
+    system.activationScripts.preUserActivation.text = ''
+      if ! xcode-select --version 2>/dev/null; then
+        $DRY_RUN_CMD xcode-select --install
+      fi
+      if ! /opt/homebrew/bin/brew --version 2>/dev/null; then
+        $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+      fi
+    '';
+
+    # Add homebrew paths to CLI path
+    home.sessionPath = [ "/opt/homebrew/bin/" ];
+
+    homebrew = {
+      enable = true;
+      onActivation = {
+        autoUpdate = false; # Don't update during rebuild
+        cleanup = "zap"; # Uninstall all programs not declared
+        upgrade = true;
+      };
+      global = {
+        brewfile = true; # Run brew bundle from anywhere
+        lockfiles = false; # Don't save lockfile (since running from anywhere)
+      };
+    };
+
+  };
+}