From eb6eebde166112397e8711a16a8618a52ecbcaca Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 22 Mar 2023 15:20:22 +0300 Subject: 2023-03-22 --- flake.nix | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index fc96852..a1fe2f5 100644 --- a/flake.nix +++ b/flake.nix @@ -145,6 +145,17 @@ # nixpkgs.follows = "nixpkgs"; # }; # }; + # alertmanager-gotify = { + # type = "github"; + # owner = "pinpox"; + # repo = "alertmanager-ntfy"; + # ref = "main"; + # inputs = { + # flake-compat.follows = "flake-compat"; + # flake-utils.follows = "flake-utils"; + # nixpkgs.follows = "nixpkgs"; + # }; + # }; flake-utils = { type = "github"; @@ -236,7 +247,6 @@ overlays = [self.overlays.default]; }; in { - # TODO Add packages from `self.overlay.default`. packages = with lib; (mapAttrs (_: c: c.config.system.build.toplevel) (builtins.removeAttrs self.nixosConfigurations ["iso-arm" "iso-x86"])) @@ -298,12 +308,23 @@ darwinModules.nixfiles = import ./modules/darwin; darwinConfigurations = importConfigurations ./darwinConfigurations; - overlays.default = final: _: { - bruh = final.callPackage ./packages/bruh.nix {}; - mpv-autosub = final.callPackage ./packages/mpv-autosub.nix {}; - myip = final.callPackage ./packages/myip.nix {}; - nixfiles = final.callPackage ./packages/nixfiles.nix {}; - throttled = final.callPackage ./packages/throttled.nix {}; + overlays.default = final: prev: rec { + bruh = prev.callPackage ./packages/bruh.nix {}; + mpv-autosub = prev.callPackage ./packages/mpv-autosub.nix {}; + myip = prev.callPackage ./packages/myip.nix {}; + nixfiles = prev.callPackage ./packages/nixfiles.nix {}; + throttled = prev.callPackage ./packages/throttled.nix {}; + logcli = prev.grafana-loki.overrideAttrs (_: super: { + pname = "logcli"; + subPackages = ["cmd/logcli"]; + nativeBuildInputs = super.nativeBuildInputs ++ [final.installShellFiles]; + postInstall = '' + installShellCompletion --cmd logcli \ + --bash <($out/bin/logcli --completion--script-bash) \ + --zsh <($out/bin/logcli --completion-script-zsh) + ''; + preFixup = null; + }); }; }); } -- cgit v1.2.3