Merge branch 'main' of github.com:JulienMalka/nix-config

This commit is contained in:
Luj 2023-08-27 14:52:54 +02:00
commit b0c575228b
Signed by: luj
GPG key ID: 6FC74C847011FD83
26 changed files with 676 additions and 523 deletions

View file

@ -3,10 +3,19 @@ inputs: final: prev:
with builtins;
let
overlay-unstable = arch: final: prev: {
unstable = inputs.unstable.legacyPackages."${arch}";
stable = inputs.nixpkgs.legacyPackages."${arch}";
};
overlay-unstable = arch: final: prev:
let
master-patched-src = (import inputs.master { system = arch; }).applyPatches {
name = "nixpkgs-patches";
src = inputs.master;
patches = [ ../patches/signal.patch ];
};
in
{
unstable = inputs.unstable.legacyPackages."${arch}";
master-patched = import master-patched-src { system = arch; };
stable = inputs.nixpkgs.legacyPackages."${arch}";
};
in
{
@ -24,6 +33,7 @@ in
inputs.simple-nixos-mailserver.nixosModule
inputs.hyprland.nixosModules.default
inputs.attic.nixosModules.atticd
inputs.lanzaboote.nixosModules.lanzaboote
inputs.nix-index-database.nixosModules.nix-index
{
home-manager.useGlobalPkgs = true;

View file

@ -42,11 +42,6 @@ inputs: lib: with lib; let
ipv4 = { public = "212.129.40.11"; vpn = "100.100.45.12"; };
ipv6 = { public = "2a01:e0a:5f9:9681:5880:c9ff:fe9f:3dfb"; vpn = "fd7a:115c:a1e0::c"; };
};
macintosh = {
arch = "aarch64-linux";
nixpkgs_version = inputs.nixos-apple-silicon.inputs.nixpkgs;
hm_version = inputs.home-manager;
};
x2100 = {
arch = "x86_64-linux";
nixpkgs_version = inputs.nixpkgs;