nix: rework flake input

This commit is contained in:
Primrose 2024-08-02 02:46:55 +02:00
parent 16cbf92ec3
commit f5755d11a3
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
11 changed files with 128 additions and 132 deletions

View file

@ -9,41 +9,36 @@
...
}:
{
_module.args.pkgs = import inputs.nixpkgs {
inherit system;
overlays = [
(_: _: {
agenix = inputs'.agenix.packages.default;
audio-lint = inputs'.audio-lint.packages.default;
})
_module.args =
let
overlays = [
(_: _: {
agenix = inputs'.agenix.packages.default;
audio-lint = inputs'.audio-lint.packages.default;
})
(final: _: {
wired = final.fetchFromGitHub {
owner = "Toqozz";
repo = "wired-notify";
rev = "0.10.6";
hash = "sha256-AWIV/+vVwDZECZ4lFMSFyuyUKJc/gb72PiBJv6lbhnc=";
};
})
inputs.nur.overlay
(final: _: {
nur = import inputs.nur {
nurpkgs = final;
pkgs = final;
};
})
(_: _: { myPkgs = self'.packages; }) # extend pkgs with my custom set
(import ./pins.nix)
(import ./patches.nix)
];
config.allowUnfreePredicate =
pkg:
builtins.elem (inputs.nixpkgs.lib.getName pkg) [
"discord"
"languagetool"
(_: _: { myPkgs = self'.packages; }) # extend pkgs with my custom set
];
};
in
{
pkgs-stable = import inputs.nixpkgs-stable {
inherit system;
inherit overlays;
};
pkgs = import inputs.nixpkgs {
inherit system;
inherit overlays;
config.allowUnfreePredicate =
pkg:
builtins.elem (inputs.nixpkgs.lib.getName pkg) [
"discord"
"languagetool"
];
};
};
};
}

View file

@ -1,13 +0,0 @@
_: prev: {
# https://github.com/tmux/tmux/issues/3983
# fix tmux crashing when neovim is used in a nested session
tmux = prev.tmux.overrideAttrs (oa: {
patches = (oa.patches or [ ]) ++ [
(prev.fetchpatch {
name = "sixel-patch";
url = "https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae.patch";
hash = "sha256-jhWGnC9tsGqTTA5tU+i4G3wlwZ7HGz4P0UHl17dVRU4=";
})
];
});
}

View file

@ -1,26 +0,0 @@
final: _:
let
inherit (final) system;
in
{
# stackage LTS 22.22 / ghc965 (May 19 2024) / hls 2.8.0.0
ghc-pin = import (final.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "1faadcf5147b9789aa05bdb85b35061b642500a4";
hash = "sha256-KTUFPrsI0YW/S8ZcbIAXnWI2BiGm/IGqNAFco88lBYU=";
}) { inherit system; };
alt-ergo-pin =
import
(final.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "1b95daa381fa4a0963217a5d386433c20008208a";
hash = "sha256-vwEtkxIEQjymeTk89Ty1MGfRVSWL1/3j1wt5xB5ua88=";
})
{
inherit system;
config.allowUnfree = true;
};
}