reo101/rix101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(overlays)!: redefine in terms of createThings

Browse source
This commit is contained in:
reo101 2024-08-04 03:10:58 +03:00
parent 7cf980d913
commit 51e8fafec6
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
6 changed files with 149 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -20,6 +20,7 @@
./modules/flake/deploy
./modules/flake/topology
./modules/flake/packages
./modules/flake/overlays
];
perSystem = { lib, pkgs, system, ... }: {
@ -49,15 +50,13 @@
# Automatic packages, see `./modules/flake/packages/default.nix`
autoPackages.enable = true;
# Automatic overlays, see `./modules/flake/overlays/default.nix`
autoOverlays.enable = true;
# Templates
templates = import ./templates {
inherit inputs;
};
# Overlays
overlays = import ./overlays {
inherit inputs;
};
};
});

65
modules/flake/overlays/default.nix Normal file
View file

@ -0,0 +1,65 @@
{ lib, config, self, inputs, ... }:
let
inherit (config.lib)
createThings;
in
let
createOverlays = baseDir:
createThings {
inherit baseDir;
thingType = "overlay";
};
in
{
options = let
inherit (lib) types;
in {
flake.autoOverlays = lib.mkOption {
description = ''
Automagically generate overlays from walking directories with Nix files
'';
type = types.submodule (submodule: {
options = {
enable = lib.mkEnableOption "Automatic overlays extraction";
dir = lib.mkOption {
description = ''
Base directory of the contained overlays
'';
type = types.path;
default = "${self}/overlays";
defaultText = ''''${self}/overlays'';
};
result = lib.mkOption {
description = ''
The resulting automatic overlays
'';
type = types.attrsOf types.unspecified;
readOnly = true;
internal = true;
default =
lib.optionalAttrs
config.flake.autoOverlays.enable
(createOverlays config.flake.autoOverlays.dir);
};
};
});
default = {};
};
};
config = {
flake = let
overlays =
lib.pipe
config.flake.autoOverlays.result
[
(lib.mapAttrs
(name: overlay:
overlay))
];
in {
inherit overlays;
};
};
}

5
overlays/README.md Normal file
View file

@ -0,0 +1,5 @@
Add your reusable overlays to this directory (<https://nixos.wiki/wiki/Overlays>)
These are considered overlays:
- files, ending in `.nix` (excluding `default.nix`)
- directories, containing `default.nix`

87
overlays/default.nix
View file

@ -1,87 +0,0 @@
# This file defines overlays
{ inputs, ... }:
{
# This one brings our custom packages
# BUG: causes infinite recursion
# additions = final: prev: inputs.self.packages.${prev.system};
# This one contains whatever you want to overlay
# You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays
modifications = final: prev: {
# example = prev.example.overrideAttrs (oldAttrs: rec {
# ...
# });
lib = prev.lib // {
maintainers = {
reo101 = {
name = "Pavel Atanasov";
email = "pavel.atanasov2001@gmail.com";
github = "reo101";
githubId = "37866329";
keys = [
{
fingerprint = "8A29 0250 C775 7813 1DD1 DC57 7275 0ABE E181 26D0";
}
];
};
};
};
nix-monitored = inputs.nix-monitored.packages.${prev.system}.default.override {
nix = prev.nix;
nix-output-monitor = prev.nix-output-monitor;
};
nixVersions = prev.nixVersions // {
monitored =
final.lib.flip final.lib.concatMapAttrs prev.nixVersions (version: package:
final.lib.optionalAttrs
(final.lib.and
(final.lib.all (prefix: ! final.lib.hasPrefix prefix version)
# TODO: smarter filtering of deprecated and non-packages
[
"nix_2_4"
"nix_2_5"
"nix_2_6"
"nix_2_7"
"nix_2_8"
"nix_2_9"
"nix_2_10"
"nix_2_11"
"nix_2_12"
"nix_2_13"
"nix_2_14"
"nix_2_15"
"nix_2_16"
"nix_2_17"
"unstable"
])
(final.lib.isDerivation package))
{
# NOTE: `lib.getBin` is needed, otherwise the `-dev` output is chosen
"${version}" = final.lib.getBin (inputs.nix-monitored.packages.${final.system}.default.override {
nix = package;
nix-output-monitor = prev.nix-output-monitor;
});
}
);
};
river = prev.river.overrideAttrs (oldAttrs: rec {
xwaylandSupport = true;
});
discord = prev.discord.override {
withOpenASAR = true;
withVencord = true;
};
prismlauncher = prev.prismlauncher.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or [ ]) ++ [
./offline-mode-prism-launcher.diff
];
});
};
}

75
overlays/modifications/default.nix Normal file
View file

@ -0,0 +1,75 @@
{ inputs, ... }:
final: prev:
{
lib = prev.lib // {
maintainers = {
reo101 = {
name = "Pavel Atanasov";
email = "pavel.atanasov2001@gmail.com";
github = "reo101";
githubId = "37866329";
keys = [
{
fingerprint = "8A29 0250 C775 7813 1DD1 DC57 7275 0ABE E181 26D0";
}
];
};
};
};
nix-monitored = inputs.nix-monitored.packages.${prev.system}.default.override {
nix = prev.nix;
nix-output-monitor = prev.nix-output-monitor;
};
nixVersions = prev.nixVersions // {
monitored =
final.lib.flip final.lib.concatMapAttrs prev.nixVersions (version: package:
final.lib.optionalAttrs
(final.lib.and
(final.lib.all (prefix: ! final.lib.hasPrefix prefix version)
# TODO: smarter filtering of deprecated and non-packages
[
"nix_2_4"
"nix_2_5"
"nix_2_6"
"nix_2_7"
"nix_2_8"
"nix_2_9"
"nix_2_10"
"nix_2_11"
"nix_2_12"
"nix_2_13"
"nix_2_14"
"nix_2_15"
"nix_2_16"
"nix_2_17"
"unstable"
])
(final.lib.isDerivation package))
{
# NOTE: `lib.getBin` is needed, otherwise the `-dev` output is chosen
"${version}" = final.lib.getBin (inputs.nix-monitored.packages.${final.system}.default.override {
nix = package;
nix-output-monitor = prev.nix-output-monitor;
});
}
);
};
river = prev.river.overrideAttrs (oldAttrs: rec {
xwaylandSupport = true;
});
discord = prev.discord.override {
withOpenASAR = true;
withVencord = true;
};
prismlauncher = prev.prismlauncher.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or [ ]) ++ [
./offline-mode-prism-launcher.diff
];
});
}

0
overlays/offline-mode-prism-launcher.diff → overlays/modifications/offline-mode-prism-launcher.diff
View file