diff --git a/modules/home/gui/apps/messaging/vesktop/default.nix b/modules/home/gui/apps/messaging/vesktop/default.nix index 1972a08..c977c79 100755 --- a/modules/home/gui/apps/messaging/vesktop/default.nix +++ b/modules/home/gui/apps/messaging/vesktop/default.nix @@ -6,7 +6,7 @@ { home.packages = builtins.attrValues { inherit (pkgs) - zoom-us + discord ; }; diff --git a/modules/nixos/guests/firefly-iii/default.nix b/modules/nixos/guests/firefly-iii/default.nix index fcf3188..d517e38 100755 --- a/modules/nixos/guests/firefly-iii/default.nix +++ b/modules/nixos/guests/firefly-iii/default.nix @@ -221,14 +221,6 @@ in }; }; - users.users.caddy.extraGroups = [ "acme" ]; - - security.acme.certs."${host}" = { - dnsProvider = dns; - environmentFile = config.sops.secrets.${dnsPath}.path; - group = "caddy"; - }; - systemd.tmpfiles.rules = [ "d ${serviceCfg.mntPaths.path0} 0751 microvm wheel - -" "d ${serviceCfg.mntPaths.path0}/data 0751 microvm wheel - -" @@ -253,6 +245,15 @@ in ] ); }; + + users.users.caddy.extraGroups = [ "acme" ]; + + security.acme.certs."${host}" = { + dnsProvider = dns; + environmentFile = config.sops.secrets.${dnsPath}.path; + group = "caddy"; + }; + services.caddy.virtualHosts."${host}" = { extraConfig = '' reverse_proxy http://${serviceCfg.interface.ip}:80 { diff --git a/modules/nixos/guests/minecraft/world0/default.nix b/modules/nixos/guests/minecraft/world0/default.nix index ec77478..7a2b15c 100755 --- a/modules/nixos/guests/minecraft/world0/default.nix +++ b/modules/nixos/guests/minecraft/world0/default.nix @@ -44,12 +44,13 @@ in motd = "A cool Minecraft server powered by NixOS"; online-mode = true; pvp = true; + server-ip = hostCfg.localhost.address1; server-port = serviceCfg.ports.port0; spawn-animals = true; spawn-monsters = true; spawn-npcs = true; spawn-protection = 16; - view-dtstance = 32; + view-distance = 32; white-list = true; }; whitelist = { @@ -182,4 +183,6 @@ in mode = "0600"; }; }; + + networking.firewall.allowedTCPPorts = [ serviceCfg.ports.port0 ]; } diff --git a/modules/nixos/services/samba/sambaCeres/default.nix b/modules/nixos/services/samba/sambaCeres/default.nix index 65c86f2..868b793 100755 --- a/modules/nixos/services/samba/sambaCeres/default.nix +++ b/modules/nixos/services/samba/sambaCeres/default.nix @@ -27,6 +27,19 @@ in "force create mode" = "0664"; "force directory mode" = "0775"; }; + "storage0" = { + path = "/mnt/storage"; + browseable = "yes"; + writeable = "yes"; + "guest ok" = "no"; + "create mask" = "0664"; + "directory mask" = "0775"; + "force user" = "microvm"; + "force group" = "wheel"; + "force create mode" = "0664"; + "force directory mode" = "0775"; + }; + }; }; }; diff --git a/systems/mars/config/filesystem.nix b/systems/mars/config/filesystem.nix index 7b5bbdc..e3c85b9 100755 --- a/systems/mars/config/filesystem.nix +++ b/systems/mars/config/filesystem.nix @@ -26,6 +26,7 @@ in ]; ceresFolders = [ "storage" + "storage0" ]; storageMounts = storageDrive: { name = "${mars.${storageDrive}.mount}";