From 1ab58786d83d1877fc3a0ca02b2d0252b40c1a6b Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Thu, 3 Aug 2023 12:13:18 -0700
Subject: [PATCH] Changes from this week

---
 flake.lock                                 | 28 +++++++++++++---------
 flake.nix                                  |  2 +-
 nixos/common/autoupgrade.nix               |  2 +-
 nixos/roles/monitoring-server/telegraf.nix | 21 +++++++++++++++-
 systems/sumireko.nix                       | 14 ++++++++---
 systems/yukari.nix                         |  6 +++++
 6 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 93432a94..8a32d74d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,14 +32,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1689796386,
-        "narHash": "sha256-1N6sWf7E2EdknkzKdzRi6blonUbawJRiGl4p8gkxnk8=",
+        "lastModified": 1691089847,
+        "narHash": "sha256-1/jsJhFX8l5sR8NMoMWqNDVPOlslMqrWwrmXfah3kOM=",
+        "ref": "refs/heads/main",
+        "rev": "7b74f10372b63170b1319ec8382a41865a75e072",
+        "revCount": 170,
         "type": "git",
-        "url": "file:///Users/kat/src/work/metaflow-cli-plugin"
+        "url": "ssh://git@github.com/Glamorous-ai/metaflow-cli-plugin.git"
       },
       "original": {
         "type": "git",
-        "url": "file:///Users/kat/src/work/metaflow-cli-plugin"
+        "url": "ssh://git@github.com/Glamorous-ai/metaflow-cli-plugin.git"
       }
     },
     "artemiscore": {
@@ -58,14 +61,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1689789723,
-        "narHash": "sha256-kJq+dHavgi8FBZzF9Uoezx6Tw9scbjWsyBE+DoT6mxg=",
+        "lastModified": 1690988988,
+        "narHash": "sha256-PIv20oUK48yKHSal8jMFQuxu6XwVdE8iO8r8xy8d7A0=",
+        "ref": "refs/heads/main",
+        "rev": "e8afcdecfd6e467cc65a9f9f9286be33e8271c9f",
+        "revCount": 94,
         "type": "git",
-        "url": "file:///Users/kat/src/work/metaflow-core-plugin"
+        "url": "ssh://git@github.com/Glamorous-ai/metaflow-core-plugin.git"
       },
       "original": {
         "type": "git",
-        "url": "file:///Users/kat/src/work/metaflow-core-plugin"
+        "url": "ssh://git@github.com/Glamorous-ai/metaflow-core-plugin.git"
       }
     },
     "darwin": {
@@ -197,11 +203,11 @@
         "rust": "rust"
       },
       "locked": {
-        "lastModified": 1690746910,
-        "narHash": "sha256-ouCKyuyjs9+oSrOpIBlVi6R5LLAu+kBORdEaCuDQxwM=",
+        "lastModified": 1690751203,
+        "narHash": "sha256-RzE328E4rrA3YE8UEj9RhDVzdJxGa10S2VyL33LK6GU=",
         "owner": "kittywitch",
         "repo": "konawall-rs",
-        "rev": "17fc3098ffd993e4d1820da72b0866390484161b",
+        "rev": "385f55853f18c95fff3ea610d3c3c6ea3040f1c4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index df749d74..bd483ede 100644
--- a/flake.nix
+++ b/flake.nix
@@ -109,7 +109,7 @@
       flake = false;
     };
     artemiscli = {
-      url = "/Users/kat/src/work/metaflow-cli-plugin";
+      url = "git+ssh://git@github.com/Glamorous-ai/metaflow-cli-plugin.git";
       inputs = {
         flake-utils.follows = "utils";
         nixpkgs.follows = "nixpkgs";
diff --git a/nixos/common/autoupgrade.nix b/nixos/common/autoupgrade.nix
index 2a940196..41d58fcf 100644
--- a/nixos/common/autoupgrade.nix
+++ b/nixos/common/autoupgrade.nix
@@ -1,6 +1,6 @@
 {config, ...}: {
   system.autoUpgrade = {
     enable = true;
-    flake = "github:kittywitch/kittywitch#${config.networking.hostName}";
+    flake = "github:kittywitch/infrastructure#${config.networking.hostName}";
   };
 }
diff --git a/nixos/roles/monitoring-server/telegraf.nix b/nixos/roles/monitoring-server/telegraf.nix
index ed02cdb7..2989affb 100644
--- a/nixos/roles/monitoring-server/telegraf.nix
+++ b/nixos/roles/monitoring-server/telegraf.nix
@@ -4,7 +4,16 @@
       "nginx"
     ];
   };
-
+  systemd.services.telegraf = {
+    serviceConfig = {
+      AmbientCapabilities = [
+        "CAP_NET_RAW"
+      ];
+      CapabilityBoundingSet = [
+        "CAP_NET_RAW"
+      ];
+    };
+  };
   services.telegraf = {
     enable = true;
     extraConfig = {
@@ -38,6 +47,16 @@
         };
         mem = {
         };
+        ping = {
+          interval = "60s";
+          method = "native";
+          urls = [
+            "8.8.8.8"
+            "2001:4860:4860:0:0:0:0:8888"
+          ];
+          count = 3;
+          timeout = 2.0;
+        };
         system = {
         };
       };
diff --git a/systems/sumireko.nix b/systems/sumireko.nix
index 1def27e6..08919ede 100644
--- a/systems/sumireko.nix
+++ b/systems/sumireko.nix
@@ -64,15 +64,21 @@ _: let
     ];
 
     home-manager.users.kat = {
+      home.sessionVariables = {
+        ARTEMISCLI_CONFIG_PATH = "/Users/kat/.artemisconfig";
+      };
       services.konawall = {
         enable = true;
         interval_macos = 3600;
         mode = "shuffle";
         commonTags = ["width:>=1600"];
         tagList = [
-          "score:>=50"
-          #"no_humans"
-          "rating:s"
+          [
+            "score:>=50"
+            #"no_humans"
+            "touhou"
+            "rating:s"
+          ]
         ];
       };
       home.file.".orbstack/ssh/authorized_keys".text =
@@ -115,6 +121,7 @@ _: let
       casks = [
         "barrier"
         "bitwarden"
+        "mullvadvpn"
         "firefox"
         "disk-inventory-x"
         "dozer"
@@ -125,6 +132,7 @@ _: let
         "element"
         "slack"
         "boop"
+        "iterm2"
         "obsidian"
         "contexts"
         "rectangle"
diff --git a/systems/yukari.nix b/systems/yukari.nix
index bacab290..62190196 100644
--- a/systems/yukari.nix
+++ b/systems/yukari.nix
@@ -42,6 +42,12 @@ _: let
     swapDevices = [];
 
     networking = {
+      nameservers = [
+        "1.1.1.1"
+        "1.0.0.1"
+        "2606:4700:4700::1111"
+        "2606:4700:4700::1001"
+      ];
       hostName = "yukari";
       domain = "gensokyo.zone";
       interfaces = {