real commit this time

Revert "modified gaming apps"
This reverts commit 67fda15ca9.
2026-02-15 19:05:42 -05:00 · 2026-02-15 18:52:30 -05:00 · 2026-02-15 18:51:41 -05:00 · 2026-02-15 18:31:15 -05:00 · 2026-02-15 22:49:56 +00:00 · 2026-02-14 19:21:25 -05:00
11 changed files with 297 additions and 37 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1765900816,
-        "narHash": "sha256-Pa7QpF+84hTuPanVaJ/B3NgdaytUMj3PN06sEaNibaM=",
+        "lastModified": 1767520119,
+        "narHash": "sha256-+OmNQLA9Fv5WBaxYHlPghS9XmnYWDaLt+AatCGhG+hc=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "36b14e5e7014e471341f0807dc9a9e2d65a157f4",
+        "rev": "5720d3282844b6b23b26dfac075a5f1f58ea8844",
        "type": "github"
      },
      "original": {
@@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765066094,
-        "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=",
+        "lastModified": 1767634391,
+        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "688427b1aab9afb478ca07989dc754fa543e03d5",
+        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
        "type": "github"
      },
      "original": {
@@ -75,6 +75,34 @@
        "type": "github"
      }
    },
+    "flake-schemas": {
+      "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-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"
@@ -103,11 +131,11 @@
        "zon2nix": "zon2nix"
      },
      "locked": {
-        "lastModified": 1765908726,
-        "narHash": "sha256-tUvTIxhD2aGbyBQgDXknoKWQpuNrgt9TrGQaV9q1WOQ=",
+        "lastModified": 1769985646,
+        "narHash": "sha256-ubfC9fLfdQ0xpQuFmGQCYIRyEEmOzXd+ya5rShM217k=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "67eb4805779a80bfe2d9ac5a67f19b89f4e67b16",
+        "rev": "769fff5dfb322594c0dc7a379ee70897a7db773f",
        "type": "github"
      },
      "original": {
@@ -124,16 +152,15 @@
        ]
      },
      "locked": {
-        "lastModified": 1755776884,
-        "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=",
+        "lastModified": 1768068402,
+        "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86",
+        "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -145,11 +172,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765859973,
-        "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=",
+        "lastModified": 1769580047,
+        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8",
+        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
        "type": "github"
      },
      "original": {
@@ -193,11 +220,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1763191728,
-        "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=",
-        "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
+        "lastModified": 1768032153,
+        "narHash": "sha256-zvxtwlM8ZlulmZKyYCQAPpkm5dngSEnnHjmjV7Teloc=",
+        "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre925418.3146c6aa9995/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
@@ -206,11 +233,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1765762245,
-        "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
+        "lastModified": 1769900590,
+        "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
+        "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646",
        "type": "github"
      },
      "original": {
@@ -236,6 +263,34 @@
        "type": "github"
      }
    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1766201043,
+        "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
+        "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
+        "revCount": 904049,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.904049%2Brev-b3aad468604d3e488d627c0b43984eb60e75e782/019b3f6c-8b33-7edb-b858-9979590f270b/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "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",
@@ -244,7 +299,9 @@
        "home-manager": "home-manager_2",
        "nix-flatpak": "nix-flatpak",
        "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay_2"
+        "rust-overlay": "rust-overlay_2",
+        "swaytreesave": "swaytreesave",
+        "vintage-story": "vintage-story"
      }
    },
    "rust-overlay": {
@@ -270,11 +327,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1765852971,
-        "narHash": "sha256-rQdOMqfQNhcfqvh1dFIVWh09mrIWwerUJqqBdhIsf8g=",
+        "lastModified": 1769915446,
+        "narHash": "sha256-f1F/umtX3ZD7fF9DHSloVHc0mnAT0ry0YK2jI/6E0aI=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "5f98ccecc9f1bc1c19c0a350a659af1a04b3b319",
+        "rev": "bc00300f010275e46feb3c3974df6587ff7b7808",
        "type": "github"
      },
      "original": {
@@ -283,6 +340,25 @@
        "type": "github"
      }
    },
+    "swaytreesave": {
+      "inputs": {
+        "flake-schemas": "flake-schemas",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1767148467,
+        "narHash": "sha256-W0O7SWq8ucokt4ctEAEvRvNoSM/oF7fBfb2kTN+lwTs=",
+        "ref": "refs/heads/master",
+        "rev": "0f4bb9bb450b28aa4f29d5eb2062deac6c26687a",
+        "revCount": 4,
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
+      }
+    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@@ -298,6 +374,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": [
@@ -335,17 +430,17 @@
        ]
      },
      "locked": {
-        "lastModified": 1758405547,
-        "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
+        "lastModified": 1768231828,
+        "narHash": "sha256-wL/8Iij4T2OLkhHcc4NieOjf7YeJffaUYbCiCqKv/+0=",
        "owner": "jcollie",
        "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
+        "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071",
        "type": "github"
      },
      "original": {
        "owner": "jcollie",
        "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
+        "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071",
        "type": "github"
      }
    }
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,10 @@
      url = "github:ezKEa/aagl-gtk-on-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+
+    # 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 @ {
@@ -28,12 +32,14 @@
    ghostty,
    rust-overlay,
    aagl,
+    swaytreesave,
+    vintage-story,
    ...
  }: let
    userName = "wyatt";
    userEmail = "wyatt@wyattjmiller.com";
    extraSpecialArgs = {
-      inherit userName userEmail ghostty;
+      inherit userName userEmail ghostty swaytreesave;
    };

    myOverlays = { ... }: {
@@ -78,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";
      };
@@ -156,5 +162,30 @@
      #   }
      # ];
    };
+
+    nixosConfigurations."thancred" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = {
+        inherit userName userEmail;
+        hostname = "thancred";
+        role = "server";
+      };
+      modules = [
+        myOverlays
+        ./modules/common
+        ./modules/machine/thancred
+
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
+          home-manager.users.${userName}.imports = [
+            ./home
+          ];
+        }
+      ];
+    };
  };
 }
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,6 +4,7 @@
  userName,
  userEmail,
  ghostty,
+  swaytreesave,
  ...
 }: let
  # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -13,7 +14,7 @@
  };
 in {
  # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+  imports = [
    ./atuin.nix
    ./shell.nix
    ./packages
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -1,4 +1,8 @@
-{dirs, ...}: {
+{...}: let
+  dirs = {
+    defaults = ../defaults;
+  };
+in {
  programs.neovim = {
    enable = true;
    defaultEditor = true;
--- a/home/sway.nix
+++ b/home/sway.nix
@@ -1,6 +1,7 @@
 {
  lib,
  pkgs,
+  swaytreesave,
  ...
 }: let
  dirs = {
@@ -15,6 +16,12 @@
    hash = "sha256-ZDFbI69ECsUTjbhlw2kHRufZbQMu+FQSMmncCJ5pagg=";
  };
 in {
+  imports = [
+    swaytreesave.homeManagerModules.default
+  ];
+
+  programs.swaytreesave.enable = if pkgs.stdenv.isLinux then true else false;
+
  wayland.windowManager.sway = {
    enable = pkgs.stdenv.isLinux;
    extraOptions = []; # Extra arguments to pass into sway. If sway goes haywire, we might need something in here
@@ -148,4 +155,5 @@ in {
    enable = pkgs.stdenv.isLinux;
    systemd.enable = true;
  };
+
 }
--- 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]);
--- 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)
@@ -150,7 +151,7 @@ in {
  };

  # Add username to groups "wheel" and "video" - more may be added here later
-  users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
+  users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network" "libvirtd"];

  services = {
    # Enable OpenSSH
@@ -190,5 +191,23 @@ in {
    };
  };

+  # sched_ext userspace CPU scheduling stuff - idk
+  services.scx = {
+    enable = true;
+    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";
 }
--- a/modules/machine/thancred/configuration.nix
+++ b/modules/machine/thancred/configuration.nix
@@ -0,0 +1,83 @@
+{
+  pkgs,
+  userName,
+  vintage-story,
+  ...
+}: {
+  imports = [
+    ../../pwrMgmt
+    ../../networking/core.nix
+    ../../virtualization/podman.nix
+  ];
+
+  # Enable flakes for NixOS
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+
+  # Custom kernel/boot stuff
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # Set your timezone
+  time.timeZone = "America/Detroit";
+
+  # Enable OpenSSH
+  services.openssh.enable = true;
+
+  # Enable keyring
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable GnuPG
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # Enable SUID wrappers (some programs need them)
+  programs.mtr.enable = true;
+
+  # Enable Polkit
+  security.polkit.enable = true;
+
+  # Power management (see ../../pwrMgmt/default.nix)
+  pwrMgmt = {
+    enable = true;
+    cpuFreqGovernor = "performance";
+    powertop.enable = false;
+  };
+
+  network = {
+    firewall = {
+      enable = true;
+      tcpPorts = {
+        allowedPorts = [ 42420 ];
+      };
+      udpPorts = {
+        allowedPorts = [ 42420 ];
+      };
+    };
+    networkManager.enable = true;
+  };
+
+  environment.systemPackages = [
+    vintage-story.packages.${pkgs.system}.default
+  ];
+
+  # Podman module (see ../../virtualization/podman.nix)
+  # podman = {
+  #   enable = true;
+  #   extraPackages = with pkgs; [
+  #     docker-credential-helpers
+  #     toolbox
+  #     cosign
+  #     crane
+  #     podman-tui
+  #     podman-desktop
+  #   ];
+  # };
+
+  # Add username to groups "wheel" and "video" - more may be added here later
+  users.users.${userName}.extraGroups = ["wheel" "podman" "network"];
+
+  system.stateVersion = "24.11";
+}
--- a/modules/machine/thancred/default.nix
+++ b/modules/machine/thancred/default.nix
@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
+}
--- a/modules/machine/thancred/hardware-configuration.nix
+++ b/modules/machine/thancred/hardware-configuration.nix
@@ -0,0 +1,3 @@
+{ ... }: {
+  # TODO: needs to filled out later
+}
--- a/modules/virtualization/hardware.nix
+++ b/modules/virtualization/hardware.nix
@@ -1,6 +1,8 @@
 { pkgs, ... }: {
  virtualisation.libvirtd.enable = true;
  programs.virt-manager.enable = true;
+  services.qemuGuest.enable = true;
+  services.spice-vdagentd.enable = true;  
  environment.systemPackages = with pkgs; [
    qemu
    quickemu
Author	SHA1	Message	Date
Wyatt J. Miller	c452ebff3c	real commit this time	2026-02-15 19:05:42 -05:00
Wyatt J. Miller	a1e71488d8	Revert "modified gaming apps" This reverts commit `67fda15ca9`.	2026-02-15 18:52:30 -05:00
Wyatt J. Miller	45c8f7ec27	Revert "added hardware config" This reverts commit `769ab6f72d`.	2026-02-15 18:51:41 -05:00
Wyatt J. Miller	67fda15ca9	modified gaming apps	2026-02-15 18:31:15 -05:00
Wyatt J. Miller	769ab6f72d	added hardware config	2026-02-15 22:49:56 +00:00
Wyatt J. Miller	1769e583d8	created vs vm	2026-02-14 19:21:25 -05:00
Wyatt J. Miller	2592a1cd72	update flake	2026-02-14 18:30:51 -05:00
Wyatt J. Miller	1f9ff31234	added vintage story flake	2026-01-28 08:25:51 -05:00
Wyatt J. Miller	be6cab1ab2	added sched_ext scx_bpfland scheduler	2026-01-24 22:33:48 -05:00
Wyatt J. Miller	7f0fdbc6bb	more hardware virtualization stuff being added in	2026-01-05 15:46:13 -05:00
Wyatt J. Miller	e3b134e48a	added swaytreesave flake, fixed manual import, fixed infinite recursion	2025-12-30 21:48:46 -05:00
Wyatt J. Miller	0fa26e2840	flake update	2025-12-28 22:17:23 -05:00
Wyatt J. Miller	adcd58dce9	Merge pull request 'Nixpkgs 25.11' (#5 ) from 25.11-move into master Reviewed-on: #5	2025-12-18 16:36:17 -06:00