diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 814b55a..f11b831 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,3 +3,11 @@ repos: rev: 3e2a85506627062313e131bf8a85315f3387c8e0 # frozen: 4.0.0 hooks: - id: alejandra-system + - repo: local + hooks: + - id: flake-check + name: flake-check + entry: bash -c 'nix flake check' + language: system + types: [nix] + pass_filenames: false diff --git a/flake.lock b/flake.lock index aef7b94..4f176ab 100644 --- a/flake.lock +++ b/flake.lock @@ -105,22 +105,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -156,27 +140,6 @@ "type": "indirect" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -252,49 +215,12 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", "crowdsec": "crowdsec", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks" + "nixpkgs": "nixpkgs_2" } }, "rust-overlay": { diff --git a/flake.nix b/flake.nix index 24c9114..30a854e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - pre-commit-hooks.url = "github:cachix/git-hooks.nix"; home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -28,17 +27,7 @@ proxy_host = "192.168.1.40"; pgsql_host = "192.168.1.13"; pkgs = import nixpkgs {inherit system;}; - supportedSystems = ["x86_64-linux"]; - forAllSystems = nixpkgs.lib.genAttrs supportedSystems; in { - checks = forAllSystems (system: { - pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run { - src = ./.; - hooks = { - alejandra.enable = true; - }; - }; - }); nixosConfigurations = { nginx = nixpkgs.lib.nixosSystem { inherit system; diff --git a/services/grafana/default.nix b/services/grafana/default.nix index 82e72f2..2fe5d23 100644 --- a/services/grafana/default.nix +++ b/services/grafana/default.nix @@ -171,6 +171,14 @@ in { } ]; } + { + job_name = "vaultwarden"; + static_configs = [ + { + targets = ["192.168.1.22:9002"]; + } + ]; + } { job_name = "jellyfin"; static_configs = [ @@ -251,6 +259,15 @@ in { } ]; } + { + job_name = "crowdsec_vaultwarden"; + metrics_path = "/metrics"; + static_configs = [ + { + targets = ["192.168.1.22:6060"]; + } + ]; + } ]; }; loki = {