From 51ff02f9d37eafc7982b13baa2557c8c7dd75373 Mon Sep 17 00:00:00 2001 From: jz8132543 Date: Wed, 6 Nov 2024 02:45:38 +0800 Subject: [PATCH] fix: remove dst --- home-manager/modules/desktop/gnome.nix | 1 - nixos/hosts/isk/_steam/default.nix | 2 +- .../isk/_steam/dst/Caves/worldgenoverride.lua | 6 -- .../_steam/dst/Master/worldgenoverride.lua | 4 - nixos/hosts/isk/_steam/dst/default.nix | 90 ------------------- nixos/hosts/isk/_steam/dst/modoverrides.lua | 20 ----- 6 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 nixos/hosts/isk/_steam/dst/Caves/worldgenoverride.lua delete mode 100644 nixos/hosts/isk/_steam/dst/Master/worldgenoverride.lua delete mode 100644 nixos/hosts/isk/_steam/dst/default.nix delete mode 100644 nixos/hosts/isk/_steam/dst/modoverrides.lua diff --git a/home-manager/modules/desktop/gnome.nix b/home-manager/modules/desktop/gnome.nix index e5a614a9..9e528d41 100644 --- a/home-manager/modules/desktop/gnome.nix +++ b/home-manager/modules/desktop/gnome.nix @@ -44,7 +44,6 @@ in ++ (with pkgs; [ blackbox-terminal dolphin - k3b orchis-theme ]); diff --git a/nixos/hosts/isk/_steam/default.nix b/nixos/hosts/isk/_steam/default.nix index 58839779..75a45317 100644 --- a/nixos/hosts/isk/_steam/default.nix +++ b/nixos/hosts/isk/_steam/default.nix @@ -8,7 +8,7 @@ let in { imports = [ - ./dst + # ./dst ]; programs.steam.enable = true; diff --git a/nixos/hosts/isk/_steam/dst/Caves/worldgenoverride.lua b/nixos/hosts/isk/_steam/dst/Caves/worldgenoverride.lua deleted file mode 100644 index 040b4311..00000000 --- a/nixos/hosts/isk/_steam/dst/Caves/worldgenoverride.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - override_enabled = true, - worldgen_preset = "DST_CAVE", - settings_preset = "DST_CAVE", - overrides = {}, -} diff --git a/nixos/hosts/isk/_steam/dst/Master/worldgenoverride.lua b/nixos/hosts/isk/_steam/dst/Master/worldgenoverride.lua deleted file mode 100644 index 42012250..00000000 --- a/nixos/hosts/isk/_steam/dst/Master/worldgenoverride.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - override_enabled = true, - overrides = {}, -} diff --git a/nixos/hosts/isk/_steam/dst/default.nix b/nixos/hosts/isk/_steam/dst/default.nix deleted file mode 100644 index 4eb92938..00000000 --- a/nixos/hosts/isk/_steam/dst/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ - config, - pkgs, - ... -}: -let - gameHome = config.users.users.steam.home; - dstRoot = "Games/dst"; - dstAppDir = "${dstRoot}/app"; - dstApp = "343050"; - dstStorageDir = "${dstRoot}/storage"; - dstConfigDirName = "config"; - dstClusterName = "Main"; - dstClusterDir = "${dstStorageDir}/${dstConfigDirName}/${dstClusterName}"; - dstTTYCaves = "${dstRoot}/tty-caves"; - dstTTYMaster = "${dstRoot}/tty-master"; - dstRunnigIndicator = "${dstRoot}/running"; - stopScript = pkgs.writeShellScript "dst-stop" '' - echo "write c_shutdown(true)" - echo "c_shutdown(true)" > "${gameHome}/${dstTTYCaves}" - echo "c_shutdown(true)" > "${gameHome}/${dstTTYMaster}" - while [ -f "${gameHome}/${dstRunnigIndicator}" ]; do sleep 1; done - echo "shutdown done" - ''; -in -{ - home-manager.users.steam = { - home.global-persistence.directories = [ - dstRoot - ]; - }; - systemd.services.dst = { - script = '' - # install game - steamcmd \ - +force_install_dir "${gameHome}/${dstAppDir}" \ - +login anonymous \ - +app_update "${dstApp}" validate \ - +quit - - # install modes - echo "ServerModCollectionSetup(\"2785301768\")" \ - >> "${gameHome}/${dstAppDir}/mods/dedicated_server_mods_setup.lua" - # modify settings - cp ${./modoverrides.lua} "${gameHome}/${dstClusterDir}/Master/modoverrides.lua" - cp ${./modoverrides.lua} "${gameHome}/${dstClusterDir}/Caves/modoverrides.lua" - cp ${./Master/worldgenoverride.lua} "${gameHome}/${dstClusterDir}/Master/worldgenoverride.lua" - cp ${./Caves/worldgenoverride.lua} "${gameHome}/${dstClusterDir}/Caves/worldgenoverride.lua" - - # create running indicator - touch "${gameHome}/${dstRunnigIndicator}" - - # start server - cd "${gameHome}/${dstAppDir}/bin64" - run_shared=(steam-run) - run_shared+=(./dontstarve_dedicated_server_nullrenderer_x64) - run_shared+=(-persistent_storage_root "${gameHome}/${dstStorageDir}") - run_shared+=(-conf_dir "${dstConfigDirName}") - run_shared+=(-cluster "${dstClusterName}") - run_shared+=(-monitor_parent_process $$) - socat pty,link="${gameHome}/${dstTTYCaves}",raw STDOUT | \ - "''${run_shared[@]}" -shard Caves -console | sed --unbuffered 's/^/Caves: /' & - socat pty,link="${gameHome}/${dstTTYMaster}",raw STDOUT | \ - "''${run_shared[@]}" -shard Master -console | sed --unbuffered 's/^/Master: /' & - - wait - - # delete running indicator - rm "${gameHome}/${dstRunnigIndicator}" - ''; - path = with pkgs; [ - steamcmd - steam-run - socat - ]; - serviceConfig = { - User = "steam"; - Group = "steam"; - ExecStop = stopScript; - CPUQuota = "300%"; # at most 1.5 core (2 cores in total) - }; - # environment = - # lib.mkIf (config.networking.fw-proxy.enable) - # config.networking.fw-proxy.environment; - wantedBy = [ "multi-user.target" ]; - }; - networking.firewall.allowedUDPPorts = [ - 10999 - ]; -} diff --git a/nixos/hosts/isk/_steam/dst/modoverrides.lua b/nixos/hosts/isk/_steam/dst/modoverrides.lua deleted file mode 100644 index 40c6e9ad..00000000 --- a/nixos/hosts/isk/_steam/dst/modoverrides.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - --# Health Info - ["workshop-375859599"] = { enabled = true }, - --# Show Me - ["workshop-2287303119"] = { enabled = true }, - --# No Thermal Stone Durability - ["workshop-466732225"] = { enabled = true }, - --# Extra Equip Slots - ["workshop-375850593"] = { enabled = true }, - --# Display Attack Range - ["workshop-2078243581"] = { enabled = true }, - --# Increased Stack size - ["workshop-374550642"] = { enabled = true }, - --# Combined Status - ["workshop-376333686"] = { enabled = true }, - --# Global Positions - ["workshop-378160973"] = { enabled = true }, - --# Demon sword Muramasa - ["workshop-1842087172"] = { enabled = true }, -}