Testing
This commit is contained in:
parent
64f4294653
commit
97244daf26
2 changed files with 7 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
|||
{ lib ? lib, self, inputs, outputs, stateVersion, hmStateVersion , ... }: {
|
||||
{ config, lib ? lib, self, inputs, outputs, stateVersion, hmStateVersion , ... }: {
|
||||
deploy = {
|
||||
hostname,
|
||||
system ? "x86_64-linux",
|
||||
|
@ -42,6 +42,7 @@
|
|||
unfree ? false,
|
||||
ip ? null,
|
||||
ephemeral ? false,
|
||||
timezone ? config.time.timeZone,
|
||||
deployment_type ? "containers", # Currently used to change where secrets are searched for
|
||||
pkgs ? let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs,
|
||||
pkgs-unstable ? let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs-unstable,
|
||||
|
@ -57,15 +58,15 @@
|
|||
localAddress = "192.168.2.${ip}";
|
||||
restartIfChanged = true;
|
||||
enableTun = true;
|
||||
specialArgs = { inherit pkgs-unstable hostname username desktop theme system repo unfree stateVersion ip deployment_type host; };
|
||||
config = { hostname, username, desktop, theme, system, stateVersion, host, ... }: {
|
||||
specialArgs = { inherit pkgs-unstable hostname username desktop theme system repo unfree stateVersion ip deployment_type host timezone; };
|
||||
config = { hostname, username, desktop, theme, system, stateVersion, host, timezone, ... }: {
|
||||
nixpkgs.pkgs = pkgs;
|
||||
|
||||
imports = [
|
||||
../nixos/containers
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
inputs.home-manager.nixosModules.home-manager {
|
||||
home-manager.extraSpecialArgs = { inherit host inputs outputs desktop hostname username hmStateVersion stateVersion system theme ; };
|
||||
home-manager.extraSpecialArgs = { inherit host inputs outputs desktop hostname username hmStateVersion stateVersion system theme timezone ; };
|
||||
home-manager.users."${username}" = import ../home-manager;
|
||||
}
|
||||
];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, host, ip, stateVersion, hostname, ... }: {
|
||||
{ timezone, host, ip, stateVersion, hostname, ... }: {
|
||||
imports = [
|
||||
./${hostname}
|
||||
# Modules
|
||||
|
@ -25,7 +25,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
time.timeZone = "UTC";
|
||||
time.timeZone = timezone;
|
||||
boot.isContainer = true;
|
||||
system.stateVersion = stateVersion;
|
||||
networking.hostName = "${hostname}-${host}";
|
||||
|
|
Loading…
Add table
Reference in a new issue