c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Merge https://gitea.c3d2.de/c3d2/nix-config

This commit is contained in:
Leon Vita 2022-12-10 19:41:08 +00:00
parent 78f5cb4feb 7f120207d5
commit 03f9d82600
7 changed files with 69 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
flake.lock
View File

@ -113,11 +113,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1670221471, "lastModified": 1670480689,
"narHash": "sha256-rNoTqumt7a1VDZt46N/zPX1cAqKyXREM6HE8Zmo32mU=", "narHash": "sha256-DADoR6R7DpnQaZjuUr6Z5EeNxr9ClP6u3Oqf7PpS9yA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "cb671e285ffc9a6f549bc6ac0f6c497e96f1f3ef", "rev": "e7941faba7f6cd0a6058330ad8c40d8dc52d741c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,11 +144,11 @@
"harmonia": { "harmonia": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670144089, "lastModified": 1670319728,
"narHash": "sha256-DJG52W6fcXaLwFnEYapDYmxJ0Hd0+uxk9O/HmtPQaN4=", "narHash": "sha256-7hsq6Sv06UcIjjlZTFlsYWDfGrc9u77OAr25SjnvZ4A=",
"owner": "helsinki-systems", "owner": "helsinki-systems",
"repo": "harmonia", "repo": "harmonia",
"rev": "634dc577437ab4e1c4071e5fb0f62325ff1a0df7", "rev": "f2476198fb8236c7c7eb432aab4472083cb9831d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -349,11 +349,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1670178589, "lastModified": 1670542845,
"narHash": "sha256-+lpmb4I7PfyhNl+GGmI5yopxdcGGO+z55dI4ZTfkDps=", "narHash": "sha256-gSrX2Pq5FlYQVRfNw5elO/QX7O48SnItyXeEc/4jZxI=",
"owner": "SuperSandro2000", "owner": "SuperSandro2000",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0992478bb4eeaa1c9b28ad433dd683e12037de2e", "rev": "9eab792f91cb76e1ad5bc3e73b05eb2d4828f4a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +396,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1670064435, "lastModified": 1670332253,
"narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", "narHash": "sha256-O5SmhlIUt1s+vK4NXeGYqwcBIMwbBPAEZ3GHE3XT28c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", "rev": "1c9ffcf70786f0966982ce0fc76ec05df2e1dec2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +412,11 @@
}, },
"nixos-unstable-simd": { "nixos-unstable-simd": {
"locked": { "locked": {
"lastModified": 1670271117, "lastModified": 1670518490,
"narHash": "sha256-VOc60s3DHdHaQWolLOahpLTzWm3C5oaDWyn9Sx5yk3s=", "narHash": "sha256-J0Ckjl7Q+l2DZRneuC+HTId3Itc0C9NToG8N72uevjY=",
"owner": "SuperSandro2000", "owner": "SuperSandro2000",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2e4dc4db26662d1aebfb6028d5aa7c5aef4bd523", "rev": "d03760999bbaf63b848f3bb58b9e1ee0c034721e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -490,11 +490,11 @@
"openwrt": { "openwrt": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670184827, "lastModified": 1670433513,
"narHash": "sha256-kVCvQKdH6Og/ue4IIBJe7oHDWA4b5HcbnbB7NN9gS0M=", "narHash": "sha256-gqlSkpWgC6rONYGZLzM5Fwc+ssoC7NiR2O3DCFtRRMM=",
"ref": "openwrt-21.02", "ref": "openwrt-21.02",
"rev": "be3b061d7bbf425c95ef9108a37c51747c0025e9", "rev": "295c612a4a76e9f0860e2efdb609a38bc74d3e4a",
"revCount": 51253, "revCount": 51263,
"type": "git", "type": "git",
"url": "https://git.openwrt.org/openwrt/openwrt.git" "url": "https://git.openwrt.org/openwrt/openwrt.git"
}, },
@ -511,11 +511,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670272639, "lastModified": 1670531824,
"narHash": "sha256-IRMBjDehUXHPDlhE2WoZ+QCHZ+sxnFf+h8VzewUUm/4=", "narHash": "sha256-jRD5CVLdXTyXn8uqOGBqDllNjz3ZzUSKInXQETUwowg=",
"owner": "astro", "owner": "astro",
"repo": "nix-openwrt-imagebuilder", "repo": "nix-openwrt-imagebuilder",
"rev": "10a85914617f218942b7f5daa36ef619f495c372", "rev": "29733301042477d878af2985c1367047030f2f5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -562,11 +562,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670182646, "lastModified": 1670426523,
"narHash": "sha256-2Syd2jVpY0UIfsYlmzvWICZTDVRG4UchcbRlNhuJSpM=", "narHash": "sha256-Zh+pAuj4PmBmISXCz+54yVSwSXZwbn+ZELgM85xVUE0=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "a2beeb8dbb5f4596f8c6f28a09c20355ea4c4628", "rev": "6e8a54d0f68702cf7981c8299357838eb0f4d5b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +586,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670207212, "lastModified": 1670466538,
"narHash": "sha256-uuKbbv0L+QoXiqO7METP9BihY0F7hJqGdKn7xDVfyFw=", "narHash": "sha256-qz3MwPVTHJb62vPRJMXJ+waqjEUHrjTyjXyLHqF0DrE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "18823e511bc85ed27bfabe33cccecb389f9aa92d", "rev": "073959f0687277a54bfaa3ac7a77feb072f88186",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@ -764,14 +764,16 @@
in in
lib.mapAttrs getBuildEntryPoint self.nixosConfigurations lib.mapAttrs getBuildEntryPoint self.nixosConfigurations
// lib.mapAttrs' (hostname: nixosSystem: lib.nameValuePair // lib.mapAttrs' (hostname: nixosSystem: lib.nameValuePair
(hostname + "-simd") # job display name
(hostname + "-nox")
(getBuildEntryPoint null (nixosSystem' (nixosSystem.args // (with nixosSystem.args; { (getBuildEntryPoint null (nixosSystem' (nixosSystem.args // (with nixosSystem.args; {
modules = modules ++ [ 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 ) self.nixosConfigurations
// nixos.lib.filterAttrs (name: attr: // nixos.lib.filterAttrs (name: attr:

2
hosts/glotzbert/hardware-configuration.nix
View File

@ -8,7 +8,7 @@
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules =
[ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" "nct6775" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {

57
hosts/grafana/dashboards/pVoyupoZk.json
View File

@ -26,7 +26,6 @@
"editable": true, "editable": true,
"fiscalYearStartMonth": 0, "fiscalYearStartMonth": 0,
"graphTooltip": 0, "graphTooltip": 0,
"iteration": 1655678212481,
"links": [], "links": [],
"liveNow": false, "liveNow": false,
"panels": [ "panels": [
@ -41,6 +40,8 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
@ -99,7 +100,8 @@
"legend": { "legend": {
"calcs": [], "calcs": [],
"displayMode": "list", "displayMode": "list",
"placement": "bottom" "placement": "bottom",
"showLegend": true
}, },
"tooltip": { "tooltip": {
"mode": "multi", "mode": "multi",
@ -199,7 +201,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "8.5.6", "pluginVersion": "9.3.1",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -322,6 +324,8 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
@ -380,7 +384,8 @@
"legend": { "legend": {
"calcs": [], "calcs": [],
"displayMode": "list", "displayMode": "list",
"placement": "bottom" "placement": "bottom",
"showLegend": true
}, },
"tooltip": { "tooltip": {
"mode": "multi", "mode": "multi",
@ -535,6 +540,8 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "Temperature", "axisLabel": "Temperature",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
@ -621,8 +628,9 @@
"options": { "options": {
"legend": { "legend": {
"calcs": [], "calcs": [],
"displayMode": "hidden", "displayMode": "list",
"placement": "bottom" "placement": "bottom",
"showLegend": false
}, },
"tooltip": { "tooltip": {
"mode": "single", "mode": "single",
@ -862,7 +870,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "8.5.6", "pluginVersion": "9.3.1",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -992,6 +1000,8 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
@ -1172,8 +1182,9 @@
"options": { "options": {
"legend": { "legend": {
"calcs": [], "calcs": [],
"displayMode": "hidden", "displayMode": "list",
"placement": "bottom" "placement": "bottom",
"showLegend": false
}, },
"tooltip": { "tooltip": {
"mode": "multi", "mode": "multi",
@ -1269,6 +1280,8 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
@ -1362,7 +1375,8 @@
"max" "max"
], ],
"displayMode": "table", "displayMode": "table",
"placement": "bottom" "placement": "bottom",
"showLegend": true
}, },
"tooltip": { "tooltip": {
"mode": "multi", "mode": "multi",
@ -1533,6 +1547,8 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
@ -1566,8 +1582,7 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green", "color": "green"
"value": null
}, },
{ {
"color": "red", "color": "red",
@ -1591,7 +1606,8 @@
"legend": { "legend": {
"calcs": [], "calcs": [],
"displayMode": "list", "displayMode": "list",
"placement": "bottom" "placement": "bottom",
"showLegend": true
}, },
"tooltip": { "tooltip": {
"mode": "multi", "mode": "multi",
@ -1748,7 +1764,7 @@
} }
], ],
"refresh": false, "refresh": false,
"schemaVersion": 36, "schemaVersion": 37,
"style": "dark", "style": "dark",
"tags": [], "tags": [],
"templating": { "templating": {
@ -1756,17 +1772,10 @@
{ {
"current": { "current": {
"selected": false, "selected": false,
"text": "server10", "text": "hydra",
"value": "server10" "value": "hydra"
},
"datasource": {
"type": "influxdb",
"uid": "000000001"
}, },
"definition": "SHOW TAG VALUES WITH KEY = \"host\"", "definition": "SHOW TAG VALUES WITH KEY = \"host\"",
"error": {
"message": "Datasource 000000001 was not found"
},
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"multi": false, "multi": false,
@ -1807,4 +1816,4 @@
"uid": "pVoyupoZk", "uid": "pVoyupoZk",
"version": 1, "version": 1,
"weekStart": "" "weekStart": ""
} }

6
hosts/grafana/default.nix
View File

@ -11,8 +11,6 @@ in {
c3d2.isInHq = false; c3d2.isInHq = false;
services.openssh.enable = true; services.openssh.enable = true;
# noXlibs breaks cairo:
environment.noXlibs = false;
networking.hostName = "grafana"; networking.hostName = "grafana";
@ -41,7 +39,7 @@ in {
datasources.settings.datasources = map (datasource: { datasources.settings.datasources = map (datasource: {
inherit (datasource) name type access orgId url password user database isDefault jsonData; inherit (datasource) name type access orgId url password user database isDefault jsonData;
}) (with builtins; fromJSON (readFile ./datasources.json)); }) (with builtins; fromJSON (readFile ./datasources.json));
dashboards = [ { dashboards.settings.providers = [ {
settings = { settings = {
apiVersion = 1; apiVersion = 1;
providers = [ { providers = [ {
@ -69,7 +67,7 @@ in {
services.influxdb = let services.influxdb = let
collectdTypes = pkgs.runCommand "collectd-types" {} '' collectdTypes = pkgs.runCommand "collectd-types" {} ''
mkdir -p $out/share/collectd 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 echo "stations value:GAUGE:0:U" >> $out/share/collectd/types.db
''; '';
in { in {

3
hosts/sdrweb/default.nix
View File

@ -88,7 +88,4 @@
inherit (pkgs.mucbot) password; inherit (pkgs.mucbot) password;
muc = "luftraum@chat.c3d2.de/Hubschraubereinsatz"; muc = "luftraum@chat.c3d2.de/Hubschraubereinsatz";
}; };
# noXlibs breaks cairo:
environment.noXlibs = false;
} }

5
modules/c3d2.nix
View File

@ -455,11 +455,6 @@ in
ethtool ethtool
mtr mtr
]; ];
variables = {
# TERM = "xterm-256color";
};
# breaks various package builds
noXlibs = lib.mkForce false;
}; };
programs = { programs = {