diff --git a/containers/garnet/configuration.nix b/containers/garnet/configuration.nix index ff514e8..4f09e34 100644 --- a/containers/garnet/configuration.nix +++ b/containers/garnet/configuration.nix @@ -1,20 +1,10 @@ { ... }: { system.stateVersion = "25.11"; fileSystems."/var/lib/opencloud" = { - device = "/flower/data"; + device = "/persist/opencloud"; fsType = "none"; options = [ "bind" ]; }; - fileSystems."/etc/opencloud" = { - device = "/persist/cfg"; - fsType = "none"; - options = [ "bind" ]; - }; - # TODO: hardcoded address - networking.extraHosts = '' - 100.67.2.1 cloud.lava.moe - ''; - networking.firewall.allowedTCPPorts = [ 9200 ]; networking.firewall.allowedUDPPorts = [ 9200 ]; diff --git a/containers/garnet/flake.nix b/containers/garnet/flake.nix index 93c3304..29540db 100644 --- a/containers/garnet/flake.nix +++ b/containers/garnet/flake.nix @@ -41,12 +41,12 @@ proxyPass = "http://${client4}:9200"; proxyWebsockets = true; }; - # TODO: hardcoded address listenAddresses = [ "100.67.2.1" ]; }; systemd.tmpfiles.rules = [ "d /persist/containers/${name} 755 root users" + "d /persist/flower 755 root users" ]; containers.${name} = { autoStart = true; @@ -67,7 +67,7 @@ isReadOnly = false; }; bindMounts."content" = { - hostPath = "/flower/opencloud"; + hostPath = "/persist/flower"; mountPoint = "/flower"; isReadOnly = false; }; diff --git a/hosts/alyssum/filesystem.nix b/hosts/alyssum/filesystem.nix index bdea423..205106a 100644 --- a/hosts/alyssum/filesystem.nix +++ b/hosts/alyssum/filesystem.nix @@ -26,7 +26,6 @@ in { }; "/boot" = mkLabelMount "stem" "vfat"; - "/flower" = mkBtrfsMount "myosotis" "/@" true; "/nix" = submount "/@/nix" false; "/persist" = (submount "/@/persist" true) // { neededForBoot = true; }; "/persist/.snapshots" = submount "/snap/persist" false;