mirror of
https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git
synced 2025-01-09 09:21:04 +00:00
nixosConfiguration-fun takes a set as an argument
This set must contain: - hardware-configuration - userdata (parsed)
This commit is contained in:
parent
4afa777e7c
commit
7cee132d8e
|
@ -1,7 +1,6 @@
|
||||||
{ userdata, selfprivacy-overlay, config, pkgs, lib, ... }:
|
{ userdata, selfprivacy-overlay, config, pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
|
||||||
./variables-module.nix
|
./variables-module.nix
|
||||||
./variables.nix
|
./variables.nix
|
||||||
./files.nix
|
./files.nix
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
{
|
{
|
||||||
description = "Selfprivacy NixOS configuration flake";
|
description = "SelfPrivacy NixOS configuration flake";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
#nixpkgs.url = "https://github.com/NixOS/nixpkgs/archive/eef86b8a942913a828b9ef13722835f359deef29.tar.gz";
|
|
||||||
nixpkgs.url = "github:nixos/nixpkgs";
|
nixpkgs.url = "github:nixos/nixpkgs";
|
||||||
selfprivacy-overlay.url =
|
selfprivacy-overlay.url =
|
||||||
"git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo.git";
|
"git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo.git";
|
||||||
|
@ -13,11 +12,10 @@
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations-fun = userdata: {
|
nixosConfigurations-fun = { hardware-configuration, userdata }: {
|
||||||
just-nixos = nixpkgs.lib.nixosSystem {
|
just-nixos = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = { inherit system selfprivacy-overlay userdata; };
|
specialArgs = { inherit system selfprivacy-overlay userdata; };
|
||||||
|
modules = [ hardware-configuration ./configuration.nix ];
|
||||||
modules = [ ./configuration.nix ];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue