add containers to merlin
This commit is contained in:
parent
b79add0811
commit
ca31181af0
|
@ -42,6 +42,15 @@ in {
|
||||||
|
|
||||||
# Import optional options
|
# Import optional options
|
||||||
../common/optional/openssh.nix
|
../common/optional/openssh.nix
|
||||||
|
../common/optional/restic-backup.nix
|
||||||
|
../common/optional/docker.nix
|
||||||
|
../common/optional/nix-ld.nix
|
||||||
|
|
||||||
|
# Nixos containers
|
||||||
|
../common/optional/nixos-containers/docker.nix
|
||||||
|
../common/optional/nixos-containers/baseddata-worker.nix
|
||||||
|
../common/optional/nixos-containers/pihole.nix
|
||||||
|
../common/optional/nixos-containers/semitamaps-worker.nix
|
||||||
|
|
||||||
# This machine is used for remote building
|
# This machine is used for remote building
|
||||||
../common/optional/distributed-builds/remote-builder-machine.nix
|
../common/optional/distributed-builds/remote-builder-machine.nix
|
||||||
|
@ -57,6 +66,16 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSystems."/mnt/main-ssd" = {
|
||||||
|
device = "/dev/disk/by-uuid/ba884006-e813-4b67-9fe6-62aea08b3b59";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/mnt/btcnode" = {
|
||||||
|
device = "/dev/disk/by-uuid/1dc56ec7-322f-44be-b6ad-79360fdfef93";
|
||||||
|
fsType = "btrfs";
|
||||||
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "merlin";
|
hostName = "merlin";
|
||||||
nameservers = ["${piholeIp}" "${gatewayIp}" "8.8.8.8"];
|
nameservers = ["${piholeIp}" "${gatewayIp}" "8.8.8.8"];
|
||||||
|
@ -80,6 +99,7 @@ in {
|
||||||
environment.persistence."/persist" = {
|
environment.persistence."/persist" = {
|
||||||
directories = [
|
directories = [
|
||||||
"/etc/zpool"
|
"/etc/zpool"
|
||||||
|
"/var/lib/tailscale"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -88,6 +108,10 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# enable tailscale
|
||||||
|
services.tailscale.useRoutingFeatures = "server";
|
||||||
|
services.tailscale.enable = true;
|
||||||
|
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||||
builtins.elem (lib.getName pkg) [
|
builtins.elem (lib.getName pkg) [
|
||||||
"nvidia-x11"
|
"nvidia-x11"
|
||||||
|
@ -115,11 +139,6 @@ in {
|
||||||
user = "admin";
|
user = "admin";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/mnt/btcnode" = {
|
|
||||||
device = "/dev/disk/by-uuid/1dc56ec7-322f-44be-b6ad-79360fdfef93";
|
|
||||||
fsType = "btrfs";
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.supportedFilesystems = ["zfs"];
|
boot.supportedFilesystems = ["zfs"];
|
||||||
boot.zfs.forceImportRoot = false;
|
boot.zfs.forceImportRoot = false;
|
||||||
networking.hostId = "18aec5d7";
|
networking.hostId = "18aec5d7";
|
||||||
|
|
Loading…
Reference in New Issue