mirror of
https://github.com/SebastianStork/nixos-config.git
synced 2026-03-23 13:28:27 +01:00
Compare commits
2 commits
27b5c57023
...
feaf941082
| Author | SHA1 | Date | |
|---|---|---|---|
| feaf941082 | |||
| a14692c6d6 |
8 changed files with 13 additions and 14 deletions
|
|
@ -37,7 +37,6 @@
|
||||||
services = {
|
services = {
|
||||||
auto-gc.enable = true;
|
auto-gc.enable = true;
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
nebula.enable = true;
|
|
||||||
sshd.enable = true;
|
sshd.enable = true;
|
||||||
syncthing = {
|
syncthing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -24,14 +24,10 @@ _: {
|
||||||
|
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|
||||||
services = {
|
|
||||||
fstrim.enable = true;
|
|
||||||
|
|
||||||
# Prevent immediate wake-up from suspend caused by the logi bolt receiver
|
# Prevent immediate wake-up from suspend caused by the logi bolt receiver
|
||||||
udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
ACTION=="add" SUBSYSTEM=="pci" ATTR{vendor}=="0x1022" ATTR{device}=="0x43ee" ATTR{power/wakeup}="disabled"
|
ACTION=="add" SUBSYSTEM=="pci" ATTR{vendor}=="0x1022" ATTR{device}=="0x43ee" ATTR{power/wakeup}="disabled"
|
||||||
'';
|
'';
|
||||||
};
|
|
||||||
|
|
||||||
hardware.fancontrol = {
|
hardware.fancontrol = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,6 @@
|
||||||
auto-gc.enable = true;
|
auto-gc.enable = true;
|
||||||
bluetooth.enable = true;
|
bluetooth.enable = true;
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
nebula.enable = true;
|
|
||||||
sshd.enable = true;
|
sshd.enable = true;
|
||||||
syncthing = {
|
syncthing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@
|
||||||
onlyCleanRoots = true;
|
onlyCleanRoots = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nebula.enable = true;
|
|
||||||
sshd.enable = true;
|
sshd.enable = true;
|
||||||
dns.enable = true;
|
dns.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,6 @@
|
||||||
onlyCleanRoots = true;
|
onlyCleanRoots = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nebula.enable = true;
|
|
||||||
sshd.enable = true;
|
sshd.enable = true;
|
||||||
dns.enable = true;
|
dns.enable = true;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,6 @@
|
||||||
onlyCleanRoots = true;
|
onlyCleanRoots = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nebula.enable = true;
|
|
||||||
sshd.enable = true;
|
sshd.enable = true;
|
||||||
|
|
||||||
caddy.virtualHosts."dav.${sproutedDomain}" = {
|
caddy.virtualHosts."dav.${sproutedDomain}" = {
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ in
|
||||||
prefixLength = lib.mkOption {
|
prefixLength = lib.mkOption {
|
||||||
type = lib.types.ints.between 0 32;
|
type = lib.types.ints.between 0 32;
|
||||||
default = cfg.networkCidr |> lib.splitString "/" |> lib.last |> lib.toInt;
|
default = cfg.networkCidr |> lib.splitString "/" |> lib.last |> lib.toInt;
|
||||||
|
readOnly = true;
|
||||||
};
|
};
|
||||||
domain = lib.mkOption {
|
domain = lib.mkOption {
|
||||||
type = lib.types.nonEmptyStr;
|
type = lib.types.nonEmptyStr;
|
||||||
|
|
@ -61,5 +62,10 @@ in
|
||||||
|> lib.filter (host: host.config.custom.services.dns.enable)
|
|> lib.filter (host: host.config.custom.services.dns.enable)
|
||||||
|> lib.map (host: host.config.custom.networking.overlay.address);
|
|> lib.map (host: host.config.custom.networking.overlay.address);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
implementation = lib.mkOption {
|
||||||
|
type = lib.types.enum [ "nebula" ];
|
||||||
|
default = "nebula";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,9 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.custom.services.nebula = {
|
options.custom.services.nebula = {
|
||||||
enable = lib.mkEnableOption "";
|
enable = lib.mkEnableOption "" // {
|
||||||
|
default = netCfg.overlay.implementation == "nebula";
|
||||||
|
};
|
||||||
|
|
||||||
publicKeyPath = lib.mkOption {
|
publicKeyPath = lib.mkOption {
|
||||||
type = lib.types.path;
|
type = lib.types.path;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue