From 12ef28fc35277d5422af1608b45ac37f16cacef3 Mon Sep 17 00:00:00 2001 From: noe Date: Sun, 18 Feb 2024 01:05:27 -0500 Subject: [PATCH] monitoring saerro --- flake.lock | 89 +++++++++++++++++------------- home-manager/features/vscode.nix | 7 +++ home-manager/noe/hosts/aerial.nix | 5 ++ nixos/hosts/monitoring/default.nix | 7 +++ 4 files changed, 71 insertions(+), 37 deletions(-) create mode 100644 home-manager/features/vscode.nix diff --git a/flake.lock b/flake.lock index 748cedf..d2ef933 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1706833576, - "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", + "lastModified": 1707707289, + "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", + "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", "type": "github" }, "original": { @@ -219,6 +219,20 @@ } }, "flake-compat_5": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -375,11 +389,11 @@ ] }, "locked": { - "lastModified": 1707607386, - "narHash": "sha256-hj/RgQMTvCWQVInkZwiMMieumkfOjHXhtWhfuXHop/8=", + "lastModified": 1708031129, + "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", "owner": "nix-community", "repo": "home-manager", - "rev": "bfd0ae29a86eff4603098683b516c67e22184511", + "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", "type": "github" }, "original": { @@ -396,11 +410,11 @@ ] }, "locked": { - "lastModified": 1706955260, - "narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=", + "lastModified": 1707919853, + "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c", + "rev": "043ba285c6dc20f36441d48525402bcb9743c498", "type": "github" }, "original": { @@ -437,11 +451,11 @@ ] }, "locked": { - "lastModified": 1706833576, - "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", + "lastModified": 1707707289, + "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", + "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", "type": "github" }, "original": { @@ -486,11 +500,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1707405218, - "narHash": "sha256-ZQ366Oo8WJbCqXAZET7N0Sz6RQ3G2IbqVtxQRSa3SXc=", + "lastModified": 1707873059, + "narHash": "sha256-simzllUEmzVqmQogcGCorfIbJpodAhgGSr6vuFtd4XQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "843e2f04c716092797ffa4ce14c446adce2f09ef", + "rev": "0aa24e93f75370454f0e03747b6836ac2a2c9fca", "type": "github" }, "original": { @@ -517,11 +531,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1707627072, - "narHash": "sha256-yTLO5gT7KMkqtTzH8iWcyYsF0IAAX1afIt5W9gFngiA=", + "lastModified": 1708147120, + "narHash": "sha256-sd7EckSXa6yJnH9hXAnqirBRs2Nab1IEL8klaxjAqoM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7c8d1d8427590de4ea9769732d0f27a4c117416", + "rev": "5d014ba8097072cdca4630b236da81cab490613e", "type": "github" }, "original": { @@ -565,11 +579,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1707514827, - "narHash": "sha256-Y+wqFkvikpE1epCx57PsGw+M1hX5aY5q/xgk+ebDwxI=", + "lastModified": 1707978831, + "narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20f65b86b6485decb43c5498780c223571dd56ef", + "rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da", "type": "github" }, "original": { @@ -597,11 +611,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { @@ -661,11 +675,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { @@ -693,6 +707,7 @@ }, "nixvim": { "inputs": { + "flake-compat": "flake-compat_5", "flake-parts": "flake-parts", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -702,11 +717,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1707595282, - "narHash": "sha256-F96hGG5ZCJiwZFBvlUrW8uLyhhz1/QJiqk+vaCjtWjw=", + "lastModified": 1708092675, + "narHash": "sha256-v989FEEnL74uHxb5e2BNInJFbnVO5xmO3o/sX8+JwUU=", "owner": "nix-community", "repo": "nixvim", - "rev": "e0926bc41bd06e0f4e86631872ec1a1aa41a4ba2", + "rev": "ca6240ddc2f507742f52650b3ea6a74d477afe30", "type": "github" }, "original": { @@ -745,7 +760,7 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_4", "gitignore": "gitignore_2", "nixpkgs": [ @@ -758,11 +773,11 @@ ] }, "locked": { - "lastModified": 1706424699, - "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", "type": "github" }, "original": { @@ -826,11 +841,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1707620614, - "narHash": "sha256-gfAoB9dGzBu62NoAoM945aok7+6M+LFu+nvnGwAsTp4=", + "lastModified": 1707842202, + "narHash": "sha256-3dTBbCzHJBinwhsisGJHW1HLBsLbj91+a5ZDXt7ttW0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2eb7c4ba3aa75e2660fd217eb1ab64d5b793608e", + "rev": "48afd3264ec52bee85231a7122612e2c5202fa74", "type": "github" }, "original": { diff --git a/home-manager/features/vscode.nix b/home-manager/features/vscode.nix new file mode 100644 index 0000000..e5f96d3 --- /dev/null +++ b/home-manager/features/vscode.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + + programs.vscode = { + enable = true; + package = pkgs.vscode.fhsWithPackages (ps: with ps; [ rustup nil node bun yarn ]); + }; +} diff --git a/home-manager/noe/hosts/aerial.nix b/home-manager/noe/hosts/aerial.nix index 13a6130..d904f27 100644 --- a/home-manager/noe/hosts/aerial.nix +++ b/home-manager/noe/hosts/aerial.nix @@ -13,5 +13,10 @@ teamspeak_client ]; + programs.vscode = { + enable = true; + package = pkgs.vscode.fhs; + }; + programs.kitty.settings.font_size = 12; } diff --git a/nixos/hosts/monitoring/default.nix b/nixos/hosts/monitoring/default.nix index d1d1d57..999acac 100644 --- a/nixos/hosts/monitoring/default.nix +++ b/nixos/hosts/monitoring/default.nix @@ -76,6 +76,13 @@ node = ["1"]; }; } + { + job_name = "saerro"; + static_configs = [ + { targets = [ "saerro.ps2.live" ]; } + ]; + metrics_path = "/metrics/combined"; + } ]; };