summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--darwinConfigurations/mairon/default.nix2
-rw-r--r--flake.lock52
-rw-r--r--lib/my.nix7
-rw-r--r--modules/common/profiles/email.nix12
-rw-r--r--modules/common/profiles/headful.nix1
-rw-r--r--modules/nixos/git/default.nix5
-rw-r--r--modules/nixos/libvirtd.nix4
-rw-r--r--modules/nixos/monitoring/dashboards/endlessh.json16
-rw-r--r--modules/nixos/monitoring/dashboards/nginx.json4
-rw-r--r--modules/nixos/monitoring/dashboards/node.json4
-rw-r--r--modules/nixos/monitoring/dashboards/ntfy.json4
-rw-r--r--modules/nixos/monitoring/dashboards/postgresql.json4
-rw-r--r--modules/nixos/monitoring/dashboards/redis-streaming.json2
-rw-r--r--modules/nixos/monitoring/dashboards/redis.json2
-rw-r--r--modules/nixos/monitoring/dashboards/unbound.json2
-rw-r--r--modules/nixos/monitoring/rules/node.yaml2
-rw-r--r--modules/nixos/profiles/headful.nix2
-rw-r--r--nixosConfigurations/iso/default.nix3
18 files changed, 69 insertions, 59 deletions
diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix
index bbc31eb..131cf7d 100644
--- a/darwinConfigurations/mairon/default.nix
+++ b/darwinConfigurations/mairon/default.nix
@@ -4,8 +4,6 @@
...
}:
with lib; {
- nixfiles.modules.vscode.enable = true;
-
# TODO Make this per-directory/per-remote.
hm.programs.git = {
userName = mkForce "Firstname Lastname";
diff --git a/flake.lock b/flake.lock
index 602be95..bfb1caa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -124,11 +124,11 @@
]
},
"locked": {
- "lastModified": 1689116343,
- "narHash": "sha256-eaYfwQTSEbuB7rs5/W227SbVeDP9cbcoT1TEbnmOgOk=",
+ "lastModified": 1689281837,
+ "narHash": "sha256-msgwgot2/hxXzlpYltIZ7boAqBkN8XejNOhBJ07q3FY=",
"owner": "LnL7",
"repo": "nix-darwin",
- "rev": "eb22022ba8faeeb7a9be8afe925511b88ad12ca5",
+ "rev": "c806a73609e77f0c446fdad5d3ea6ca3b7ae6e5f",
"type": "github"
},
"original": {
@@ -323,11 +323,11 @@
]
},
"locked": {
- "lastModified": 1689126991,
- "narHash": "sha256-DKySsOJNYDIp9va4aMn5RMFBwY4aTEm6X54DDK3d7h8=",
+ "lastModified": 1689299971,
+ "narHash": "sha256-9MCY86aE1GbcWmKWQf+KE/6i6iTKSgyXLlOo/nRhGPk=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
- "rev": "716d9925ee8690b957a6b8f00a6f5ebc3d571105",
+ "rev": "af65261d39bcef245e0bedcf3bbf59d8974ea301",
"type": "github"
},
"original": {
@@ -350,11 +350,11 @@
]
},
"locked": {
- "lastModified": 1689127063,
- "narHash": "sha256-GlKfeLEmlllLNVSkWM7nDdcFdS9vRJejf1gzUQpeEDc=",
+ "lastModified": 1689299928,
+ "narHash": "sha256-qArmf72ZT8ug+HfRYKXdCHXf3iptrpxOtD4Yid/OsYY=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
- "rev": "d7275aeeb705a5a31e24f048657792d521db4225",
+ "rev": "a8ff4484ea0f3737f3ce5d0602459c8e7631118a",
"type": "github"
},
"original": {
@@ -366,11 +366,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1689060619,
+ "lastModified": 1689320556,
"narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "44bc025007e5fcc10dbc3d9f96dcbf06fc0e8c1c",
+ "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
"type": "github"
},
"original": {
@@ -382,11 +382,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1689078114,
- "narHash": "sha256-osG8BrX5RpKJ7wH+vI6auOU+ctvNOblT4XXCgknK47c=",
+ "lastModified": 1689261696,
+ "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b6cc7ff8fee93789bc871a267ab876c3fca042cb",
+ "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
"type": "github"
},
"original": {
@@ -398,11 +398,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1689150988,
- "narHash": "sha256-Ue5BvtYYszqzX4ONWjgj6pnazCbOzdRBfLIx8l1Wa1w=",
+ "lastModified": 1689331843,
+ "narHash": "sha256-EX6AHxH6bX1QM2x8aWecM44mbmz67fAtUJPYSl9QKBA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "bec27fabee7ff51a4788840479b1730ed1b64427",
+ "rev": "da56af6c22e57e01d5b2e09ac6a8240e2909d556",
"type": "github"
},
"original": {
@@ -414,11 +414,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1689148961,
- "narHash": "sha256-CuJAQSeYmTS+6ZzOxvYnzDlv75WdtNgTwskS/4SbHrI=",
+ "lastModified": 1689326639,
+ "narHash": "sha256-79zi0t83Dcc2dE0NuYZ+2hqtKXZN1yWVq5mtx8D2d7Y=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c40b900d12dd5523245317a8d4fef4a133ea68cb",
+ "rev": "9fdfaeb7b96f05e869f838c73cde8d98c640c649",
"type": "github"
},
"original": {
@@ -464,11 +464,11 @@
},
"nur": {
"locked": {
- "lastModified": 1689151250,
- "narHash": "sha256-9MCb8HVx48LTJUu3XvQPVodS+f9VjmGnUqhSPbwBat8=",
+ "lastModified": 1689328451,
+ "narHash": "sha256-WWJXUi3mT05cNBQ9YwLO/AqWyaTOxmHEp7EdJlkioM4=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "3187484684e41a55227f9a886bfb6239d76fe5df",
+ "rev": "1839d2b991671f63666cdb0716875a2dd8ba4a46",
"type": "github"
},
"original": {
@@ -528,11 +528,11 @@
]
},
"locked": {
- "lastModified": 1688596063,
- "narHash": "sha256-9t7RxBiKWHygsqXtiNATTJt4lim/oSYZV3RG8OjDDng=",
+ "lastModified": 1689328505,
+ "narHash": "sha256-9B3+OeUn1a/CvzE3GW6nWNwS5J7PDHTyHGlpL3wV5oA=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "c8d18ba345730019c3faf412c96a045ade171895",
+ "rev": "5e28316db471d1ac234beb70031b635437421dd6",
"type": "github"
},
"original": {
diff --git a/lib/my.nix b/lib/my.nix
index a7f65ec..95b89cf 100644
--- a/lib/my.nix
+++ b/lib/my.nix
@@ -25,12 +25,7 @@ with lib;
system = mkOption {
description = "The machine's system.";
- type = nullOr (enum [
- "aarch64-darwin"
- "aarch64-linux"
- "x86_64-darwin"
- "x86_64-linux"
- ]);
+ type = nullOr (enum platforms.all);
default = null;
};
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;
diff --git a/nixosConfigurations/iso/default.nix b/nixosConfigurations/iso/default.nix
index d491bb8..9a326a3 100644
--- a/nixosConfigurations/iso/default.nix
+++ b/nixosConfigurations/iso/default.nix
@@ -5,6 +5,7 @@ with lib; {
nixfiles.modules = {
common.networking.onlyDefault = true;
git.client.enable = true;
+ gnupg.enable = true;
openssh = {
client.enable = true;
server = {
@@ -14,6 +15,8 @@ with lib; {
};
};
+ hm.programs.git.signing.signByDefault = mkForce false;
+
programs.mtr.enable = true;
services.getty.autologinUser = mkForce my.username;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 00:52:57 +0000