Cleaned up darwin from noise; Moved overlays too a shared module

This commit is contained in:
2026-06-06 21:04:49 +02:00
parent 9f2dc8314a
commit 7a25ac669f
12 changed files with 112 additions and 154 deletions
-5
View File
@@ -64,11 +64,6 @@
info.enable = false;
};
nixpkgs = {
overlays = [ (import ./packages/overlays.nix { inherit (inputs) nur; }) ];
config.allowUnfree = true;
};
programs = {
fish.enable = true;
}
-29
View File
@@ -1,29 +0,0 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "gs1200-exporter";
version = "2.11.12";
__structuredAttrs = true;
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;
};
}
-25
View File
@@ -1,25 +0,0 @@
{
vaultwarden,
rustPlatform,
fetchFromGitHub,
...
}:
let
src = fetchFromGitHub {
owner = "Timshel";
repo = "OIDCWarden";
rev = "48edfc7ba54372074befa1d62c63c4babfaadc77";
hash = "sha256-tHacn9RtoByWpqnWX2/gWwODDSeXJa4mk4MfxHiiJ8A=";
};
in
vaultwarden.overrideAttrs (old: {
pname = "oidcwarden";
inherit src;
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
hash = "sha256-eGsYNaLYRCrTRaoyfhxnoeA2ytYeyGGvHnAbpEIayzs=";
};
postInstall = (old.postInstall or "") + ''
mv $out/bin/oidcwarden $out/bin/vaultwarden
'';
})
-9
View File
@@ -1,9 +0,0 @@
{ nur }:
final: prev:
(nur.overlays.default final prev)
// {
gs1200-exporter = final.callPackage ./gs1200-exporter.nix { };
oidcwarden = final.callPackage ./oidcwarden.nix {
inherit (prev) vaultwarden;
};
}