From d23d7dc79e04ffa46b0aae22b6167de0ac8887d9 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Tue, 19 May 2026 20:10:53 +0200 Subject: [PATCH] Added Overlays for gs1200 exporter and oicwarden --- flake.lock | 17 ----------------- flake.nix | 5 ----- home/default.nix | 6 ------ nixos/default.nix | 5 ++++- nixos/packages/gs1200-exporter.nix | 24 ++++++++++++++++++++++++ nixos/packages/oidcwarden.nix | 19 +++++++++++++++---- nixos/packages/overlays.nix | 4 ++++ secrets/secrets.yaml | 5 +++-- 8 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 nixos/packages/gs1200-exporter.nix create mode 100644 nixos/packages/overlays.nix diff --git a/flake.lock b/flake.lock index 2d45b61..781fc09 100644 --- a/flake.lock +++ b/flake.lock @@ -774,22 +774,6 @@ "type": "github" } }, - "oidcwarden": { - "flake": false, - "locked": { - "lastModified": 1778081807, - "narHash": "sha256-tHacn9RtoByWpqnWX2/gWwODDSeXJa4mk4MfxHiiJ8A=", - "owner": "Timshel", - "repo": "OIDCWarden", - "rev": "48edfc7ba54372074befa1d62c63c4babfaadc77", - "type": "github" - }, - "original": { - "owner": "Timshel", - "repo": "OIDCWarden", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -826,7 +810,6 @@ "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", "nixvim": "nixvim", - "oidcwarden": "oidcwarden", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix" } diff --git a/flake.nix b/flake.nix index 0dbbcd6..be3e29e 100644 --- a/flake.nix +++ b/flake.nix @@ -72,11 +72,6 @@ url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - - oidcwarden = { - url = "github:Timshel/OIDCWarden"; - flake = false; - }; }; outputs = diff --git a/home/default.nix b/home/default.nix index 83fda5b..814fe56 100644 --- a/home/default.nix +++ b/home/default.nix @@ -34,12 +34,6 @@ ./obsidian.nix ]; - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "wezterm.nvim" - ]; - home = { username = primaryUser; stateVersion = "26.05"; diff --git a/nixos/default.nix b/nixos/default.nix index edf0510..204b2b2 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -94,7 +94,10 @@ info.enable = false; }; - nixpkgs.config.allowUnfree = true; + nixpkgs = { + overlays = [ (import ./packages/overlays.nix) ]; + config.allowUnfree = true; + }; programs = { fish.enable = true; diff --git a/nixos/packages/gs1200-exporter.nix b/nixos/packages/gs1200-exporter.nix new file mode 100644 index 0000000..35e95e7 --- /dev/null +++ b/nixos/packages/gs1200-exporter.nix @@ -0,0 +1,24 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "gs1200-exporter"; + version = "2.11.12"; + src = fetchFromGitHub { + owner = "robinelfrink"; + repo = "gs1200-exporter"; + rev = "v${version}"; + hash = "sha256-8s2VgaqYXp9PN2oNU/sWpjQjDPSWolbWEVSZcx9Lh3M="; + }; + vendorHash = "sha256-204bFaywOolKVNoeH/w72Ba1PYAVgQawEmlaEXgRaRY="; + meta = { + description = "Prometheus exporter for Zyxel GS1200 switches"; + homepage = "https://github.com/robinelfrink/gs1200-exporter"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ DerGrumpf ]; + mainProgram = "gs1200-exporter"; + platforms = lib.platforms.all; + }; +} diff --git a/nixos/packages/oidcwarden.nix b/nixos/packages/oidcwarden.nix index 7145325..d12d151 100644 --- a/nixos/packages/oidcwarden.nix +++ b/nixos/packages/oidcwarden.nix @@ -1,10 +1,21 @@ -{ pkgs, oidcwarden-src, ... }: - +{ + pkgs, + fetchFromGitHub, + ... +}: +let + src = fetchFromGitHub { + owner = "Timshel"; + repo = "OIDCWarden"; + rev = "48edfc7ba54372074befa1d62c63c4babfaadc77"; + hash = "sha256-tHacn9RtoByWpqnWX2/gWwODDSeXJa4mk4MfxHiiJ8A="; + }; +in pkgs.vaultwarden.overrideAttrs (old: { pname = "oidcwarden"; - src = oidcwarden-src; + inherit src; cargoDeps = pkgs.rustPlatform.importCargoLock { - lockFile = "${oidcwarden-src}/Cargo.lock"; + lockFile = "${src}/Cargo.lock"; }; postInstall = (old.postInstall or "") + '' mv $out/bin/oidcwarden $out/bin/vaultwarden diff --git a/nixos/packages/overlays.nix b/nixos/packages/overlays.nix new file mode 100644 index 0000000..99aac1d --- /dev/null +++ b/nixos/packages/overlays.nix @@ -0,0 +1,4 @@ +final: prev: { + gs1200-exporter = final.callPackage ./gs1200-exporter.nix { }; + oidcwarden = final.callPackage ./oidcwarden.nix { }; +} diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 69d3413..e0d8b2c 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,3 +1,4 @@ +test: ENC[AES256_GCM,data:MDd0sD9oGirw,iv:jhnNjMTqD6lyXckiuuySXnuxMf0N9w1AlsJvbt0GB+8=,tag:DssZmmRbErs99dds89Cr4A==,type:str] cachix_auth_token: ENC[AES256_GCM,data:nR7e2ZOA3q5DmkrqFEzINpKFEHVD5nyzc3DQ3QgD42fdyABV+r1Ela3iEcbU8SWj5JMRq8T1r7QxqcYW+VSMsT2cjQV2e4ZrpUmkX2QnhfmLqQBdJLhgNKBnu+x8QGJpQ3j7mG23atJ3BDTYBEKlI8y6wLEgpTX8GIVzHJVwfbqewTX4EfFyh3mVMtxAK9II/w==,iv:CSMcUdsqC97fmu1Po3cRrUj9h51Wv+KaUPfEToE7qVs=,tag:s1XHG2eyZYJJ5xd9CZb+Pw==,type:str] GROQ_API_KEY: ENC[AES256_GCM,data:OyuC4jfw67sCDa0XBGr78S6pzPV1ruy7KiIqPMgWWcOCVm3Y/khXEYPMjUTGrq9YLOw1MLso0OE=,iv:0y9klMYVtGsqAaLc2JidjZYSLhhbcbWbnBf8sZiC3rM=,tag:r6G2pzZn2d9JIaS+ozKnmg==,type:str] OPENWEATHER_API_KEY: ENC[AES256_GCM,data:bcuLz70u40nZfNgPTaeNRXdR/zjx0SQjwMbMNNFqROI=,iv:VCzse1a1/k1ZDIpFPL1QhjuS6YaDyohWi61JZaoc0Ws=,tag:UJSNyniNNLfGGRY/uiJcRA==,type:str] @@ -37,7 +38,7 @@ sops: N3I5dzUwc3JtYzczMUhyT04vSHlZamMKT+FzYcDLmlEFYxm/XoBpJb8XaZzBH1v9 6fuez+zApathZfl14w41kAUojPWBznnxDqYtNvzVVLXwnpp3BMx+7w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-05-15T12:46:25Z" - mac: ENC[AES256_GCM,data:KeBccgMJ2PLvLjKqnGcZTdVCkR60XO/H7Wy+3JvucPqRP+vdjXvSGzadgJ/d+ML04ytKk5Ffp0APnK//CLaiD+mcKlwAavtI4qKuvhtssxwsDbzYwvI/TsxFUD+BIVnvxUMDNfI//Wx1qSLb5jDdUWmiexF+bFtCwHfZFsEh4Sg=,iv:auXVwnkaCGpZcr8Jx1GSEdxab2/Y6jJhdfD4wjGBHBM=,tag:GCG7gWeAJ5nJCyY2ofZBGA==,type:str] + lastmodified: "2026-05-19T17:36:24Z" + mac: ENC[AES256_GCM,data:1tWUPr3njHiQeTH8jdVTIPRIIhOvQSJthGTgjT0P+WvOSZlRgwPK/vM6beweK6xfxdDk4dzRNKxZv3QzKiCwJTaP91MZaRVOly3u2ST0tE1FANo3ZqM34ePBVtlR9q+pDO05JczIjWBTlUcBsVqGKMSpAhn1jZDSY45r18HNwqQ=,iv:6X5FoNb7vl4BYniUE3D4e8wGZVGHbqgsFC1Wv70dCKc=,tag:bRxXg2UfXBhqeXZqdR9Unw==,type:str] unencrypted_suffix: _unencrypted version: 3.12.2