From 495ed3f93843f4a948e7ce591b41893ddbea1354 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 10 May 2026 10:46:52 +0800 Subject: [PATCH] chore: remove aagl, run them via steam+dw-proton instead Signed-off-by: Ryan Yin --- flake.lock | 124 +++++-------------------------- flake.nix | 4 - home/linux/gui/base/gaming.nix | 17 +++-- hosts/idols-ai/preservation.nix | 7 +- modules/nixos/desktop/gaming.nix | 13 ---- 5 files changed, 32 insertions(+), 133 deletions(-) diff --git a/flake.lock b/flake.lock index c6ac8e01..d7cf8093 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "aagl": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1777049909, - "narHash": "sha256-t06XtDZpzxLxsq7nVxeMqppllJd4E0RMykDK+k1+CMM=", - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "rev": "7fa6541ef5e4d5c95d526a0c0dfb872648f85ab5", - "type": "github" - }, - "original": { - "owner": "ezKEa", - "ref": "main", - "repo": "aagl-gtk-on-nix", - "type": "github" - } - }, "agenix": { "inputs": { "darwin": "darwin", @@ -205,22 +184,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1761588595, @@ -236,7 +199,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1767039857, @@ -252,7 +215,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1761640442, "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=", @@ -267,7 +230,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1767039857, @@ -384,7 +347,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore_2", "nixpkgs": [ "nix-gaming", @@ -565,7 +528,7 @@ "nixpkgs" ], "pre-commit": "pre-commit", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1765382359, @@ -587,7 +550,7 @@ "blueprint": "blueprint", "bun2nix": "bun2nix", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, @@ -698,7 +661,7 @@ }, "nixos-apple-silicon": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ] @@ -762,16 +725,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770841267, - "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", - "owner": "nixos", + "lastModified": 1777641297, + "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", + "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -872,38 +835,6 @@ } }, "nixpkgs_2": { - "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_3": { - "locked": { - "lastModified": 1777641297, - "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1777548390, "narHash": "sha256-WacE23EbHTsBKvr8cu+1DFNbP6Rh1brHUH5SDUI0NQI=", @@ -962,7 +893,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1731006591, @@ -1000,7 +931,7 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -1023,7 +954,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "gitignore": "gitignore_3", "nixpkgs": [ "nixpkgs" @@ -1060,7 +991,6 @@ }, "root": { "inputs": { - "aagl": "aagl", "agenix": "agenix", "blender-bin": "blender-bin", "catppuccin": "catppuccin", @@ -1076,7 +1006,7 @@ "nixos-apple-silicon": "nixos-apple-silicon", "nixos-generators": "nixos-generators", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-2505": "nixpkgs-2505", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", @@ -1092,24 +1022,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1770952264, - "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -1130,7 +1042,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 7f3282bf..fbf21329 100644 --- a/flake.nix +++ b/flake.nix @@ -147,10 +147,6 @@ url = "github:fufexan/nix-gaming"; inputs.nixpkgs.follows = "nixpkgs"; }; - aagl = { - url = "github:ezKEa/aagl-gtk-on-nix/main"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; ######################## Some non-flake repositories ######################################### diff --git a/home/linux/gui/base/gaming.nix b/home/linux/gui/base/gaming.nix index 3ddc8623..d149e2a2 100644 --- a/home/linux/gui/base/gaming.nix +++ b/home/linux/gui/base/gaming.nix @@ -45,15 +45,18 @@ in bbe ]) ++ (with pkgs-x64; [ - # a game launcher - great for epic games and gog games - # (heroic.override { - # extraPkgs = _pkgs: [ - # pkgs.gamescope # aarch64 - # ]; - # }) + # Heroic Games Launcher - primarily for Epic Games & GOG + # https://heroicgameslauncher.com/ + (heroic.override { + extraPkgs = _pkgs: [ + pkgs.gamescope # aarch64 + ]; + }) ]); - # a GUI game launcher for Steam/GoG/Epic + # Game launchers for Epic/GOG/Ubisoft/etc. (use Steam + DWProton for common games) + + # a GUI game launcher for Steam/GoG/Epic/Ubisoft # https://lutris.net/games?ordering=-popularity programs.lutris = { enable = true; diff --git a/hosts/idols-ai/preservation.nix b/hosts/idols-ai/preservation.nix index f22e9f3a..d8e8b91e 100644 --- a/hosts/idols-ai/preservation.nix +++ b/hosts/idols-ai/preservation.nix @@ -244,14 +244,15 @@ in ".steam" ".config/blender" ".config/LDtk" - ".config/heroic" - ".config/lutris" + ".local/share/umu" ".local/share/Steam" ".local/state/Heroic" - + ".config/heroic" + ".config/lutris" ".local/share/lutris" + ".local/share/tiled" ".local/share/GOG.com" ".local/share/StardewValley" diff --git a/modules/nixos/desktop/gaming.nix b/modules/nixos/desktop/gaming.nix index c77c075d..f33a5790 100644 --- a/modules/nixos/desktop/gaming.nix +++ b/modules/nixos/desktop/gaming.nix @@ -2,7 +2,6 @@ pkgs, pkgs-x64, nix-gaming, - aagl, config, lib, ... @@ -15,9 +14,6 @@ in imports = [ nix-gaming.nixosModules.pipewireLowLatency nix-gaming.nixosModules.platformOptimizations - - # run anime games on Linux - aagl.nixosModules.default ]; options.modules.desktop = { @@ -71,14 +67,5 @@ in # https://github.com/FeralInteractive/GameMode#apps-with-gamemode-integration # simply running the game will automatically activate GameMode. programs.gamemode.enable = true; - - # run anime games on Linux - # https://github.com/an-anime-team/ - networking.mihoyo-telemetry.block = true; - environment.systemPackages = with aagl.packages."x86_64-linux"; [ - anime-game-launcher # Genshin: Impact - honkers-railway-launcher # Honkai: Star Rail - sleepy-launcher # Zenless Zon Zero - ]; }; }