2023-07-15

14 files changed, 39 insertions, 25 deletions

diff --git a/modules/common/profiles/email.nix b/modules/common/profiles/email.nix
index 9cc12d7..744d656 100644
--- a/modules/common/profiles/email.nix
+++ b/modules/common/profiles/email.nix
@@ -46,10 +46,16 @@ in {
             assert (builtins.isInt line);
               concatStringsSep " " (
                 [
-                  "${config.hm.programs.password-store.package}/bin/pass show ${path}"
+                  "${config.hm.programs.password-store.package}/bin/pass"
+                  "show"
+                  path
+                ]
+                ++ optionals (line > 0) [
+                  "|"
+                  "${pkgs.gnused}/bin/sed"
+                  "-e"
+                  "'${toString line}!d'"
                 ]
-                ++ optional (line > 0)
-                "| ${pkgs.gnused}/bin/sed -e '${toString line}!d'"
               );
         in rec {
           shire = mkAccount rec {
diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index 968b287..a1bb7d6 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -21,6 +21,7 @@ in {
       mpv.enable = true;
       openssh.client.enable = true;
       password-store.enable = true;
+      vscode.enable = true;
     };
 
     hm = {
diff --git a/modules/nixos/git/default.nix b/modules/nixos/git/default.nix
index 9236437..5fe4391 100644
--- a/modules/nixos/git/default.nix
+++ b/modules/nixos/git/default.nix
@@ -72,6 +72,11 @@ in {
             fastcgi_param PATH_INFO $uri;
             fastcgi_param QUERY_STRING $args;
             fastcgi_param HTTP_HOST $server_name;
+
+            # This makes `go get ...` work.
+            sub_filter '</head>'
+                '<meta name="go-import" content="$host$uri git https://$host$uri"></head>';
+            sub_filter_once on;
           '';
           "~* ^.+(cgit.css|robots.txt)$".extraConfig = ''
             root ${cfg.server.package}/cgit;
diff --git a/modules/nixos/libvirtd.nix b/modules/nixos/libvirtd.nix
index a246c98..e1a0b5b 100644
--- a/modules/nixos/libvirtd.nix
+++ b/modules/nixos/libvirtd.nix
@@ -39,8 +39,8 @@ in {
         };
 
         swtpm = {
-          enable = false; # Is this required for Windows 11?
-          package = pkgs.swtpm-tpm2;
+          enable = true;
+          package = pkgs.swtpm;
         };
       };
     };
diff --git a/modules/nixos/monitoring/dashboards/endlessh.json b/modules/nixos/monitoring/dashboards/endlessh.json
index 470d5c4..7af5595 100644
--- a/modules/nixos/monitoring/dashboards/endlessh.json
+++ b/modules/nixos/monitoring/dashboards/endlessh.json
@@ -75,7 +75,6 @@
         "text": {},
         "textMode": "auto"
       },
-      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
@@ -199,7 +198,7 @@
         "text": {},
         "textMode": "auto"
       },
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "10.0.1",
       "targets": [
         {
           "datasource": {
@@ -324,7 +323,7 @@
         "text": {},
         "textMode": "auto"
       },
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "10.0.1",
       "targets": [
         {
           "datasource": {
@@ -387,7 +386,7 @@
         "text": {},
         "textMode": "auto"
       },
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "10.0.1",
       "targets": [
         {
           "datasource": {
@@ -500,7 +499,7 @@
         "text": {},
         "textMode": "value"
       },
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "10.0.1",
       "targets": [
         {
           "datasource": {
@@ -644,7 +643,7 @@
         "text": {},
         "textMode": "auto"
       },
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "10.0.1",
       "targets": [
         {
           "datasource": {
@@ -988,7 +987,7 @@
           "zoom": 1
         }
       },
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "10.0.1",
       "targets": [
         {
           "datasource": {
@@ -1161,6 +1160,7 @@
       },
       "id": 49,
       "options": {
+        "cellHeight": "sm",
         "footer": {
           "countRows": false,
           "fields": "",
@@ -1178,7 +1178,7 @@
           }
         ]
       },
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "10.0.1",
       "targets": [
         {
           "datasource": {
diff --git a/modules/nixos/monitoring/dashboards/nginx.json b/modules/nixos/monitoring/dashboards/nginx.json
index 2f0c25f..740ba80 100644
--- a/modules/nixos/monitoring/dashboards/nginx.json
+++ b/modules/nixos/monitoring/dashboards/nginx.json
@@ -22,7 +22,7 @@
     ]
   },
   "description": "",
-  "editable": true,
+  "editable": false,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
   "id": 65,
@@ -579,4 +579,4 @@
   "uid": "MsjffzSZz",
   "version": 2,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/monitoring/dashboards/node.json b/modules/nixos/monitoring/dashboards/node.json
index bb67237..35d445d 100644
--- a/modules/nixos/monitoring/dashboards/node.json
+++ b/modules/nixos/monitoring/dashboards/node.json
@@ -22,7 +22,7 @@
       }
     ]
   },
-  "editable": true,
+  "editable": false,
   "fiscalYearStartMonth": 0,
   "gnetId": 1860,
   "graphTooltip": 1,
@@ -23126,4 +23126,4 @@
   "uid": "rYdddlPWj",
   "version": 4,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/monitoring/dashboards/ntfy.json b/modules/nixos/monitoring/dashboards/ntfy.json
index fd02a2e..9bf068d 100644
--- a/modules/nixos/monitoring/dashboards/ntfy.json
+++ b/modules/nixos/monitoring/dashboards/ntfy.json
@@ -21,7 +21,7 @@
       }
     ]
   },
-  "editable": true,
+  "editable": false,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
   "id": 75,
@@ -2359,4 +2359,4 @@
   "uid": "TO6HgexVz",
   "version": 2,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/monitoring/dashboards/postgresql.json b/modules/nixos/monitoring/dashboards/postgresql.json
index be5684e..3e76126 100644
--- a/modules/nixos/monitoring/dashboards/postgresql.json
+++ b/modules/nixos/monitoring/dashboards/postgresql.json
@@ -22,7 +22,7 @@
     ]
   },
   "description": "",
-  "editable": true,
+  "editable": false,
   "fiscalYearStartMonth": 0,
   "gnetId": 9628,
   "graphTooltip": 0,
@@ -3255,4 +3255,4 @@
   "uid": "000000039",
   "version": 2,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/monitoring/dashboards/redis-streaming.json b/modules/nixos/monitoring/dashboards/redis-streaming.json
index a107744..87d9f78 100644
--- a/modules/nixos/monitoring/dashboards/redis-streaming.json
+++ b/modules/nixos/monitoring/dashboards/redis-streaming.json
@@ -21,7 +21,7 @@
       }
     ]
   },
-  "editable": true,
+  "editable": false,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
   "id": 64,
diff --git a/modules/nixos/monitoring/dashboards/redis.json b/modules/nixos/monitoring/dashboards/redis.json
index ea25d00..f0f7055 100644
--- a/modules/nixos/monitoring/dashboards/redis.json
+++ b/modules/nixos/monitoring/dashboards/redis.json
@@ -22,7 +22,7 @@
     ]
   },
   "description": "",
-  "editable": true,
+  "editable": false,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
   "id": 63,
diff --git a/modules/nixos/monitoring/dashboards/unbound.json b/modules/nixos/monitoring/dashboards/unbound.json
index a822328..895a67f 100644
--- a/modules/nixos/monitoring/dashboards/unbound.json
+++ b/modules/nixos/monitoring/dashboards/unbound.json
@@ -22,7 +22,7 @@
     ]
   },
   "description": "",
-  "editable": true,
+  "editable": false,
   "fiscalYearStartMonth": 0,
   "gnetId": 11705,
   "graphTooltip": 0,
diff --git a/modules/nixos/monitoring/rules/node.yaml b/modules/nixos/monitoring/rules/node.yaml
index eee5939..a9b6b79 100644
--- a/modules/nixos/monitoring/rules/node.yaml
+++ b/modules/nixos/monitoring/rules/node.yaml
@@ -226,7 +226,7 @@ groups:
           sum by (instance)
             (avg by (mode, instance)
               (rate(node_cpu_seconds_total{mode!="idle"}[2m])))
-          > 0.8
+          > 2.0
         for: 0m
         labels:
           severity: warning
diff --git a/modules/nixos/profiles/headful.nix b/modules/nixos/profiles/headful.nix
index 9e2b7a3..795c4c3 100644
--- a/modules/nixos/profiles/headful.nix
+++ b/modules/nixos/profiles/headful.nix
@@ -41,6 +41,8 @@ in {
           };
           settings = {
             "app.update.auto" = false;
+            "browser.display.document_color_use" = 2;
+            "browser.display.use_system_colors" = true;
             "browser.search.region" = "US";
             "browser.search.update" = false;
             "datareporting.healthreport.uploadEnabled" = false;