primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 06:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'refactor-overlays' (#14) from refactor-overlays into trunk

Browse source 
Reviewed-on: https://codeberg.org/leana8959/.files/pulls/14
This commit is contained in:
Plume 2025-05-20 18:19:21 +02:00
commit 82ae801237
12 changed files with 66 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Justfile
View file

@ -30,9 +30,8 @@ env name action profilePath="~/.environments":
drv=$(nix-build -E "
let sources = import ./nix/sources.nix {};
pkgs = import sources.nixpkgs {
overlays = [
(import ./nix/overlays)
(import ./nix/overlays/packages.nix)
overlays = with (import ../overlays); [
packages
];
};
in pkgs.callPackage ./nix/environments/{{ name }}.nix {}

6
default.nix
View file

@ -15,9 +15,5 @@
};
packages = import ./nix/packages;
overlays = {
default = import ./nix/overlays;
packages = import ./nix/overlays/packages.nix;
};
overlays = import ./nix/overlays;
}

9
nix/configurations/tungsten.nix
View file

@ -31,9 +31,12 @@ in
{
nixpkgs = {
hostPlatform = system;
overlays = map import [
../overlays
../overlays/packages.nix
overlays = with (import ../overlays); [
agenix
disko
nur
wired-notify
packages
];
# Set NIX_PATH and flake registry at the same time

12
nix/configurations/vanadium.nix
View file

@ -37,10 +37,14 @@ in
};
hostPlatform = system;
overlays = map import [
../overlays
../overlays/packages.nix
./vanadium/nixos/overlay.nix
overlays = with (import ../overlays); [
agenix
disko
nur
wired-notify
packages
(import ./vanadium/nixos/overlay.nix)
];
# Set NIX_PATH and flake registry at the same time

12
nix/overlays/by-name.nix Normal file
View file

@ -0,0 +1,12 @@
let
sources = import ../sources.nix;
lib = import (sources.nixpkgs + "/lib");
in
lib.mapAttrs
(
name: _:
import (./by-name + "/${name}/overlay.nix") {inherit sources;}
)
(
lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./by-name)
)

5
nix/overlays/by-name/agenix/overlay.nix Normal file
View file

@ -0,0 +1,5 @@
{sources}:
#
final: prev: {
inherit (final.callPackage sources.agenix {}) agenix;
}

7
nix/overlays/by-name/disko/overlay.nix Normal file
View file

@ -0,0 +1,7 @@
{sources}:
#
final: _: {
disko =
final.callPackage (sources.disko + "/package.nix")
{diskoVersion = sources.disko.version;};
}

8
nix/overlays/by-name/nur/overlay.nix Normal file
View file

@ -0,0 +1,8 @@
{sources}:
#
_: prev: {
nur = import sources.nur {
nurpkgs = prev;
pkgs = prev;
};
}

6
nix/overlays/by-name/pin-isabelle-2023/overlay.nix Normal file
View file

@ -0,0 +1,6 @@
{sources}:
#
_: _: {
# Isabelle version 2023
isabelle-2023 = (import sources.pin-isabelle {}).isabelle;
}

7
nix/overlays/by-name/pin-wireshark/overlay.nix Normal file
View file

@ -0,0 +1,7 @@
{sources}:
#
_: _: {
# Wireshark bug
# https://gitlab.com/wireshark/wireshark/-/issues/19574
inherit (import sources.pin-wireshark {}) wireshark;
}

2
nix/overlays/by-name/wired-notify/overlay.nix Normal file
View file

@ -0,0 +1,2 @@
{sources}:
(import sources.wired-notify).overlays.default

33
nix/overlays/default.nix
View file

@ -1,31 +1,2 @@
let
sources = import ../sources.nix;
lib = import (sources.nixpkgs + "/lib");
in
lib.composeManyExtensions [
(final: _: {
# Isabelle version 2023
inherit (import sources.pin-isabelle {}) isabelle;
# Wireshark bug
# https://gitlab.com/wireshark/wireshark/-/issues/19574
inherit (import sources.pin-wireshark {}) wireshark;
wallpapers = final.callPackage sources.wallpapers {};
inherit (final.callPackage sources.agenix {}) agenix;
disko =
final.callPackage (sources.disko + "/package.nix")
{diskoVersion = sources.disko.version;};
})
(_: prev: {
nur = import sources.nur {
nurpkgs = prev;
pkgs = prev;
};
})
((import sources.wired-notify).overlays.default)
]
import ./by-name.nix
// {packages = import ./packages.nix;}