From 257fab9832483cd8eea742ca5db66631f624c0bd Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 1 Nov 2025 18:46:26 -0400 Subject: [PATCH 01/22] flake update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 00a5eb6..1f9c77c 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1761172581, - "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=", + "lastModified": 1761933492, + "narHash": "sha256-DNGhpvYt6dVbkDse4s/L/jJvejvOV0bs+YWfAAskJ7g=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4", + "rev": "765ee6842930f0d6918574b9b87c2ee6583e4727", "type": "github" }, "original": { @@ -142,11 +142,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1761100675, - "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=", + "lastModified": 1761964689, + "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae", + "rev": "63d22578600f70d293aede6bc737efef60ebd97f", "type": "github" }, "original": { From 6024b77535ab2d3560a0914ef9bb24203adb0585 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 2 Nov 2025 10:25:27 -0500 Subject: [PATCH 02/22] added aagl flake, implemeneted into gaming apps module --- flake.lock | 91 ++++++++++++++++++++++--- flake.nix | 8 ++- modules/apps/gaming.nix | 31 ++++++++- modules/graphics/default.nix | 6 +- modules/machine/cloud/configuration.nix | 5 +- 5 files changed, 125 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 1f9c77c..b28b593 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "aagl": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1761836926, + "narHash": "sha256-HnNzEUuBqmJCUV/N/IbL0wFT1LHmNGWTLkUg7yRIhpY=", + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "rev": "e601b479a3d08124ee6ceea391cdc3f395aab54e", + "type": "github" + }, + "original": { + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -22,6 +44,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1747046372, @@ -57,9 +95,9 @@ }, "ghostty": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "zig": "zig", "zon2nix": "zon2nix" }, @@ -115,6 +153,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 315532800, "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", @@ -127,7 +181,7 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1758360447, "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", @@ -140,7 +194,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1761597516, "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", @@ -156,7 +210,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -174,17 +228,36 @@ }, "root": { "inputs": { + "aagl": "aagl", "darwin": "darwin", "ghostty": "ghostty", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay" + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay_2" } }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1761964689, @@ -246,7 +319,7 @@ }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1758405547, diff --git a/flake.nix b/flake.nix index 453d977..88d7dbe 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,10 @@ }; ghostty.url = "github:ghostty-org/ghostty"; rust-overlay.url = "github:oxalica/rust-overlay"; + aagl = { + url = "github:ezKEa/aagl-gtk-on-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs @ { @@ -23,6 +27,7 @@ home-manager, ghostty, rust-overlay, + aagl, ... }: let userName = "wyatt"; @@ -34,6 +39,7 @@ myOverlays = { ... }: { nixpkgs.overlays = [ rust-overlay.overlays.default + aagl.overlays.default self.common.overlays ]; }; @@ -72,7 +78,7 @@ nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit userName userEmail ghostty; + inherit userName userEmail ghostty aagl; hostname = "cloud"; role = "devel"; }; diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index 534b4e5..bf943d0 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -1,11 +1,14 @@ -{ +{ config, lib, pkgs, + aagl, ... }: let cfg = config.gaming; in { + imports = [ aagl.nixosModules.default ]; + options.gaming = { steam = { enable = lib.mkEnableOption "Steam gaming platform"; @@ -108,6 +111,16 @@ in { ffxiv = { enable = lib.mkEnableOption "Final Fantasy XIV and it's accompanied (unofficial) launcher"; }; + + aagl = { + anime-game-launcher = { + enable = lib.mkEnableOption "AAGL (legacy)"; + }; + + honkers-railway-launcher = { + enable = lib.mkEnableOption "Honkai: Star Rail launcher"; + }; + }; }; config = { @@ -139,6 +152,14 @@ in { ]; }; + programs.anime-game-launcher = lib.mkIf cfg.aagl.anime-game-launcher.enable { + enable = true; + }; + + programs.honkers-railway-launcher = lib.mkIf cfg.aagl.honkers-railway-launcher.enable { + enable = true; + }; + environment.systemPackages = (lib.optionals cfg.lutris.enable ( [cfg.lutris.package] ++ @@ -155,5 +176,13 @@ in { )) ++ (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]); + + nix.settings = (lib.mkIf + (cfg.aagl.anime-game-launcher.enable || cfg.aagl.honkers-railway-laucher.enable) + { + substituters = [ "https://ezkea.cachix.org" ]; + trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ]; + } + ); }; } diff --git a/modules/graphics/default.nix b/modules/graphics/default.nix index 1fa0335..94eeeee 100644 --- a/modules/graphics/default.nix +++ b/modules/graphics/default.nix @@ -62,9 +62,9 @@ in { (mkIf (cfg.gpuVendor == "amd") { services.xserver.videoDrivers = ["amdgpu"]; - hardware.graphics.extraPackages = with pkgs; [ - amdvlk - ]; + # hardware.graphics.extraPackages = with pkgs; [ + # amdvlk + # ]; environment.systemPackages = with pkgs; [ radeontop ]; diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index b76bbcc..74125cc 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -1,8 +1,8 @@ { - config, lib, pkgs, userName, + aagl, ... }: let flatpakPackages = [ @@ -18,7 +18,7 @@ in { imports = [ (import ../../apps/flatpak.nix { - inherit lib pkgs flatpakPackages userName; + inherit lib pkgs flatpakPackages userName aagl; }) ../../apps/gaming.nix ../../apps/appimage.nix @@ -108,6 +108,7 @@ in { ffxiv.enable = true; minecraft.enable = true; + aagl.anime-game-launcher.enable = true; }; # Power management (see ../../pwrMgmt/default.nix) From 9eea820f3b9fab9868dd5028f8a6ea8f70b233b8 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 3 Nov 2025 20:59:55 -0500 Subject: [PATCH 03/22] updated browser extensions --- home/browser.nix | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/home/browser.nix b/home/browser.nix index 9cd69e9..edc0082 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -40,14 +40,31 @@ id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn"; # sha256 = lib.fakeSha256; - version = "1.64.0"; + version = "1.67.0"; }) (createChromiumExtension { # bitwarden id = "nngceckbapebfimnlniiiahkandclblb"; sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi"; - # sha256 = lib.fakeSha256; - version = "2025.5.0"; + version = "2025.10.0"; + }) + (createChromiumExtension { + # react dev tools + id = "fmkadmapgofadopljbjfkapdkoienihi"; + sha256 = "sha256:01vy0x7hdkj4g3m2l4kw5rwldhhpkcxmd2miy5rj2dzxdnbchw2z"; + version = "7.0.1"; + }) + (createChromiumExtension { + # wappalyzer + id = "gppongmhjkpfnbhagpmjfkannfbllamg"; + sha256 = "sha256:1mi1wpm714r8yp0zh0yg6kccnld36rj4xb8j4y0c18y9176vc6wx"; + version = "6.10.86"; + }) + (createChromiumExtension { + # obsidian web clipper + id = "cnjifjpddelmedmihgijeibhnjfabmlf"; + sha256 = "sha256:0bp6g63g9hk2xbq054lpf5hzwmn73jzh3hswyjfp9r7yqj83mzgy"; + version = "0.12.0"; }) ]; }; From 7615d1a1d5f9fc8d092b923f08ce14b697669f62 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 6 Nov 2025 22:17:54 -0500 Subject: [PATCH 04/22] added browser extension --- home/browser.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/browser.nix b/home/browser.nix index edc0082..b9d15ad 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -66,6 +66,12 @@ sha256 = "sha256:0bp6g63g9hk2xbq054lpf5hzwmn73jzh3hswyjfp9r7yqj83mzgy"; version = "0.12.0"; }) + (createChromiumExtension { + # dark reader + id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; + sha256 = "sha256:06a9dz589i1da519kivzp7bljksl2xxsd151y7ww0hx28jd1694b"; + version = "4.9.113"; + }) ]; }; } From 05bb811e42c991eb8ff216e55eb4fdd6bbedad8d Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 8 Nov 2025 16:17:38 -0500 Subject: [PATCH 05/22] added every launcher that aagl has to offer added a todo comment that mentions the in-development unified launcher --- modules/apps/gaming.nix | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index bf943d0..2a1d57d 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -112,18 +112,33 @@ in { enable = lib.mkEnableOption "Final Fantasy XIV and it's accompanied (unofficial) launcher"; }; + # TODO: when aagl gets it's unified launcher all finished/in a stable state, transition to that launcher aagl = { anime-game-launcher = { - enable = lib.mkEnableOption "AAGL (legacy)"; + enable = lib.mkEnableOption "Genshin Impact launcher (legacy)"; }; honkers-railway-launcher = { enable = lib.mkEnableOption "Honkai: Star Rail launcher"; }; + + honkers-launcher = { + enable = lib.mkEnableOption "Honkai: Impact 3rd launcher"; + }; + + wavey-launcher = { + enable = lib.mkEnableOption "Wuthering Waves launcher"; + }; + + sleepy-launcher = { + enable = lib.mkEnableOption "Zenless Zone Zero (ZZZ) launcher"; + }; }; }; - config = { + config = let + agl = cfg.aagl; + in { programs.steam = lib.mkIf cfg.steam.enable { enable = true; remotePlay.openFirewall = cfg.steam.firewall.remotePlay; @@ -152,11 +167,23 @@ in { ]; }; - programs.anime-game-launcher = lib.mkIf cfg.aagl.anime-game-launcher.enable { + programs.anime-game-launcher = lib.mkIf agl.anime-game-launcher.enable { enable = true; }; - programs.honkers-railway-launcher = lib.mkIf cfg.aagl.honkers-railway-launcher.enable { + programs.honkers-railway-launcher = lib.mkIf agl.honkers-railway-launcher.enable { + enable = true; + }; + + programs.honkers-launcher = lib.mkIf agl.honkers-launcher.enable { + enable = true; + }; + + programs.wavey-launcher = lib.mkIf agl.wavey-launcher.enable { + enable = true; + }; + + programs.sleepy-launcher = lib.mkIf agl.sleepy-launcher.enable { enable = true; }; @@ -177,8 +204,10 @@ in { (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]); - nix.settings = (lib.mkIf - (cfg.aagl.anime-game-launcher.enable || cfg.aagl.honkers-railway-laucher.enable) + nix.settings = let + agl = cfg.aagl; + in (lib.mkIf + (agl.anime-game-launcher.enable || agl.honkers-railway-laucher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable) { substituters = [ "https://ezkea.cachix.org" ]; trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ]; From 1d95ffb81ac9aa4622f8c0b497d0663f2acc56f1 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 8 Nov 2025 17:25:58 -0500 Subject: [PATCH 06/22] tweaked aagl a bit --- modules/apps/gaming.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index 2a1d57d..3a544c8 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -205,7 +205,7 @@ in { (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]); nix.settings = let - agl = cfg.aagl; + inherit agl; in (lib.mkIf (agl.anime-game-launcher.enable || agl.honkers-railway-laucher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable) { From 8dd451399763d61d155698f3e4b69c943c8ce462 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 8 Nov 2025 17:26:05 -0500 Subject: [PATCH 07/22] added zathura package --- home/packages/linux.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/packages/linux.nix b/home/packages/linux.nix index eb7c33a..fcac632 100644 --- a/home/packages/linux.nix +++ b/home/packages/linux.nix @@ -13,6 +13,7 @@ pavucontrol godot aseprite + zathura gpu-screen-recorder gpu-screen-recorder-gtk # ungoogled-chromium From 43654c2946b4b0cce5fc1a7c32c2e733ac397260 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 10 Nov 2025 08:08:31 -0500 Subject: [PATCH 08/22] added helvum to packages installed --- modules/sound/pipewire.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/sound/pipewire.nix b/modules/sound/pipewire.nix index 56e3063..c08c5b3 100644 --- a/modules/sound/pipewire.nix +++ b/modules/sound/pipewire.nix @@ -1,6 +1,11 @@ -{...}: { +# TODO: refactor into module +{ pkgs, ...}: { services.pipewire = { enable = true; pulse.enable = true; }; + + environment.systemPackages = with pkgs; [ + helvum + ]; } From 14a016030933a31402474170475bdcd1c2013d4c Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 10 Nov 2025 08:09:33 -0500 Subject: [PATCH 09/22] added mangohud, vkbasalt as options to enable to apps/gaming module --- modules/apps/gaming.nix | 13 ++++++++++++- modules/machine/cloud/configuration.nix | 6 ++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index 3a544c8..b2909ef 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -65,6 +65,14 @@ in { }; }; + vkbasalt = { + enable = lib.mkEnableOption "vkBasalt/ReShade/GShade post processing shaders"; + }; + + mangohud = { + enable = lib.mkEnableOption "OpenGL/Vulkan overlay tool shown in games presenting FPS, CPU/GPU/memory utilization, load, etc."; + }; + lutris = { enable = lib.mkEnableOption "Lutris game manager and launcher"; package = lib.mkOption { @@ -202,7 +210,10 @@ in { cfg.lutris.extraPackages )) ++ (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ - (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]); + (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ + (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt 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]); nix.settings = let inherit agl; diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index 74125cc..67c14aa 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -89,8 +89,10 @@ in { localNetworkGameTransfers = true; }; }; + vkbasalt.enable = true; gamemode.enable = true; gamescope.enable = true; + mangohud.enable = true; lutris = { enable = true; wine = { @@ -100,10 +102,6 @@ in { compatibility = { protonSupport = true; }; - extraPackages = with pkgs; [ - gamemode - mangohud - ]; }; ffxiv.enable = true; From 75f08c16bcaac35c75e4ac12da0dfd6b0f02dc28 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 8 Dec 2025 21:52:46 -0500 Subject: [PATCH 10/22] added adwaita fonts --- modules/common/fonts.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/common/fonts.nix b/modules/common/fonts.nix index 965ba13..855f4c6 100644 --- a/modules/common/fonts.nix +++ b/modules/common/fonts.nix @@ -12,4 +12,8 @@ monaspace ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); + + environment.systemPackages = with pkgs; [ + adwaita-icon-theme + ]; } From c81b48a0ee0042c7d30013ba37f6fb046df37b1c Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 8 Dec 2025 21:52:52 -0500 Subject: [PATCH 11/22] readme updates --- modules/common/README.md | 8 ++++++++ modules/machine/README.md | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/common/README.md b/modules/common/README.md index 42bc1c6..d72723a 100644 --- a/modules/common/README.md +++ b/modules/common/README.md @@ -7,3 +7,11 @@ Licensed by the Mozilla Public License v2 ## Synopsis This is the directory that holds shared configuration files amongst computers that I own. They are called by the root `flake.nix` file. + +Here's a quick synopsis of each file: + +- core: Sane Nix options that I set for myself +- environment: Core packages and environment variables to be set and installed +- fonts: Fonts and icons that are to be installed +- overlays: Customized packages tailored to my needs +- users: Users to be set on my system diff --git a/modules/machine/README.md b/modules/machine/README.md index 66b8967..216232e 100644 --- a/modules/machine/README.md +++ b/modules/machine/README.md @@ -12,4 +12,4 @@ These are named after Final Fantasy VII characters. ### Servers/Network Infrastructure -These are named after Final Fantasy summons. +These are named after Final Fantasy summons. There is some infrastructure missing here like my routers and switches that I also name after summons. From 70691c16e504df4cdd215ba5145abbc1d0be6e1f Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 13 Dec 2025 17:22:38 -0500 Subject: [PATCH 12/22] enabled nix-ld, related libraries --- modules/common/environment.nix | 66 ++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/modules/common/environment.nix b/modules/common/environment.nix index 2c7c8b9..6944978 100644 --- a/modules/common/environment.nix +++ b/modules/common/environment.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: { +{ lib, pkgs, config, ... }: { environment.systemPackages = with pkgs; [ git vim @@ -13,11 +13,73 @@ systemd lshw dmidecode - nix-ld ]) ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ # nothing here, yet ;) ]); + programs.nix-ld = lib.mkIf pkgs.stdenv.isLinux { + enable = true; + libraries = with pkgs; + [ + acl + attr + bzip2 + dbus + expat + fontconfig + freetype + fuse3 + icu + libnotify + libsodium + libssh + libunwind + libusb1 + libuuid + nspr + nss + stdenv.cc.cc + util-linux + zlib + zstd + ] + ++ lib.optionals (config.hardware.graphics.enable) [ + pipewire + cups + libxkbcommon + pango + mesa + libdrm + libglvnd + libpulseaudio + atk + cairo + alsa-lib + at-spi2-atk + at-spi2-core + gdk-pixbuf + glib + gtk3 + libGL + libappindicator-gtk3 + vulkan-loader + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + xorg.libxkbfile + xorg.libxshmfence + ]; + }; + environment.variables.EDITOR = "nvim"; } From b7f65a6eebdd9493a53fd64995fd6b427615a0b7 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 14 Dec 2025 17:53:10 -0500 Subject: [PATCH 13/22] modified hardware virt --- modules/virtualization/hardware.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/virtualization/hardware.nix b/modules/virtualization/hardware.nix index 37f8b42..a59f72e 100644 --- a/modules/virtualization/hardware.nix +++ b/modules/virtualization/hardware.nix @@ -1,4 +1,8 @@ -{...}: { +{ pkgs, ... }: { virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; + environment.systemPackages = with pkgs; [ + qemu + quickemu + ]; } From 98ce7410c26c391f2a8e7f8ddbdf154b4d7ad54a Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 14 Dec 2025 18:15:48 -0500 Subject: [PATCH 14/22] update flake --- flake.lock | 86 ++++++++++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index b28b593..afe5db6 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1761836926, - "narHash": "sha256-HnNzEUuBqmJCUV/N/IbL0wFT1LHmNGWTLkUg7yRIhpY=", + "lastModified": 1765245541, + "narHash": "sha256-Q4KU8bvFL3tJb1sTAPFG6qvi0KP8HvAfLG7mGqdSQV8=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "e601b479a3d08124ee6ceea391cdc3f395aab54e", + "rev": "f251969383969412b94a98c9378deaa114a76338", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1759509947, - "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", + "lastModified": 1762912391, + "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", + "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1761933492, - "narHash": "sha256-DNGhpvYt6dVbkDse4s/L/jJvejvOV0bs+YWfAAskJ7g=", + "lastModified": 1765752037, + "narHash": "sha256-hjqxmMTTiGBBELqnwiomBv8FaowC5MPHMVr+tKQZybU=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "765ee6842930f0d6918574b9b87c2ee6583e4727", + "rev": "1d7fe9e70d5800de8de6244ebb1d07efb74ec36e", "type": "github" }, "original": { @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1763992789, + "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "type": "github" }, "original": { @@ -170,11 +170,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 315532800, - "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", - "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", + "lastModified": 1763191728, + "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=", + "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -183,24 +183,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758360447, - "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "lastModified": 1765363881, + "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", "type": "github" }, "original": { @@ -210,7 +197,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -233,7 +220,7 @@ "ghostty": "ghostty", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay_2" } }, @@ -242,11 +229,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1764470739, + "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", "type": "github" }, "original": { @@ -257,14 +244,14 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1761964689, - "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=", + "lastModified": 1765680428, + "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "63d22578600f70d293aede6bc737efef60ebd97f", + "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f", "type": "github" }, "original": { @@ -304,11 +291,11 @@ ] }, "locked": { - "lastModified": 1760401936, - "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=", + "lastModified": 1763295135, + "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "365085b6652259753b598d43b723858184980bbe", + "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a", "type": "github" }, "original": { @@ -319,7 +306,10 @@ }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] }, "locked": { "lastModified": 1758405547, From 923cebd9c9f742566b2b11a208185ab459b3c297 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Tue, 16 Dec 2025 15:35:47 -0500 Subject: [PATCH 15/22] modified inputs to move over to 25.11 release --- flake.lock | 65 +++++++++++++++++++++---------- flake.nix | 6 +-- modules/common/environment.nix | 65 +------------------------------ modules/common/fonts.nix | 2 +- modules/common/linker.nix | 63 ++++++++++++++++++++++++++++++ modules/machine/cloud/default.nix | 1 + 6 files changed, 113 insertions(+), 89 deletions(-) create mode 100644 modules/common/linker.nix diff --git a/flake.lock b/flake.lock index afe5db6..2b0b67b 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765245541, - "narHash": "sha256-Q4KU8bvFL3tJb1sTAPFG6qvi0KP8HvAfLG7mGqdSQV8=", + "lastModified": 1765900816, + "narHash": "sha256-Pa7QpF+84hTuPanVaJ/B3NgdaytUMj3PN06sEaNibaM=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "f251969383969412b94a98c9378deaa114a76338", + "rev": "36b14e5e7014e471341f0807dc9a9e2d65a157f4", "type": "github" }, "original": { @@ -29,16 +29,16 @@ ] }, "locked": { - "lastModified": 1762912391, - "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", + "lastModified": 1765066094, + "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", + "rev": "688427b1aab9afb478ca07989dc754fa543e03d5", "type": "github" }, "original": { "owner": "lnl7", - "ref": "nix-darwin-25.05", + "ref": "nix-darwin-25.11", "repo": "nix-darwin", "type": "github" } @@ -97,16 +97,17 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", + "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1765752037, - "narHash": "sha256-hjqxmMTTiGBBELqnwiomBv8FaowC5MPHMVr+tKQZybU=", + "lastModified": 1765908726, + "narHash": "sha256-tUvTIxhD2aGbyBQgDXknoKWQpuNrgt9TrGQaV9q1WOQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "1d7fe9e70d5800de8de6244ebb1d07efb74ec36e", + "rev": "67eb4805779a80bfe2d9ac5a67f19b89f4e67b16", "type": "github" }, "original": { @@ -118,15 +119,16 @@ "home-manager": { "inputs": { "nixpkgs": [ + "ghostty", "nixpkgs" ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1755776884, + "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", "type": "github" }, "original": { @@ -136,6 +138,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765859973, + "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.11", + "repo": "home-manager", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1739444422, @@ -183,16 +206,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765363881, - "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -218,7 +241,7 @@ "aagl": "aagl", "darwin": "darwin", "ghostty": "ghostty", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay_2" @@ -247,11 +270,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1765680428, - "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=", + "lastModified": 1765852971, + "narHash": "sha256-rQdOMqfQNhcfqvh1dFIVWh09mrIWwerUJqqBdhIsf8g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f", + "rev": "5f98ccecc9f1bc1c19c0a350a659af1a04b3b319", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 88d7dbe..80af847 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,14 @@ { description = "Wyatt's nix configuration suite"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; darwin = { - url = "github:lnl7/nix-darwin/nix-darwin-25.05"; + url = "github:lnl7/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; ghostty.url = "github:ghostty-org/ghostty"; diff --git a/modules/common/environment.nix b/modules/common/environment.nix index 6944978..e72b0c3 100644 --- a/modules/common/environment.nix +++ b/modules/common/environment.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: { +{ lib, pkgs, ... }: { environment.systemPackages = with pkgs; [ git vim @@ -18,68 +18,5 @@ # nothing here, yet ;) ]); - programs.nix-ld = lib.mkIf pkgs.stdenv.isLinux { - enable = true; - libraries = with pkgs; - [ - acl - attr - bzip2 - dbus - expat - fontconfig - freetype - fuse3 - icu - libnotify - libsodium - libssh - libunwind - libusb1 - libuuid - nspr - nss - stdenv.cc.cc - util-linux - zlib - zstd - ] - ++ lib.optionals (config.hardware.graphics.enable) [ - pipewire - cups - libxkbcommon - pango - mesa - libdrm - libglvnd - libpulseaudio - atk - cairo - alsa-lib - at-spi2-atk - at-spi2-core - gdk-pixbuf - glib - gtk3 - libGL - libappindicator-gtk3 - vulkan-loader - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.libxkbfile - xorg.libxshmfence - ]; - }; - environment.variables.EDITOR = "nvim"; } diff --git a/modules/common/fonts.nix b/modules/common/fonts.nix index 855f4c6..3e2f7b5 100644 --- a/modules/common/fonts.nix +++ b/modules/common/fonts.nix @@ -6,7 +6,7 @@ fonts.packages = with pkgs; [ noto-fonts - noto-fonts-emoji + noto-fonts-color-emoji liberation_ttf noto-fonts-cjk-sans monaspace diff --git a/modules/common/linker.nix b/modules/common/linker.nix new file mode 100644 index 0000000..4798f54 --- /dev/null +++ b/modules/common/linker.nix @@ -0,0 +1,63 @@ +{ pkgs, ... }: { + programs.nix-ld = { + enable = true; + libraries = with pkgs; + [ + acl + attr + bzip2 + dbus + expat + fontconfig + freetype + fuse3 + icu + libnotify + libsodium + libssh + libunwind + libusb1 + libuuid + nspr + nss + stdenv.cc.cc + util-linux + zlib + zstd + ] ++ lib.optionals (config.hardware.graphics.enable) [ + pipewire + cups + libxkbcommon + pango + mesa + libdrm + libglvnd + libpulseaudio + atk + cairo + alsa-lib + at-spi2-atk + at-spi2-core + gdk-pixbuf + glib + gtk3 + libGL + libappindicator-gtk3 + vulkan-loader + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + xorg.libxkbfile + xorg.libxshmfence + ]; + }; +} diff --git a/modules/machine/cloud/default.nix b/modules/machine/cloud/default.nix index 187a110..90be192 100644 --- a/modules/machine/cloud/default.nix +++ b/modules/machine/cloud/default.nix @@ -2,5 +2,6 @@ imports = [ ./configuration.nix ./hardware-configuration.nix + ../../common/linker.nix ]; } From 45ca39596220517b87e4139e631b9e0c9f052717 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Tue, 16 Dec 2025 17:59:40 -0500 Subject: [PATCH 16/22] modified modules for nixos to build correctly --- modules/apps/gaming.nix | 2 +- modules/common/linker.nix | 1 - modules/graphics/default.nix | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index b2909ef..d65b69e 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -211,7 +211,7 @@ in { )) ++ (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ - (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkBasalt pkgs.vkbasalt-cli]) ++ + (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/common/linker.nix b/modules/common/linker.nix index 4798f54..c5cf36b 100644 --- a/modules/common/linker.nix +++ b/modules/common/linker.nix @@ -24,7 +24,6 @@ util-linux zlib zstd - ] ++ lib.optionals (config.hardware.graphics.enable) [ pipewire cups libxkbcommon diff --git a/modules/graphics/default.nix b/modules/graphics/default.nix index 94eeeee..47fc13f 100644 --- a/modules/graphics/default.nix +++ b/modules/graphics/default.nix @@ -40,7 +40,6 @@ in { config = mkIf cfg.enable (mkMerge [ { environment.systemPackages = with pkgs; [ - glxinfo vulkan-tools mesa-demos ]; From 0fa26e2840f1cd5f60b5fab7494e35a91b0a51b8 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 28 Dec 2025 22:17:23 -0500 Subject: [PATCH 17/22] flake update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 2b0b67b..52e2249 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765900816, - "narHash": "sha256-Pa7QpF+84hTuPanVaJ/B3NgdaytUMj3PN06sEaNibaM=", + "lastModified": 1766424259, + "narHash": "sha256-ikKwd1/8rLIz8I+B8kwLaNwW5Hh75bkgGRalC+gEpw0=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "36b14e5e7014e471341f0807dc9a9e2d65a157f4", + "rev": "37c289121c7ed44f723c326b6c079cd8aaeb35cf", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1765908726, - "narHash": "sha256-tUvTIxhD2aGbyBQgDXknoKWQpuNrgt9TrGQaV9q1WOQ=", + "lastModified": 1766930820, + "narHash": "sha256-YwSlB25j3m7DKWrhLoG5jjoXeUOrG+eG+8BpYCH59EY=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "67eb4805779a80bfe2d9ac5a67f19b89f4e67b16", + "rev": "52d8e1f44c6ba69b56f0e3b7dfcda64bd481b63c", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1765859973, - "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=", + "lastModified": 1766939458, + "narHash": "sha256-VvZeAKyB3vhyHStSO8ACKzWRKNQPmVWktjfuSVdvtUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8", + "rev": "e298a148013c980e3c8c0ac075295fab5074d643", "type": "github" }, "original": { @@ -206,11 +206,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765762245, - "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", + "lastModified": 1766736597, + "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", + "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1765852971, - "narHash": "sha256-rQdOMqfQNhcfqvh1dFIVWh09mrIWwerUJqqBdhIsf8g=", + "lastModified": 1766890375, + "narHash": "sha256-0Zi7ChAtjq/efwQYmp7kOJPcSt6ya9ynSUe6ppgZhsQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5f98ccecc9f1bc1c19c0a350a659af1a04b3b319", + "rev": "91e1f7a0017065360f447622d11b7ce6ed04772f", "type": "github" }, "original": { From e3b134e48a2f358abca45ab62281517de665903d Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Tue, 30 Dec 2025 21:48:46 -0500 Subject: [PATCH 18/22] added swaytreesave flake, fixed manual import, fixed infinite recursion --- flake.lock | 50 +++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 6 +++++- home/default.nix | 3 ++- home/neovim.nix | 6 +++++- home/sway.nix | 8 ++++++++ 5 files changed, 69 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 52e2249..9c3ba3b 100644 --- a/flake.lock +++ b/flake.lock @@ -75,6 +75,20 @@ "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-utils": { "inputs": { "systems": "systems" @@ -236,6 +250,20 @@ "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" + } + }, "root": { "inputs": { "aagl": "aagl", @@ -244,7 +272,8 @@ "home-manager": "home-manager_2", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_2", + "swaytreesave": "swaytreesave" } }, "rust-overlay": { @@ -283,6 +312,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, diff --git a/flake.nix b/flake.nix index 80af847..00cfd32 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,9 @@ 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"; }; outputs = inputs @ { @@ -28,12 +31,13 @@ ghostty, rust-overlay, aagl, + swaytreesave, ... }: let userName = "wyatt"; userEmail = "wyatt@wyattjmiller.com"; extraSpecialArgs = { - inherit userName userEmail ghostty; + inherit userName userEmail ghostty swaytreesave; }; myOverlays = { ... }: { diff --git a/home/default.nix b/home/default.nix index 19219a2..720c870 100644 --- 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 diff --git a/home/neovim.nix b/home/neovim.nix index 0efa653..eebfd50 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -1,4 +1,8 @@ -{dirs, ...}: { +{...}: let + dirs = { + defaults = ../defaults; + }; +in { programs.neovim = { enable = true; defaultEditor = true; diff --git a/home/sway.nix b/home/sway.nix index 8e81b1d..7827aa8 100644 --- 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; }; + } From 7f0fdbc6bb96b44d73f9de77562bd67422af8262 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 5 Jan 2026 15:46:13 -0500 Subject: [PATCH 19/22] more hardware virtualization stuff being added in --- modules/machine/cloud/configuration.nix | 2 +- modules/virtualization/hardware.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index 67c14aa..9599a3e 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -150,7 +150,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 diff --git a/modules/virtualization/hardware.nix b/modules/virtualization/hardware.nix index a59f72e..92e1ba4 100644 --- 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 From be6cab1ab2c5a487005749d4af13d9cc11813c72 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 24 Jan 2026 22:33:48 -0500 Subject: [PATCH 20/22] added sched_ext scx_bpfland scheduler --- modules/machine/cloud/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index 9599a3e..f88af6b 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -190,5 +190,11 @@ in { }; }; + # sched_ext userspace CPU scheduling stuff - idk + services.scx = { + enable = true; + scheduler = "scx_bpfland"; + }; + system.stateVersion = "24.11"; } From 1f9ff3123453459672e5f8d82577c5357a79554e Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 28 Jan 2026 08:25:51 -0500 Subject: [PATCH 21/22] 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"; } From 2592a1cd72b30684a9d82b3875e4904bd254a151 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 14 Feb 2026 18:30:51 -0500 Subject: [PATCH 22/22] update flake --- flake.lock | 59 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index a6aa025..bfdbef0 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766424259, - "narHash": "sha256-ikKwd1/8rLIz8I+B8kwLaNwW5Hh75bkgGRalC+gEpw0=", + "lastModified": 1767520119, + "narHash": "sha256-+OmNQLA9Fv5WBaxYHlPghS9XmnYWDaLt+AatCGhG+hc=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "37c289121c7ed44f723c326b6c079cd8aaeb35cf", + "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": { @@ -131,11 +131,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1766930820, - "narHash": "sha256-YwSlB25j3m7DKWrhLoG5jjoXeUOrG+eG+8BpYCH59EY=", + "lastModified": 1769985646, + "narHash": "sha256-ubfC9fLfdQ0xpQuFmGQCYIRyEEmOzXd+ya5rShM217k=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "52d8e1f44c6ba69b56f0e3b7dfcda64bd481b63c", + "rev": "769fff5dfb322594c0dc7a379ee70897a7db773f", "type": "github" }, "original": { @@ -152,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" } @@ -173,11 +172,11 @@ ] }, "locked": { - "lastModified": 1766939458, - "narHash": "sha256-VvZeAKyB3vhyHStSO8ACKzWRKNQPmVWktjfuSVdvtUA=", + "lastModified": 1769580047, + "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e298a148013c980e3c8c0ac075295fab5074d643", + "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826", "type": "github" }, "original": { @@ -221,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", @@ -234,11 +233,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766736597, - "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", + "lastModified": 1769900590, + "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", + "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", "type": "github" }, "original": { @@ -328,11 +327,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1766890375, - "narHash": "sha256-0Zi7ChAtjq/efwQYmp7kOJPcSt6ya9ynSUe6ppgZhsQ=", + "lastModified": 1769915446, + "narHash": "sha256-f1F/umtX3ZD7fF9DHSloVHc0mnAT0ry0YK2jI/6E0aI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "91e1f7a0017065360f447622d11b7ce6ed04772f", + "rev": "bc00300f010275e46feb3c3974df6587ff7b7808", "type": "github" }, "original": { @@ -431,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" } }