diff --git a/machines/weilite/default.nix b/machines/weilite/default.nix index 6d9870a..c151e1b 100644 --- a/machines/weilite/default.nix +++ b/machines/weilite/default.nix @@ -34,7 +34,10 @@ "usb_storage" "sd_mod" ]; - kernelModules = [ "kvm-intel" ]; + kernelModules = [ + "kvm-intel" + ]; + kernelPackages = pkgs.linuxPackages_6_12; }; nixpkgs.config.allowUnfree = true; @@ -42,6 +45,7 @@ environment.systemPackages = [ pkgs.virtiofsd pkgs.intel-gpu-tools + pkgs.pciutils ]; sops = { @@ -92,18 +96,10 @@ wantedBy = [ "immich-server.service" ]; } { - what = "restic"; - where = "/var/lib/restic"; + what = "nixos"; + where = "/mnt/nixos"; type = "virtiofs"; options = "rw,nodev,nosuid"; - wantedBy = [ "restic-rest-server.service" ]; - } - { - what = "ocis"; - where = "/var/lib/ocis"; - type = "virtiofs"; - options = "rw,nodev,nosuid"; - wantedBy = [ "ocis.service" ]; } { what = "media"; @@ -111,6 +107,27 @@ type = "virtiofs"; options = "rw,nodev,nosuid"; } + { + what = "/mnt/nixos/ocis"; + where = "/var/lib/ocis"; + options = "bind"; + after = [ "mnt-nixos.mount" ]; + wantedBy = [ "ocis.service" ]; + } + { + what = "/mnt/nixos/restic"; + where = "/var/lib/restic"; + options = "bind"; + after = [ "mnt-nixos.mount" ]; + wantedBy = [ "restic-rest-server.service" ]; + } + { + what = "/mnt/nixos/immich"; + where = "/var/lib/immich"; + options = "bind"; + after = [ "mnt-nixos.mount" ]; + wantedBy = [ "immich-server.service" ]; + } ]; hardware.graphics = { diff --git a/machines/weilite/services/immich.nix b/machines/weilite/services/immich.nix index 33a98d3..0b97f5c 100644 --- a/machines/weilite/services/immich.nix +++ b/machines/weilite/services/immich.nix @@ -46,7 +46,6 @@ in services.immich = { enable = true; - mediaLocation = "/mnt/XinPhotos/immich"; host = "127.0.0.1"; port = 3001; openFirewall = true; diff --git a/modules/nixos/monitor/exporters.nix b/modules/nixos/monitor/exporters.nix index 56750ef..d0e006f 100644 --- a/modules/nixos/monitor/exporters.nix +++ b/modules/nixos/monitor/exporters.nix @@ -11,7 +11,7 @@ let in { config = { - systemd.services.tailscaled.after = + systemd.services.tailscaled.before = (lib.optional cfg.node.enable "prometheus-node-exporters.service") ++ (lib.optional cfg.blackbox.enable "prometheus-blackbox-exporters.service") ++ (lib.optional config.services.caddy.enable "caddy.service");