From 1f9ff3123453459672e5f8d82577c5357a79554e Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 28 Jan 2026 08:25:51 -0500 Subject: [PATCH] added vintage story flake --- flake.lock | 50 ++++++++++++++++++++++++- flake.nix | 4 +- modules/apps/gaming.nix | 10 ++++- modules/machine/cloud/configuration.nix | 13 +++++++ 4 files changed, 74 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9c3ba3b..a6aa025 100644 --- a/flake.lock +++ b/flake.lock @@ -89,6 +89,20 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A" } }, + "flake-schemas_2": { + "locked": { + "lastModified": 1761577921, + "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=", + "rev": "47849c7625e223d36766968cc6dc23ba0e135922", + "revCount": 107, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -264,6 +278,20 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1769089682, + "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", + "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", + "revCount": 906333, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.906333%2Brev-078d69f03934859a181e81ba987c2bb033eebfc5/019bebf2-031c-7119-8fdc-ce9d29d005fa/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + } + }, "root": { "inputs": { "aagl": "aagl", @@ -273,7 +301,8 @@ "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay_2", - "swaytreesave": "swaytreesave" + "swaytreesave": "swaytreesave", + "vintage-story": "vintage-story" } }, "rust-overlay": { @@ -346,6 +375,25 @@ "type": "github" } }, + "vintage-story": { + "inputs": { + "flake-schemas": "flake-schemas_2", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1769397199, + "narHash": "sha256-MSajncUGZtlpl88rqFdj42eGGyWnk2jw84VbK3AgUBA=", + "ref": "refs/heads/master", + "rev": "4d2313c50933645040a0d12556016fc2916bfa65", + "revCount": 1, + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git" + }, + "original": { + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git" + } + }, "zig": { "inputs": { "flake-compat": [ diff --git a/flake.nix b/flake.nix index 00cfd32..8308122 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,7 @@ # My personal flakes swaytreesave.url = "git+https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"; + vintage-story.url = "git+https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"; }; outputs = inputs @ { @@ -32,6 +33,7 @@ rust-overlay, aagl, swaytreesave, + vintage-story, ... }: let userName = "wyatt"; @@ -82,7 +84,7 @@ nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit userName userEmail ghostty aagl; + inherit userName userEmail ghostty aagl vintage-story; hostname = "cloud"; role = "devel"; }; diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index d65b69e..e1a2c3f 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -3,11 +3,14 @@ lib, pkgs, aagl, + vintage-story, ... }: let cfg = config.gaming; in { - imports = [ aagl.nixosModules.default ]; + imports = [ + aagl.nixosModules.default + ]; options.gaming = { steam = { @@ -142,6 +145,10 @@ in { enable = lib.mkEnableOption "Zenless Zone Zero (ZZZ) launcher"; }; }; + + vintage-story = { + enable = lib.mkEnableOption "Vintage Story client and server"; + }; }; config = let @@ -211,6 +218,7 @@ in { )) ++ (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ + (lib.optionals cfg.vintage-story.enable [vintage-story.packages.${pkgs.system}.default]) ++ (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++ (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++ (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]); diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index f88af6b..4e296b9 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -107,6 +107,7 @@ in { ffxiv.enable = true; minecraft.enable = true; aagl.anime-game-launcher.enable = true; + vintage-story.enable = true; }; # Power management (see ../../pwrMgmt/default.nix) @@ -196,5 +197,17 @@ in { scheduler = "scx_bpfland"; }; + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + obs-vaapi #optional AMD hardware acceleration + obs-gstreamer + obs-vkcapture + ]; + }; + system.stateVersion = "24.11"; }