diff --git a/flake.lock b/flake.lock
index 25b04ac..03a66d4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -132,11 +132,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1769090713,
- "narHash": "sha256-g2USTwAmgSRvA1SxIJtoreSxQzGyv8zM+DTjMiVgHnE=",
+ "lastModified": 1770886893,
+ "narHash": "sha256-efepRsi7RtajoLfMMe8GPqY+zkCIyE0X5ir6mtJ2zjY=",
"owner": "famedly",
"repo": "conduit",
- "rev": "98e2bedaaf080eaaa9867dab0371d2c9adb3da97",
+ "rev": "d058dab7aa5e9e41ef7cbab14f6ef030486f3ca8",
"type": "gitlab"
},
"original": {
@@ -222,11 +222,11 @@
]
},
"locked": {
- "lastModified": 1770065450,
- "narHash": "sha256-2GqfJMgRuUM63h6GlhSm7jBuBNtIjYLWBffv+/8HasY=",
+ "lastModified": 1770652268,
+ "narHash": "sha256-G8O+y6AIEwqIQm5cNTWxIeayYFlLyULJIzI7aFBleJ0=",
"owner": "unmojang",
"repo": "drasl",
- "rev": "114c929fceb89992026b40b43d25025e2f69db98",
+ "rev": "37d684402e8bda8b2b091912c7dc2f17935a2e30",
"type": "github"
},
"original": {
@@ -300,11 +300,11 @@
"ffmpegSrc": {
"flake": false,
"locked": {
- "lastModified": 1770240362,
- "narHash": "sha256-ekQJv10lzOkjReTysSBkGr5HuUeRQin3EpF4xM+ia7s=",
+ "lastModified": 1771616116,
+ "narHash": "sha256-HTeR+ZE/1lVC+us+EB2j0M7ERgJDb+XgqWzYfwMwLTQ=",
"ref": "refs/heads/master",
- "rev": "e48eaa8c6211069454b054e0cad4f8270fb563cc",
- "revCount": 122645,
+ "rev": "f951aa9ef382d6bb517e05d04d52710f751de427",
+ "revCount": 122920,
"type": "git",
"url": "https://git.ffmpeg.org/ffmpeg.git"
},
@@ -621,11 +621,11 @@
]
},
"locked": {
- "lastModified": 1769069492,
- "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
+ "lastModified": 1770726378,
+ "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
+ "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
"type": "github"
},
"original": {
@@ -710,11 +710,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1770164260,
- "narHash": "sha256-mQgOAYWlVJyuyXjZN6yxqXWyODvQI5P/UZUCU7IOuYo=",
+ "lastModified": 1771625283,
+ "narHash": "sha256-1T88/PSNKpRNtaiXATTae0hpRnBpjmIL0b1QfGO6HBA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "4fda26500b4539e0a1e3afba9f0e1616bdad4f85",
+ "rev": "a913ae61bf3b9f4312f6097b68cdf0a0fa699279",
"type": "github"
},
"original": {
@@ -1010,11 +1010,11 @@
"lix": {
"flake": false,
"locked": {
- "lastModified": 1770244550,
- "narHash": "sha256-xy4VqEXytC5V+/juIcjGgsmBWOyxsiYycuO5FjlYPvw=",
- "rev": "ba4f4f917a5989205443b581917e046b5da2ba12",
+ "lastModified": 1771536419,
+ "narHash": "sha256-FNho4IRk5RrjN1Bqbx/K1h9HW2QDvvzgj4XO43uQHkM=",
+ "rev": "c040a9d8e47f254f988a74616bca48b335704f12",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ba4f4f917a5989205443b581917e046b5da2ba12.tar.gz?rev=ba4f4f917a5989205443b581917e046b5da2ba12"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c040a9d8e47f254f988a74616bca48b335704f12.tar.gz?rev=c040a9d8e47f254f988a74616bca48b335704f12"
},
"original": {
"type": "tarball",
@@ -1047,11 +1047,11 @@
"matrixSpecSrc": {
"flake": false,
"locked": {
- "lastModified": 1770229815,
- "narHash": "sha256-F4jitTEjB0Pl4cZ06NwMs3S9sgV5gzc3Bi+enxoiYrk=",
+ "lastModified": 1771595517,
+ "narHash": "sha256-Dq5vaRGemkQu2NcIUV7b7SbtDm7jM7gy/B0eCgghSkU=",
"owner": "matrix-org",
"repo": "matrix-spec",
- "rev": "a6da9443da73518a83617696dd3ba7d7d3897a1b",
+ "rev": "f62aa09e607acfff13cbfa4e68c01d9ac9bddb76",
"type": "github"
},
"original": {
@@ -1064,11 +1064,11 @@
"mtxclientSrc": {
"flake": false,
"locked": {
- "lastModified": 1758395358,
- "narHash": "sha256-zxpvRDKpp8sWSmf/xLgoHDWMzmdkQenZepXg+CoGtcg=",
+ "lastModified": 1771547396,
+ "narHash": "sha256-kbS0Z0AuALf5I7OCqTF6snV5cX2HB1d16CB3agNtxCg=",
"owner": "Nheko-reborn",
"repo": "mtxclient",
- "rev": "d6f10427d1c5e5b1a45f426274f8d2e8dd0b64be",
+ "rev": "873911e352a0845dfb178f77b1ddea796a5d3455",
"type": "github"
},
"original": {
@@ -1081,11 +1081,11 @@
"nhekoSrc": {
"flake": false,
"locked": {
- "lastModified": 1769335360,
- "narHash": "sha256-fAD/osAnZpm/K5/iqgnLJh7rVkR4BPXlSxSqI2t/Nn4=",
+ "lastModified": 1771605900,
+ "narHash": "sha256-j+8jOl/MG5scq2dxXLuDG0XEbEplEwUr/wFytDDsmIg=",
"owner": "Nheko-reborn",
"repo": "nheko",
- "rev": "9650c5f4be1ca9ed91de8cb9ccda445647ba4854",
+ "rev": "014d70fd64b2eb0e9d5c3c0b6cb0815673db8c71",
"type": "github"
},
"original": {
@@ -1177,11 +1177,11 @@
"systems": "systems_7"
},
"locked": {
- "lastModified": 1769853456,
- "narHash": "sha256-8h3p12GjiDOP7YDVS5Gx/bqjPQL4tFdDr90Ki7Qtglw=",
+ "lastModified": 1771066195,
+ "narHash": "sha256-Gp0Y18KDirF4rlvJa4B4Gw3YpwOa3X+lOoanJNTkcMM=",
"owner": "nix-community",
"repo": "nix-jetbrains-plugins",
- "rev": "1d496fa90ada916bd926228131f8ad04d7a854aa",
+ "rev": "ca725b8d62e618e040a478262ac312019ba63303",
"type": "github"
},
"original": {
@@ -1208,11 +1208,11 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1770256067,
- "narHash": "sha256-+vFq+X801NIy2NDKJVKPUTqz76RRtRjsdF09pC/pBks=",
+ "lastModified": 1771626673,
+ "narHash": "sha256-6WfepHZmH2/FAizP2BsSf1433a3TBNCQnKY1C7/EkVk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a9a996ba9dc042f5a23fc8f85260241cae875043",
+ "rev": "2e642b6926edfdee3d21a9f62e987bc263ee8108",
"type": "github"
},
"original": {
@@ -1224,11 +1224,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1770256067,
- "narHash": "sha256-+vFq+X801NIy2NDKJVKPUTqz76RRtRjsdF09pC/pBks=",
+ "lastModified": 1771626673,
+ "narHash": "sha256-6WfepHZmH2/FAizP2BsSf1433a3TBNCQnKY1C7/EkVk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a9a996ba9dc042f5a23fc8f85260241cae875043",
+ "rev": "2e642b6926edfdee3d21a9f62e987bc263ee8108",
"type": "github"
},
"original": {
@@ -1304,11 +1304,11 @@
},
"nixpkgs_11": {
"locked": {
- "lastModified": 1769740369,
- "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=",
+ "lastModified": 1770843696,
+ "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a",
+ "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16",
"type": "github"
},
"original": {
@@ -1400,11 +1400,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1769018530,
- "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+ "lastModified": 1770841267,
+ "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+ "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
"type": "github"
},
"original": {
@@ -1448,11 +1448,11 @@
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1770181073,
- "narHash": "sha256-ksTL7P9QC1WfZasNlaAdLOzqD8x5EPyods69YBqxSfk=",
+ "lastModified": 1771369470,
+ "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "bf922a59c5c9998a6584645f7d0de689512e444c",
+ "rev": "0182a361324364ae3f436a63005877674cf45efb",
"type": "github"
},
"original": {
@@ -1471,11 +1471,11 @@
]
},
"locked": {
- "lastModified": 1769749396,
- "narHash": "sha256-eJ6O+Lxzn//+u4Q76cuAvTvqLkBNgA0E8UtGNn+E9Tc=",
+ "lastModified": 1771563785,
+ "narHash": "sha256-NJQ7Jx2Eytg99qNPv4YGWKjg27NTzqml48q2CfZSsoo=",
"owner": "maralorn",
"repo": "nix-output-monitor",
- "rev": "e7270cb61b9228de4362f39b7400d6c61a5eb419",
+ "rev": "3ab77f90dd817ad95a45e07764cb71ac762f0668",
"type": "github"
},
"original": {
@@ -1611,11 +1611,11 @@
"nixpkgs": "nixpkgs_11"
},
"locked": {
- "lastModified": 1770145881,
- "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=",
+ "lastModified": 1771524872,
+ "narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c",
+ "rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7",
"type": "github"
},
"original": {
@@ -1630,11 +1630,11 @@
"nixpkgs": "nixpkgs_12"
},
"locked": {
- "lastModified": 1771451095,
- "narHash": "sha256-xSAi3j/nKbG9Zf/KHlc53yrjZb56Gj1s4JBMUV7Y6xM=",
+ "lastModified": 1771626955,
+ "narHash": "sha256-sJk0VWxySMIyWmfGpGXxCDBJARiLzaQnqEw1dowBDO0=",
"owner": "spacebarchat",
"repo": "server",
- "rev": "954a61f6b6fd79c195281ef181a9a0a5af34e907",
+ "rev": "0aa260718893f2a48a9537de31848fce44f8e008",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index ae6ef45..40d5806 100755
--- a/flake.nix
+++ b/flake.nix
@@ -458,7 +458,7 @@
inherit (oldAttrs) src;
inherit patches;
name = "${oldAttrs.pname}-${oldAttrs.version}";
- hash = "sha256-CnytwGtv/ZoJl03XFLLMTHDiRhWDgWlJD8L/QRiebyM=";
+ hash = "sha256-nB7gLPDK8sB65xZkTn5W4MCqx4QwWKDUr8hB8KIu0qY=";
};
#doInstallCheck = false;
diff --git a/host/Rory-ovh/configuration.nix b/host/Rory-ovh/configuration.nix
index 49a3ebf..a73159a 100755
--- a/host/Rory-ovh/configuration.nix
+++ b/host/Rory-ovh/configuration.nix
@@ -130,6 +130,9 @@
;
};
+ systemd.services."grafana".serviceConfig.LoadCredential = [
+ "secret_key:/data/secrets/grafana-secret-key"
+ ];
# prevent a hang on rebuild with forgotten shells...
systemd.services."container@spacebar" =
let
diff --git a/modules/monitoring/module.nix b/modules/monitoring/module.nix
index f47c483..a676feb 100644
--- a/modules/monitoring/module.nix
+++ b/modules/monitoring/module.nix
@@ -57,6 +57,7 @@ in
protocol = "socket";
socket_mode = "0666";
};
+ security.secret_key = "$__file{/run/credentials/grafana.service/secret_key}";
};
provision = {
datasources.settings = {
|
