From 9ec0ca47d87227fa305f5f4f1c2686d173db3a1b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 10:43:21 +0300 Subject: [PATCH] add prometheus configuration --- darwinHosts/prometheus/configuration.nix | 8 +++ flake.lock | 62 +++++++++++++++++++----- flake.nix | 11 ++++- 3 files changed, 67 insertions(+), 14 deletions(-) create mode 100644 darwinHosts/prometheus/configuration.nix diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix new file mode 100644 index 0000000..682ba4f --- /dev/null +++ b/darwinHosts/prometheus/configuration.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + imports = [ + ../../modules + ]; + + system.stateVersion = 6; + nixpkgs.hostPlatform = "x86_64-darwin"; +} diff --git a/flake.lock b/flake.lock index 8e1f852..7487f75 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1757256385, - "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=", + "lastModified": 1757385184, + "narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=", "owner": "nix-community", "repo": "home-manager", - "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37", + "rev": "26993d87fd0d3b14f7667b74ad82235f120d986e", "type": "github" }, "original": { @@ -250,6 +250,25 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1757130842, + "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", + "type": "github" + }, + "original": { + "owner": "nix-darwin", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -362,16 +381,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1747728033, + "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -409,6 +428,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1756787288, "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", @@ -424,7 +459,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1755829505, "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", @@ -440,7 +475,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1736061677, "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", @@ -459,7 +494,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nuschtosSearch": "nuschtosSearch", "systems": "systems_4" }, @@ -574,7 +609,7 @@ "osbm-nvim": { "inputs": { "nix-formatter-pack": "nix-formatter-pack_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim" }, "locked": { @@ -595,7 +630,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -624,10 +659,11 @@ "deploy-rs": "deploy-rs", "home-manager": "home-manager", "minegrub-theme": "minegrub-theme", + "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "osbm-nvim": "osbm-nvim", "raspberry-pi-nix": "raspberry-pi-nix" } diff --git a/flake.nix b/flake.nix index bd1943b..22e7d2d 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,10 @@ }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nix-darwin = { + url = "github:nix-darwin/nix-darwin/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-on-droid = { url = "github:nix-community/nix-on-droid"; inputs.nixpkgs.follows = "nixpkgs"; @@ -46,6 +50,7 @@ self, nixpkgs, nix-on-droid, + nix-darwin, deploy-rs, ... }@inputs: @@ -74,7 +79,11 @@ pkgs = import nixpkgs { system = "aarch64-linux"; }; modules = [ ./nixOnDroidHosts/atreus/configuration.nix ]; }; - + darwinConfigurations.prometheus = nix-darwin.lib.darwinSystem { + system = "x86_64-darwin"; + modules = [ ./darwinHosts/prometheus/configuration.nix ]; + specialArgs = { inherit inputs outputs; }; + }; lib = import ./lib { inherit (nixpkgs) lib; }; formatter = forAllSystems (system: (makePkgs system).nixfmt-tree); deploy.nodes.harmonica = {