diff --git a/hosts/snowbelle/configuration.nix b/hosts/snowbelle/configuration.nix index 50fae27..ad7a9c6 100644 --- a/hosts/snowbelle/configuration.nix +++ b/hosts/snowbelle/configuration.nix @@ -19,7 +19,7 @@ in system = { ssh.enable = true; backups.enable = true; - backups.repo = "/holocron/backups"; + backups.repo = "/holocron/archive/devices/snowbelle"; sops.enable = true; podman.enable = true; syncthing.enable = true; diff --git a/modules/holocron/nfs/default.nix b/modules/holocron/nfs/default.nix index 8d2a43b..0e83cf7 100644 --- a/modules/holocron/nfs/default.nix +++ b/modules/holocron/nfs/default.nix @@ -10,7 +10,7 @@ let nfs_exports = '' /holocron/media *(ro,sync,no_subtree_check) ''; - #/holocron/vault *(rw,sync,no_subtree_check,no_root_squash) + #/holocron/users *(rw,sync,no_subtree_check,no_root_squash) in { options.holocron.nfs = { enable = lib.mkEnableOption "enables nfs"; diff --git a/modules/holocron/smb/default.nix b/modules/holocron/smb/default.nix index 939f5b1..1188a11 100644 --- a/modules/holocron/smb/default.nix +++ b/modules/holocron/smb/default.nix @@ -8,8 +8,14 @@ let cfg = config.holocron.smb; smb_shares = { - vault = { - path = "/holocron/vault"; + archives = { + path = "/holocron/archives"; + browseable = true; + writable = true; + guestOk = false; + }; + users = { + path = "/holocron/users"; browseable = true; writable = true; guestOk = false; diff --git a/modules/holocron/zfs/default.nix b/modules/holocron/zfs/default.nix index fefe094..fdd546d 100644 --- a/modules/holocron/zfs/default.nix +++ b/modules/holocron/zfs/default.nix @@ -32,5 +32,20 @@ in { fsType = "zfs"; options = ["nofail"]; }; + fileSystems."/holocron/archives" = { + device = "holocron/archives"; + fsType = "zfs"; + options = ["nofail"]; + }; + fileSystems."/holocron/users" = { + device = "holocron/users"; + fsType = "zfs"; + options = ["nofail"]; + }; + fileSystems."/holocron/media" = { + device = "holocron/media"; + fsType = "zfs"; + options = ["nofail"]; + }; }; } diff --git a/modules/homelab/glance/default.nix b/modules/homelab/glance/default.nix index 68d726c..a80b9a8 100644 --- a/modules/homelab/glance/default.nix +++ b/modules/homelab/glance/default.nix @@ -138,10 +138,11 @@ in type = "local"; name = "snowbelle"; hide-mountpoints-by-default = true; - mountpoints = {}; mountpoints = { - "/" = {hide = false;}; - "/holocron" = {hide = false;}; + "/" = {name = "root"; hide = false;}; + "/holocron" = {name = "holocron"; hide = false;}; + "/holocron/media" = {name = "media"; hide = false;}; + "/holocron/vault" = {name = "vault"; hide = false;}; }; } ];