diff --git a/modules/services/buildkite-agent.nix b/modules/services/buildkite-agent.nix
index 13dcb04a..efe40545 100644
--- a/modules/services/buildkite-agent.nix
+++ b/modules/services/buildkite-agent.nix
@@ -33,144 +33,142 @@ in
 
 {
   options = {
-    services.buildkite-agent = {
-      enable = mkEnableOption "buildkite-agent";
+    services.buildkite-agent.enable = mkEnableOption "buildkite-agent";
 
-      package = mkOption {
-        default = pkgs.buildkite-agent;
-        defaultText = "pkgs.buildkite-agent";
-        description = "Which buildkite-agent derivation to use";
-        type = types.package;
-      };
-
-      dataDir = mkOption {
-        default = "/var/lib/buildkite-agent";
-        description = "The workdir for the agent";
-        type = types.str;
-      };
-
-      runtimePackages = mkOption {
-        default = [ pkgs.bash pkgs.nix ];
-        defaultText = "[ pkgs.bash pkgs.nix ]";
-        description = "Add programs to the buildkite-agent environment";
-        type = types.listOf types.package;
-      };
-
-      tokenPath = mkOption {
-        type = types.path;
-        description = ''
-          The token from your Buildkite "Agents" page.
-
-          A run-time path to the token file, which is supposed to be provisioned
-          outside of Nix store.
-        '';
-      };
-
-      name = mkOption {
-        type = types.str;
-        default = "%hostname-%n";
-        description = ''
-          The name of the agent.
-        '';
-      };
-
-      meta-data = mkOption {
-        type = types.str;
-        default = "";
-        example = "queue=default,docker=true,ruby2=true";
-        description = ''
-          Meta data for the agent. This is a comma-separated list of
-          <code>key=value</code> pairs.
-        '';
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        example = "debug=true";
-        description = ''
-          Extra lines to be added verbatim to the configuration file.
-        '';
-      };
-
-      openssh =
-        { privateKeyPath = mkOption {
-            type = types.path;
-            description = ''
-              Private agent key.
-
-              A run-time path to the key file, which is supposed to be provisioned
-              outside of Nix store.
-            '';
-          };
-          publicKeyPath = mkOption {
-            type = types.path;
-            description = ''
-              Public agent key.
-
-              A run-time path to the key file, which is supposed to be provisioned
-              outside of Nix store.
-            '';
-          };
-        };
-
-      hooks = mkHookOptions [
-        { name = "checkout";
-          description = ''
-            The `checkout` hook script will replace the default checkout routine of the
-            bootstrap.sh script. You can use this hook to do your own SCM checkout
-            behaviour
-          ''; }
-        { name = "command";
-          description = ''
-            The `command` hook script will replace the default implementation of running
-            the build command.
-          ''; }
-        { name = "environment";
-          description = ''
-            The `environment` hook will run before all other commands, and can be used
-            to set up secrets, data, etc. Anything exported in hooks will be available
-            to the build script.
-
-            Note: the contents of this file will be copied to the world-readable
-            Nix store.
-          '';
-          example = ''
-            export SECRET_VAR=`head -1 /run/keys/secret`
-          ''; }
-        { name = "post-artifact";
-          description = ''
-            The `post-artifact` hook will run just after artifacts are uploaded
-          ''; }
-        { name = "post-checkout";
-          description = ''
-            The `post-checkout` hook will run after the bootstrap script has checked out
-            your projects source code.
-          ''; }
-        { name = "post-command";
-          description = ''
-            The `post-command` hook will run after the bootstrap script has run your
-            build commands
-          ''; }
-        { name = "pre-artifact";
-          description = ''
-            The `pre-artifact` hook will run just before artifacts are uploaded
-          ''; }
-        { name = "pre-checkout";
-          description = ''
-            The `pre-checkout` hook will run just before your projects source code is
-            checked out from your SCM provider
-          ''; }
-        { name = "pre-command";
-          description = ''
-            The `pre-command` hook will run just before your build command runs
-          ''; }
-        { name = "pre-exit";
-          description = ''
-            The `pre-exit` hook will run just before your build job finishes
-          ''; }
-      ];
+    services.buildkite-agent.package = mkOption {
+      default = pkgs.buildkite-agent;
+      defaultText = "pkgs.buildkite-agent";
+      description = "Which buildkite-agent derivation to use";
+      type = types.package;
     };
+
+    services.buildkite-agent.dataDir = mkOption {
+      default = "/var/lib/buildkite-agent";
+      description = "The workdir for the agent";
+      type = types.str;
+    };
+
+    services.buildkite-agent.runtimePackages = mkOption {
+      default = [ pkgs.bash pkgs.nix ];
+      defaultText = "[ pkgs.bash pkgs.nix ]";
+      description = "Add programs to the buildkite-agent environment";
+      type = types.listOf types.package;
+    };
+
+    services.buildkite-agent.tokenPath = mkOption {
+      type = types.path;
+      description = ''
+        The token from your Buildkite "Agents" page.
+
+        A run-time path to the token file, which is supposed to be provisioned
+        outside of Nix store.
+      '';
+    };
+
+    services.buildkite-agent.name = mkOption {
+      type = types.str;
+      default = "%hostname-%n";
+      description = ''
+        The name of the agent.
+      '';
+    };
+
+    services.buildkite-agent.meta-data = mkOption {
+      type = types.str;
+      default = "";
+      example = "queue=default,docker=true,ruby2=true";
+      description = ''
+        Meta data for the agent. This is a comma-separated list of
+        <code>key=value</code> pairs.
+      '';
+    };
+
+    services.buildkite-agent.extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      example = "debug=true";
+      description = ''
+        Extra lines to be added verbatim to the configuration file.
+      '';
+    };
+
+    services.buildkite-agent.openssh =
+      { privateKeyPath = mkOption {
+          type = types.path;
+          description = ''
+            Private agent key.
+
+            A run-time path to the key file, which is supposed to be provisioned
+            outside of Nix store.
+          '';
+        };
+        publicKeyPath = mkOption {
+          type = types.path;
+          description = ''
+            Public agent key.
+
+            A run-time path to the key file, which is supposed to be provisioned
+            outside of Nix store.
+          '';
+        };
+      };
+
+    services.buildkite-agent.hooks = mkHookOptions [
+      { name = "checkout";
+        description = ''
+          The `checkout` hook script will replace the default checkout routine of the
+          bootstrap.sh script. You can use this hook to do your own SCM checkout
+          behaviour
+        ''; }
+      { name = "command";
+        description = ''
+          The `command` hook script will replace the default implementation of running
+          the build command.
+        ''; }
+      { name = "environment";
+        description = ''
+          The `environment` hook will run before all other commands, and can be used
+          to set up secrets, data, etc. Anything exported in hooks will be available
+          to the build script.
+
+          Note: the contents of this file will be copied to the world-readable
+          Nix store.
+        '';
+        example = ''
+          export SECRET_VAR=`head -1 /run/keys/secret`
+        ''; }
+      { name = "post-artifact";
+        description = ''
+          The `post-artifact` hook will run just after artifacts are uploaded
+        ''; }
+      { name = "post-checkout";
+        description = ''
+          The `post-checkout` hook will run after the bootstrap script has checked out
+          your projects source code.
+        ''; }
+      { name = "post-command";
+        description = ''
+          The `post-command` hook will run after the bootstrap script has run your
+          build commands
+        ''; }
+      { name = "pre-artifact";
+        description = ''
+          The `pre-artifact` hook will run just before artifacts are uploaded
+        ''; }
+      { name = "pre-checkout";
+        description = ''
+          The `pre-checkout` hook will run just before your projects source code is
+          checked out from your SCM provider
+        ''; }
+      { name = "pre-command";
+        description = ''
+          The `pre-command` hook will run just before your build command runs
+        ''; }
+      { name = "pre-exit";
+        description = ''
+          The `pre-exit` hook will run just before your build job finishes
+        ''; }
+    ];
   };
 
   config = mkIf config.services.buildkite-agent.enable {
@@ -178,25 +176,21 @@ in
       { name = "buildkite-agent";
         home = cfg.dataDir;
         description = "Buildkite agent user";
-        uid = 532;
-        gid = 532;
       };
     users.groups.buildkite-agent =
       { name = "buildkite-agent";
         description = "Buildkite agent user group";
-        gid = 532;
       };
 
     environment.systemPackages = [ cfg.package ];
 
     launchd.daemons.buildkite-agent =
       {
-        path = cfg.runtimePackages ++ [ pkgs.coreutils cfg.package ];
+        path = cfg.runtimePackages ++ [ pkgs.coreutils pkgs.darwin.DarwinTools cfg.package ];
         environment = {
           HOME = cfg.dataDir;
-          NIX_REMOTE = "daemon";
           NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-        };
+        } // (if config.nix.useDaemon then { NIX_REMOTE = "daemon"; } else {});
 
         ## NB: maximum care is taken so that secrets (ssh keys and the CI token)
         ##     don't end up in the Nix store.
@@ -222,20 +216,21 @@ in
             chmod 750 "${cfg.dataDir}"
             chmod 640 "${cfg.dataDir}/buildkite-agent.cfg"
 
-            # Make /usr/bin/sw_vers accessible
-            export PATH=$PATH:/usr/bin
-
-            exec buildkite-agent start --config /var/lib/buildkite-agent/buildkite-agent.cfg
+            exec buildkite-agent start --config "${cfg.dataDir}/buildkite-agent.cfg"
           '';
 
-        serviceConfig.KeepAlive = true;
-        serviceConfig.RunAtLoad = true;
+        serviceConfig = {
+          KeepAlive = true;
+          RunAtLoad = true;
+          ProcessType = "Interactive";
+          ThrottleInterval = 30;
 
-        serviceConfig.GroupName = "buildkite-agent";
-        serviceConfig.UserName = "buildkite-agent";
-        serviceConfig.WorkingDirectory = config.users.users.buildkite-agent.home;
-        serviceConfig.StandardErrorPath = "${cfg.dataDir}/buildkite-agent.log";
-        serviceConfig.StandardOutPath = "${cfg.dataDir}/buildkite-agent.log";
+          GroupName = "buildkite-agent";
+          UserName = "buildkite-agent";
+          WorkingDirectory = config.users.users.buildkite-agent.home;
+          StandardErrorPath = "${cfg.dataDir}/buildkite-agent.log";
+          StandardOutPath = "${cfg.dataDir}/buildkite-agent.log";
+        };
       };
   };
 }