diff --git a/machines/fuuko/README.md b/machines/fuuko/README.md index cce2f6f..d140e5a 100644 --- a/machines/fuuko/README.md +++ b/machines/fuuko/README.md @@ -9,7 +9,7 @@ lying around and it is acceptable after changing the CPU from the original Celeron. I decided not to use another consumer-grade computer for this, since the server offers ECC memory and therefore should be more reliable. -The SSD (Crucial BX500 240GB) is connected to the first drive slot in a 3.5 ″ +The SSD (Intel DC S4500 480GB) is connected to the first drive slot in a 3.5 ″ adapter. I originally wanted to connect it to the internal ODD SATA port, but since it only supports SATA2 (3Gbit/s) and does not support booting from it, requiring an additional boot drive, I decided against this. diff --git a/machines/fuuko/hardware-configuration.nix b/machines/fuuko/hardware-configuration.nix index 11ffaae..1426add 100644 --- a/machines/fuuko/hardware-configuration.nix +++ b/machines/fuuko/hardware-configuration.nix @@ -36,13 +36,13 @@ luks.devices = { root = { name = "root"; - device = "/dev/disk/by-uuid/72b59109-8df1-4fca-9b2e-d9dc973fce75"; + device = "/dev/disk/by-uuid/c5cf6858-cca0-40dc-a3b5-ab47a3f9d49c"; preLVM = true; allowDiscards = true; }; }; }; - loader.grub.device = "/dev/disk/by-id/ata-CT240BX500SSD1_2045E4C67C52"; + loader.grub.device = "/dev/disk/by-id/ata-INTEL_SSDSC2KB480G7_PHYS749202D6480BGN"; }; environment.etc.crypttab.text = '' @@ -52,12 +52,12 @@ fileSystems = { "/" = { - device = "/dev/disk/by-uuid/c45b49b9-bc3c-4e53-85ae-0d430ba1cafb"; - fsType = "ext4"; - options = [ "discard" "noatime" ]; + device = "/dev/disk/by-uuid/92a1f733-8a23-42ea-958b-0d01a5de7776"; + fsType = "btrfs"; + options = [ "compress=zstd" "discard" "noatime" ]; }; "/boot" = { - device = "/dev/disk/by-uuid/a1ceeabf-fe24-42ce-9ffc-99ebe7b97d5c"; + device = "/dev/disk/by-uuid/0f1822e1-643b-49e0-b279-5e3373c6a26c"; fsType = "ext2"; }; "/data" = { @@ -74,7 +74,7 @@ swapDevices = [ { - device = "/dev/disk/by-partuuid/e62d8794-aff9-44d0-8080-06cf4c128306"; + device = "/dev/disk/by-partuuid/22978e17-fbbf-4879-9385-5c9473df1706"; randomEncryption.enable = true; } ]; diff --git a/machines/fuuko/services/prometheus.nix b/machines/fuuko/services/prometheus.nix index 0835369..9a976a6 100644 --- a/machines/fuuko/services/prometheus.nix +++ b/machines/fuuko/services/prometheus.nix @@ -6,16 +6,6 @@ let mkStaticTarget = target: mkStaticTargets (lib.singleton target); in { - systemd.mounts = lib.singleton { - after = [ "data.mount" ]; - before = [ "prometheus.service" ]; - wantedBy = [ "local-fs.target" ]; - what = "/data/prometheus"; - where = config.systemd.services.prometheus.serviceConfig.WorkingDirectory; - type = "none"; - options = "bind"; - }; - services.prometheus = { enable = true; listenAddress = "127.0.0.1";