From 3f45c026df269c2690c4250dd392ca34e5aff618 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 7 Dec 2022 20:54:41 +0100 Subject: [PATCH 1/9] glotzbert: add kernel module for hwmon2 --- hosts/glotzbert/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/glotzbert/hardware-configuration.nix b/hosts/glotzbert/hardware-configuration.nix index 37ee602f..4d5aa8da 100644 --- a/hosts/glotzbert/hardware-configuration.nix +++ b/hosts/glotzbert/hardware-configuration.nix @@ -8,7 +8,7 @@ boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-intel" "nct6775" ]; boot.extraModulePackages = [ ]; fileSystems."/" = { From 5907e29413c6400358194c51500c2c436e6276ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 8 Dec 2022 20:26:32 +0100 Subject: [PATCH 2/9] Bump --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index adb5f48d..c82f5173 100644 --- a/flake.lock +++ b/flake.lock @@ -113,11 +113,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1670221471, - "narHash": "sha256-rNoTqumt7a1VDZt46N/zPX1cAqKyXREM6HE8Zmo32mU=", + "lastModified": 1670480689, + "narHash": "sha256-DADoR6R7DpnQaZjuUr6Z5EeNxr9ClP6u3Oqf7PpS9yA=", "owner": "nix-community", "repo": "fenix", - "rev": "cb671e285ffc9a6f549bc6ac0f6c497e96f1f3ef", + "rev": "e7941faba7f6cd0a6058330ad8c40d8dc52d741c", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "harmonia": { "flake": false, "locked": { - "lastModified": 1670144089, - "narHash": "sha256-DJG52W6fcXaLwFnEYapDYmxJ0Hd0+uxk9O/HmtPQaN4=", + "lastModified": 1670319728, + "narHash": "sha256-7hsq6Sv06UcIjjlZTFlsYWDfGrc9u77OAr25SjnvZ4A=", "owner": "helsinki-systems", "repo": "harmonia", - "rev": "634dc577437ab4e1c4071e5fb0f62325ff1a0df7", + "rev": "f2476198fb8236c7c7eb432aab4472083cb9831d", "type": "github" }, "original": { @@ -349,11 +349,11 @@ }, "nixos": { "locked": { - "lastModified": 1670178589, - "narHash": "sha256-+lpmb4I7PfyhNl+GGmI5yopxdcGGO+z55dI4ZTfkDps=", + "lastModified": 1670359138, + "narHash": "sha256-lrEtzODeYn30qDB2mI26S3K4/tXjdhWluaOOQ7I+dcY=", "owner": "SuperSandro2000", "repo": "nixpkgs", - "rev": "0992478bb4eeaa1c9b28ad433dd683e12037de2e", + "rev": "1bcc1d778d140ec91d4cb74b973f3037c1ed8695", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1670064435, - "narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", + "lastModified": 1670332253, + "narHash": "sha256-O5SmhlIUt1s+vK4NXeGYqwcBIMwbBPAEZ3GHE3XT28c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", + "rev": "1c9ffcf70786f0966982ce0fc76ec05df2e1dec2", "type": "github" }, "original": { @@ -412,11 +412,11 @@ }, "nixos-unstable-simd": { "locked": { - "lastModified": 1670271117, - "narHash": "sha256-VOc60s3DHdHaQWolLOahpLTzWm3C5oaDWyn9Sx5yk3s=", + "lastModified": 1670518490, + "narHash": "sha256-J0Ckjl7Q+l2DZRneuC+HTId3Itc0C9NToG8N72uevjY=", "owner": "SuperSandro2000", "repo": "nixpkgs", - "rev": "2e4dc4db26662d1aebfb6028d5aa7c5aef4bd523", + "rev": "d03760999bbaf63b848f3bb58b9e1ee0c034721e", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "openwrt": { "flake": false, "locked": { - "lastModified": 1670184827, - "narHash": "sha256-kVCvQKdH6Og/ue4IIBJe7oHDWA4b5HcbnbB7NN9gS0M=", + "lastModified": 1670433513, + "narHash": "sha256-gqlSkpWgC6rONYGZLzM5Fwc+ssoC7NiR2O3DCFtRRMM=", "ref": "openwrt-21.02", - "rev": "be3b061d7bbf425c95ef9108a37c51747c0025e9", - "revCount": 51253, + "rev": "295c612a4a76e9f0860e2efdb609a38bc74d3e4a", + "revCount": 51263, "type": "git", "url": "https://git.openwrt.org/openwrt/openwrt.git" }, @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1670272639, - "narHash": "sha256-IRMBjDehUXHPDlhE2WoZ+QCHZ+sxnFf+h8VzewUUm/4=", + "lastModified": 1670445795, + "narHash": "sha256-iJOOUSXwdESq+ngieBAfHAcdIJOJYGeNwMwmjI8zCJo=", "owner": "astro", "repo": "nix-openwrt-imagebuilder", - "rev": "10a85914617f218942b7f5daa36ef619f495c372", + "rev": "36500ee9cb86e4c309793e4f6bb6e26892e29eed", "type": "github" }, "original": { @@ -562,11 +562,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1670182646, - "narHash": "sha256-2Syd2jVpY0UIfsYlmzvWICZTDVRG4UchcbRlNhuJSpM=", + "lastModified": 1670426523, + "narHash": "sha256-Zh+pAuj4PmBmISXCz+54yVSwSXZwbn+ZELgM85xVUE0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a2beeb8dbb5f4596f8c6f28a09c20355ea4c4628", + "rev": "6e8a54d0f68702cf7981c8299357838eb0f4d5b2", "type": "github" }, "original": { @@ -586,11 +586,11 @@ ] }, "locked": { - "lastModified": 1670207212, - "narHash": "sha256-uuKbbv0L+QoXiqO7METP9BihY0F7hJqGdKn7xDVfyFw=", + "lastModified": 1670466538, + "narHash": "sha256-qz3MwPVTHJb62vPRJMXJ+waqjEUHrjTyjXyLHqF0DrE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "18823e511bc85ed27bfabe33cccecb389f9aa92d", + "rev": "073959f0687277a54bfaa3ac7a77feb072f88186", "type": "github" }, "original": { From ea2878fd36f7793d78c243b2322cd285e4aac37b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Dec 2022 00:41:33 +0100 Subject: [PATCH 3/9] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos': 'github:SuperSandro2000/nixpkgs/1bcc1d778d140ec91d4cb74b973f3037c1ed8695' (2022-12-06) → 'github:SuperSandro2000/nixpkgs/9eab792f91cb76e1ad5bc3e73b05eb2d4828f4a9' (2022-12-08) • Updated input 'openwrt-imagebuilder': 'github:astro/nix-openwrt-imagebuilder/36500ee9cb86e4c309793e4f6bb6e26892e29eed' (2022-12-07) → 'github:astro/nix-openwrt-imagebuilder/29733301042477d878af2985c1367047030f2f5e' (2022-12-08) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c82f5173..21fc671a 100644 --- a/flake.lock +++ b/flake.lock @@ -349,11 +349,11 @@ }, "nixos": { "locked": { - "lastModified": 1670359138, - "narHash": "sha256-lrEtzODeYn30qDB2mI26S3K4/tXjdhWluaOOQ7I+dcY=", + "lastModified": 1670542845, + "narHash": "sha256-gSrX2Pq5FlYQVRfNw5elO/QX7O48SnItyXeEc/4jZxI=", "owner": "SuperSandro2000", "repo": "nixpkgs", - "rev": "1bcc1d778d140ec91d4cb74b973f3037c1ed8695", + "rev": "9eab792f91cb76e1ad5bc3e73b05eb2d4828f4a9", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1670445795, - "narHash": "sha256-iJOOUSXwdESq+ngieBAfHAcdIJOJYGeNwMwmjI8zCJo=", + "lastModified": 1670531824, + "narHash": "sha256-jRD5CVLdXTyXn8uqOGBqDllNjz3ZzUSKInXQETUwowg=", "owner": "astro", "repo": "nix-openwrt-imagebuilder", - "rev": "36500ee9cb86e4c309793e4f6bb6e26892e29eed", + "rev": "29733301042477d878af2985c1367047030f2f5e", "type": "github" }, "original": { From 98d59e10d5688b7b897e6ff61d327d345727f886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Dec 2022 22:23:07 +0100 Subject: [PATCH 4/9] Replace simd jobs with nox --- flake.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 01ba6e47..9da6a673 100644 --- a/flake.nix +++ b/flake.nix @@ -764,14 +764,16 @@ in lib.mapAttrs getBuildEntryPoint self.nixosConfigurations // lib.mapAttrs' (hostname: nixosSystem: lib.nameValuePair - (hostname + "-simd") + # job display name + (hostname + "-nox") (getBuildEntryPoint null (nixosSystem' (nixosSystem.args // (with nixosSystem.args; { modules = modules ++ [ { - c3d2.simd.enable = lib.mkForce true; + # c3d2.simd.enable = lib.mkForce true; + environment.noXlibs = true; } ]; - nixpkgs = nixos-unstable-simd; + # nixpkgs = nixos-unstable-simd; })))) ) self.nixosConfigurations // nixos.lib.filterAttrs (name: attr: From ff04c649c38c16fd56fcc2c8b4f0135d8eb3f09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Dec 2022 22:41:39 +0100 Subject: [PATCH 5/9] Actually enable noXlibs --- hosts/grafana/default.nix | 2 -- hosts/sdrweb/default.nix | 3 --- modules/c3d2.nix | 5 ----- 3 files changed, 10 deletions(-) diff --git a/hosts/grafana/default.nix b/hosts/grafana/default.nix index 9b2e0f75..375f3d20 100644 --- a/hosts/grafana/default.nix +++ b/hosts/grafana/default.nix @@ -11,8 +11,6 @@ in { c3d2.isInHq = false; services.openssh.enable = true; - # noXlibs breaks cairo: - environment.noXlibs = false; networking.hostName = "grafana"; diff --git a/hosts/sdrweb/default.nix b/hosts/sdrweb/default.nix index f6e53b0f..19586799 100644 --- a/hosts/sdrweb/default.nix +++ b/hosts/sdrweb/default.nix @@ -88,7 +88,4 @@ inherit (pkgs.mucbot) password; muc = "luftraum@chat.c3d2.de/Hubschraubereinsatz"; }; - - # noXlibs breaks cairo: - environment.noXlibs = false; } diff --git a/modules/c3d2.nix b/modules/c3d2.nix index 3e27722d..213e3d17 100644 --- a/modules/c3d2.nix +++ b/modules/c3d2.nix @@ -455,11 +455,6 @@ in ethtool mtr ]; - variables = { - # TERM = "xterm-256color"; - }; - # breaks various package builds - noXlibs = lib.mkForce false; }; programs = { From 7bc63111a23bd0527522d0e0d2dbae3f5c2b97ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 10 Dec 2022 19:42:05 +0100 Subject: [PATCH 6/9] grafana: fix eval --- hosts/grafana/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/grafana/default.nix b/hosts/grafana/default.nix index 375f3d20..b84c667f 100644 --- a/hosts/grafana/default.nix +++ b/hosts/grafana/default.nix @@ -39,7 +39,7 @@ in { datasources.settings.datasources = map (datasource: { inherit (datasource) name type access orgId url password user database isDefault jsonData; }) (with builtins; fromJSON (readFile ./datasources.json)); - dashboards = [ { + dashboards.settings.providers = [ { settings = { apiVersion = 1; providers = [ { From 37c98c9ae9fef7c7b5a58a58ba698b913eccb8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 10 Dec 2022 19:42:12 +0100 Subject: [PATCH 7/9] Use collectd-data package to reduce build time closure by 500 packages --- hosts/grafana/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/grafana/default.nix b/hosts/grafana/default.nix index b84c667f..936cce9c 100644 --- a/hosts/grafana/default.nix +++ b/hosts/grafana/default.nix @@ -67,7 +67,7 @@ in { services.influxdb = let collectdTypes = pkgs.runCommand "collectd-types" {} '' mkdir -p $out/share/collectd - cat ${config.services.collectd.package}/share/collectd/types.db >> $out/share/collectd/types.db + cat ${pkgs.collectd-data}/share/collectd/types.db >> $out/share/collectd/types.db echo "stations value:GAUGE:0:U" >> $out/share/collectd/types.db ''; in { From 618e1ed9b9fefb8bb4514faf0774961efe78266b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 10 Dec 2022 19:46:37 +0100 Subject: [PATCH 8/9] Commit migrations done by grafana --- hosts/grafana/dashboards/pVoyupoZk.json | 46 ++++++++++++++++--------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/hosts/grafana/dashboards/pVoyupoZk.json b/hosts/grafana/dashboards/pVoyupoZk.json index e19b7555..656b5901 100644 --- a/hosts/grafana/dashboards/pVoyupoZk.json +++ b/hosts/grafana/dashboards/pVoyupoZk.json @@ -26,7 +26,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "iteration": 1655678212481, "links": [], "liveNow": false, "panels": [ @@ -41,6 +40,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -99,7 +100,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -199,7 +201,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.6", + "pluginVersion": "9.3.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -322,6 +324,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -380,7 +384,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -535,6 +540,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "Temperature", "axisPlacement": "auto", "barAlignment": 0, @@ -621,8 +628,9 @@ "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { "mode": "single", @@ -862,7 +870,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.6", + "pluginVersion": "9.3.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -992,6 +1000,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -1172,8 +1182,9 @@ "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { "mode": "multi", @@ -1269,6 +1280,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -1362,7 +1375,8 @@ "max" ], "displayMode": "table", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -1533,6 +1547,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -1591,7 +1607,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -1748,7 +1765,7 @@ } ], "refresh": false, - "schemaVersion": 36, + "schemaVersion": 37, "style": "dark", "tags": [], "templating": { @@ -1764,9 +1781,6 @@ "uid": "000000001" }, "definition": "SHOW TAG VALUES WITH KEY = \"host\"", - "error": { - "message": "Datasource 000000001 was not found" - }, "hide": 0, "includeAll": false, "multi": false, @@ -1807,4 +1821,4 @@ "uid": "pVoyupoZk", "version": 1, "weekStart": "" -} \ No newline at end of file +} From 7f120207d52537bbe3829085a78d10dd7be5f627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 10 Dec 2022 19:52:03 +0100 Subject: [PATCH 9/9] Fix datasource --- hosts/grafana/dashboards/pVoyupoZk.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hosts/grafana/dashboards/pVoyupoZk.json b/hosts/grafana/dashboards/pVoyupoZk.json index 656b5901..d6707add 100644 --- a/hosts/grafana/dashboards/pVoyupoZk.json +++ b/hosts/grafana/dashboards/pVoyupoZk.json @@ -1582,8 +1582,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1773,12 +1772,8 @@ { "current": { "selected": false, - "text": "server10", - "value": "server10" - }, - "datasource": { - "type": "influxdb", - "uid": "000000001" + "text": "hydra", + "value": "hydra" }, "definition": "SHOW TAG VALUES WITH KEY = \"host\"", "hide": 0,