From 8ef843fa94071b7f55584fba550b7602fe84e0d9 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sun, 24 Aug 2025 20:55:23 +0800 Subject: [PATCH] First docker changes --- hosts/musicbrainz/default.nix | 18 ++++++++++-------- suites/server/docker/default.nix | 16 ++++++++++------ suites/server/vm/default.nix | 5 +---- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/hosts/musicbrainz/default.nix b/hosts/musicbrainz/default.nix index fd44584..b529bd9 100644 --- a/hosts/musicbrainz/default.nix +++ b/hosts/musicbrainz/default.nix @@ -1,18 +1,20 @@ -{pkgs, ...}: { +{pkgs, ...}: let + rootDisk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi2"; + rootPart = "/dev/disk/by-uuid/0804a690-0dbe-493d-9f2c-5db091569649"; + dockerPart = "/dev/disk/by-uuid/0eb05c79-7765-4b7e-bf22-c3a53f516db5"; +in { + boot.loader.grub.device = rootDisk; + fileSystems."/" = { - device = "/dev/disk/by-uuid/5d71cc16-f1ee-4b87-87b2-00fdf98442bd"; + device = rootPart; fsType = "ext4"; }; - fileSystems."/home/fern/docker/data" = { - device = "/dev/disk/by-uuid/0eb05c79-7765-4b7e-bf22-c3a53f516db5"; + fileSystems."/home/fern/docker" = { + device = dockerPart; fsType = "ext4"; }; - swapDevices = [ - {device = "/dev/disk/by-uuid/b2456f94-1a8b-4de4-bd49-a9909d7487ec";} - ]; - # Update Musicbrainz search indexes once a week. systemd.timers."musicbrainz-update-indexes" = { wantedBy = ["timers.target"]; diff --git a/suites/server/docker/default.nix b/suites/server/docker/default.nix index 4e43145..af46ad8 100644 --- a/suites/server/docker/default.nix +++ b/suites/server/docker/default.nix @@ -7,12 +7,16 @@ # Enable docker. virtualisation.docker = { enable = true; + autoPrune.enable = true; liveRestore = true; - daemon.settings.default-address-pools = [ - { - base = "172.20.0.0/12"; - size = 24; - } - ]; + daemon.settings = { + data-root = "/home/fern/docker/daemon"; + default-address-pools = [ + { + base = "172.20.0.0/12"; + size = 24; + } + ]; + }; }; } diff --git a/suites/server/vm/default.nix b/suites/server/vm/default.nix index 1cfb78f..22b57e7 100644 --- a/suites/server/vm/default.nix +++ b/suites/server/vm/default.nix @@ -16,10 +16,7 @@ boot.kernelModules = ["kvm-intel"]; # Configure the bootloader. - boot.loader.grub = { - enable = true; - device = "/dev/sda"; - }; + boot.loader.grub.enable = true; # Enable QEMU guest agent services.qemuGuest.enable = true;