nix/base-system/.zshrc

@@ -14,9 +14,6 @@ if [ -f "$HOME/Library/Application Support/dnvm/env" ]; then
 fi
 
 function service_restart() {
-	launchctl kickstart -k -p $1
-}
-
-function root_shell() {
-    sudo -E zsh -i /etc/zshrc
+	launchctl stop $1
+	launchctl start $1
 }

nix/base-system/darwin-configuration.nix

@@ -145,16 +145,6 @@
                                 yaxis = "y1";
                             };
                         }
-                        {
-                            source = "http://${config.services.prometheus.listen}";
-                            query = ''
-                                delta(ping_counter{result="dropped"}[5m])
-                            '';
-                            config = {
-                                name_format = "`icmp \${labels.domain} drop count`";
-                                yaxis = "y1";
-                            };
-                        }
                     ];
                 }
                 {
@@ -200,7 +190,6 @@
         data_dir = "/var/lib/vector";
         api = {
             enabled = true;
-            address = "127.0.0.1:8686";
         };
         sources = {
             prometheus = {

nix/base-system/flake.nix

@@ -278,6 +278,8 @@ EOF";
           };
         };
         environment.systemPackages = (with pkgs; [
+            # TODO(jwall): This appears to be broken due to: https://github.com/NixOS/nixpkgs/issues/166205
+            # Should be fixed by: https://github.com/NixOS/nixpkgs/pull/282624
             isabelle
             lean4
             terraform # TODO(jeremy): Replace with opentofu when that is an option.
@@ -285,7 +287,7 @@ EOF";
             oha
             nodejs
             gnumake
-            # TODO(zaphar): find a version of the julia package that will install
+            # TODO find a version of the julia package that will install
             # on darwin and add it as an overlay
             python310
             python310Packages.pip

nix/base-system/modules/vector.nix

@@ -28,14 +28,8 @@ with lib;
         
         launchd.daemons.vector = mkIf config.services.vector.enable {
             serviceConfig = {
+                Program = "${pkgs.vector}/bin/vector";
                 ProgramArguments = [
-                    "${pkgs.clio}/bin/clio"
-                    "--out-path=${config.services.vector.stdoutPath}"
-                    "--err-path=${config.services.vector.stdoutPath}"
-                    "--pid-file=${config.services.vector.pidPath}"
-                    "--paranoid"
-                    "--"
-                    "${pkgs.vector}/bin/vector"
                     "--verbose"
                     "--watch-config"
                     "--config=/etc/${config.environment.etc."vector.yaml".target}"