From 6024b77535ab2d3560a0914ef9bb24203adb0585 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 2 Nov 2025 10:25:27 -0500 Subject: [PATCH] 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)