Move settings to an input
This commit is contained in:
parent
1202eac75c
commit
c1c71871f3
4 changed files with 10 additions and 13 deletions
|
@ -1,11 +1,10 @@
|
|||
{ config
|
||||
, pkgs
|
||||
, inputs
|
||||
, settings
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
settings = import ./settings.nix { };
|
||||
|
||||
elementClient = pkgs.element-web.override {
|
||||
conf = {
|
||||
default_server_config.default_server_name = "catnip.ee";
|
||||
|
|
|
@ -3,12 +3,9 @@
|
|||
, inputs
|
||||
, system
|
||||
, lib
|
||||
, settings
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
settings = import ./settings.nix { };
|
||||
in
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./containers.nix
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
{ ... }:
|
||||
let
|
||||
settings = import ./settings.nix { };
|
||||
in
|
||||
{
|
||||
{ settings
|
||||
, ...
|
||||
}: {
|
||||
virtualisation.oci-containers = {
|
||||
backend = "docker";
|
||||
containers = {
|
||||
|
|
|
@ -19,7 +19,10 @@
|
|||
} @ inputs: {
|
||||
nixosConfigurations.server = nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs system; };
|
||||
specialArgs = {
|
||||
inherit inputs system;
|
||||
settings = import ./settings.nix { };
|
||||
};
|
||||
modules = [ ./configuration.nix ];
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue