danvics/selfhostblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mod: remove system from overlays path and use module

Browse source
This commit is contained in:
ibizaman 2025-12-01 23:53:25 +01:00 committed by Pierre Penninckx
parent c10cab627f
commit bcb08761d7
4 changed files with 30 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
demo/homeassistant/flake.nix
View file

@ -19,13 +19,11 @@
basic =
{ config, ... }:
{
nixpkgs.overlays = [
selfhostblocks.overlays.${system}.default
];
imports = [
./configuration.nix
selfhostblocks.nixosModules.authelia
selfhostblocks.nixosModules.home-assistant
selfhostblocks.nixosModules.overlay
selfhostblocks.nixosModules.sops
selfhostblocks.nixosModules.ssl
sops-nix.nixosModules.default

20
demo/minimal/flake.nix
View file

@ -36,11 +36,6 @@
modules = [
selfhostblocks.nixosModules.default
filesystemModule
{
nixpkgs.overlays = [
selfhostblocks.overlays.${system}.default
];
}
# This modules showcases the use of SHB's lib.
(
{
@ -75,11 +70,6 @@
selfhostblocks.nixosModules.sops
sops-nix.nixosModules.default
filesystemModule
{
nixpkgs.overlays = [
selfhostblocks.overlays.${system}.default
];
}
# This modules showcases the use of SHB's lib.
(
{
@ -120,11 +110,6 @@
modules = [
selfhostblocks.nixosModules.default
filesystemModule
{
nixpkgs.overlays = [
selfhostblocks.overlays.${system}.default
];
}
# This modules showcases the use of SHB's lib.
(
{
@ -173,11 +158,6 @@
modules = [
selfhostblocks.nixosModules.default
filesystemModule
{
nixpkgs.overlays = [
selfhostblocks.overlays.${system}.default
];
}
# This modules showcases the use of SHB's lib.
(
{

1
demo/nextcloud/flake.nix
View file

@ -24,6 +24,7 @@
selfhostblocks.nixosModules.authelia
selfhostblocks.nixosModules.nextcloud-server
selfhostblocks.nixosModules.nginx
selfhostblocks.nixosModules.overlay
selfhostblocks.nixosModules.sops
selfhostblocks.nixosModules.ssl
sops-nix.nixosModules.default

44
flake.nix
View file

@ -62,7 +62,7 @@
inherit system;
config.allowUnfree = true;
overlays = [
self.overlays.${system}.default
self.overlays.default
];
};
@ -217,21 +217,6 @@
inherit patchNixpkgs patchedNixpkgs;
};
overlays.default = final: prev: {
# shb = self.nixosModules.lib;
prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs {
src = pkgs.fetchFromGitHub {
owner = "ibizaman";
repo = prev.prometheus-systemd-exporter.pname;
# rev = "v${prev.prometheus-systemd-exporter.version}";
rev = "next_timer";
sha256 = "sha256-jzkh/616tsJbNxFtZ0xbdBQc16TMIYr9QOkPaeQw8xA=";
};
vendorHash = "sha256-4hsQ1417jLNOAqGkfCkzrmEtYR4YLLW2j0CiJtPg6GI=";
};
};
checks =
let
inherit (pkgs.lib)
@ -385,6 +370,13 @@
nixosModules.default = {
imports = [
# We cannot use self.nixosModules.overlay otherwise it leeds to infinite recursion.
{
nixpkgs.overlays = [
self.overlays.default
];
}
# blocks
self.nixosModules.authelia
self.nixosModules.borgbackup
@ -420,6 +412,11 @@
];
};
nixosModules.overlay = {
nixpkgs.overlays = [
self.overlays.default
];
};
nixosModules.lib = lib/module.nix;
nixosModules.authelia = modules/blocks/authelia.nix;
@ -453,5 +450,20 @@
nixosModules.paperless = modules/services/paperless.nix;
nixosModules.pinchflat = modules/services/pinchflat.nix;
nixosModules.vaultwarden = modules/services/vaultwarden.nix;
overlays.default = final: prev: {
# shb = self.nixosModules.lib;
prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs {
src = final.fetchFromGitHub {
owner = "ibizaman";
repo = prev.prometheus-systemd-exporter.pname;
# rev = "v${prev.prometheus-systemd-exporter.version}";
rev = "next_timer";
sha256 = "sha256-jzkh/616tsJbNxFtZ0xbdBQc16TMIYr9QOkPaeQw8xA=";
};
vendorHash = "sha256-4hsQ1417jLNOAqGkfCkzrmEtYR4YLLW2j0CiJtPg6GI=";
};
};
};
}