Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-03-31 17:20:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: format mkmachine

Browse source
This commit is contained in:
Julien Malka 2024-05-01 19:12:07 +02:00
parent 517890762b
commit 6cb81666f2
Signed by: Luj
GPG key ID: 6FC74C847011FD83
1 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
lib/mkmachine.nix
View file

@ -1,22 +1,26 @@
inputs: lib: inputs: lib:
let let
overlay-unstable = arch: _final: _prev: overlay-unstable = arch: _final: _prev: { unstable = import inputs.unstable { system = arch; }; };
{
unstable = import inputs.unstable { system = arch; };
};
in in
{ name, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }: {
let pkgs = import nixpkgs { inherit system; }; name,
host-config,
modules,
nixpkgs ? inputs.nixpkgs,
system ? "x86_64-linux",
home-manager ? inputs.home-manager,
}:
let
pkgs = import nixpkgs { inherit system; };
in in
import "${nixpkgs}/nixos/lib/eval-config.nix" { import "${nixpkgs}/nixos/lib/eval-config.nix" {
inherit system; inherit system;
lib = pkgs.lib.extend (import ./default.nix inputs); lib = pkgs.lib.extend (import ./default.nix inputs);
specialArgs = specialArgs = {
{ inherit inputs;
inherit inputs; };
};
modules = builtins.attrValues modules ++ [ modules = builtins.attrValues modules ++ [
../machines/base.nix ../machines/base.nix
host-config host-config
@ -29,33 +33,32 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" {
(import "${inputs.buildbot-nix}/nix/worker.nix") (import "${inputs.buildbot-nix}/nix/worker.nix")
(import "${inputs.agenix}/modules/age.nix") (import "${inputs.agenix}/modules/age.nix")
(import inputs.lanzaboote).nixosModules.lanzaboote (import inputs.lanzaboote).nixosModules.lanzaboote
(import "${inputs.lix-module}/module.nix" { inherit (inputs) lix; })
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
nixpkgs.system = system;
networking.hostName = name; networking.hostName = name;
nixpkgs.overlays = [ nixpkgs.overlays = [
(overlay-unstable system) (overlay-unstable system)
(_final: prev: (_final: prev: {
{ waybar = prev.waybar.overrideAttrs (oldAttrs: {
waybar = prev.waybar.overrideAttrs (oldAttrs: { mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; });
}); # Packages comming from other repositories
# Packages comming from other repositories zotero = pkgs.wrapFirefox (pkgs.callPackage "${inputs.zotero-nix}/pkgs" { }) { };
zotero = pkgs.wrapFirefox (pkgs.callPackage "${inputs.zotero-nix}/pkgs" { }) { }; attic = pkgs.callPackage "${inputs.attic}/package.nix" { };
attic = pkgs.callPackage "${inputs.attic}/package.nix" { }; colmena = pkgs.callPackage "${inputs.colmena}/package.nix" { };
colmena = pkgs.callPackage "${inputs.colmena}/package.nix" { }; inherit (prev.unstable) bcachefs-tools;
inherit (prev.unstable) bcachefs-tools; # My own packages
# My own packages keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { }; hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
hydrasect = prev.pkgs.callPackage ../packages/hydrasect { }; })
})
]; ];
} }
]; ];
extraModules = extraModules =
let let
colmenaModules = import colmenaModules = import "${inputs.colmena}/src/nix/hive/options.nix";
"${inputs.colmena}/src/nix/hive/options.nix";
in in
[ colmenaModules.deploymentOptions ]; [ colmenaModules.deploymentOptions ];
} }