added aagl flake, implemeneted into gaming apps module

Reviewed-on: #3

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,18 +95,18 @@
     },
     "ghostty": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "zig": "zig",
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1760808459,
+        "lastModified": 1761933492,
-        "narHash": "sha256-+3ups2SbJ2y2CknaoC8P4IphJDWG/yo5loW01BF7STw=",
+        "narHash": "sha256-DNGhpvYt6dVbkDse4s/L/jJvejvOV0bs+YWfAAskJ7g=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "be0da4845cb629bcf1f5f1890a28850bb7adfe16",
+        "rev": "765ee6842930f0d6918574b9b87c2ee6583e4727",
         "type": "github"
       },
       "original": {
@@ -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,13 +194,13 @@
         "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1760580664,
+        "lastModified": 1761597516,
-        "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
+        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
+        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
         "type": "github"
       },
       "original": {
@@ -156,13 +210,67 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "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"
+      }
+    },
     "root": {
       "inputs": {
+        "aagl": "aagl",
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4",
+        "rust-overlay": "rust-overlay_2"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "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,
+        "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "63d22578600f70d293aede6bc737efef60ebd97f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "systems": {
@@ -211,7 +319,7 @@
     },
     "zon2nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1758405547,

flake.nix

@@ -12,6 +12,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     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 @ {
@@ -21,6 +26,8 @@
     darwin,
     home-manager,
     ghostty,
+    rust-overlay,
+    aagl,
     ...
   }: let
     userName = "wyatt";
@@ -28,9 +35,21 @@
     extraSpecialArgs = {
       inherit userName userEmail ghostty;
     };
+
+    myOverlays = { ... }: {
+      nixpkgs.overlays = [
+        rust-overlay.overlays.default
+        aagl.overlays.default
+        self.common.overlays
+      ];
+    };
   in {
     meta = import ./meta;
 
+    common = {
+      overlays = import ./modules/common/overlays.nix;
+    };
+
     # Primary laptop - MacBook Pro (2023, M3)
     darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
@@ -40,6 +59,7 @@
         role = "devel";
       };
       modules = [
+        myOverlays
         ./modules/common
         ./modules/machine/sephiroth
 
@@ -48,6 +68,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -57,11 +78,12 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail ghostty;
+        inherit userName userEmail ghostty aagl;
         hostname = "cloud";
         role = "devel";
       };
       modules = [
+        myOverlays
         nix-flatpak.nixosModules.nix-flatpak
         ./modules/common
         ./modules/machine/cloud
@@ -71,6 +93,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -87,6 +110,7 @@
         role = "server";
       };
       modules = [
+        myOverlays
         ./modules/common
         ./modules/machine/valefor
 
@@ -95,6 +119,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -111,6 +136,7 @@
         role = "server";
       };
       # modules = [
+      #   myOverlays
       #   nix-flatpak.nixosModules.nix-flatpak
       #   nix-ld.nixosModules.nix-ld
       #   ./modules/nixos/hardware-configuration.nix
@@ -123,6 +149,7 @@
       #     home-manager.useGlobalPkgs = true;
       #     home-manager.useUserPackages = true;
       #     home-manager.extraSpecialArgs = extraSpecialArgs;
+      #     home-manager.backupFileExtension = "bak";
       #     home-manager.users.${userName}.imports = [
       #       ./home
       #     ];

home/atuin.nix

@@ -1,6 +1,7 @@
-{...}: {
+{ pkgs, ...}: {
   programs.atuin = {
     enable = true;
     enableFishIntegration = true;
+    package = pkgs.atuinLatest;
   };
 }

home/default.nix

@@ -27,6 +27,7 @@ in {
     ./browser.nix
     ./zellij.nix
     ./bat.nix
+    ./lazygit.nix
   ];
 
   # Home Manager needs a bit of information about you and the

home/lazygit.nix

@@ -1,6 +1,7 @@
-{...}: {
+{ pkgs, ... }: {
   programs.lazygit = {
     enable = true;
+    package = pkgs.lazygitLatest;
 
     settings = {
       gui.theme = {

home/packages/common.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   ...
 }: {
@@ -14,7 +13,6 @@
 
     # utils
     tmux
-    lazygit
     bottom
     ripgrep
     jq

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=" ];
+      }
+    );
   };
 }

modules/common/core.nix

@@ -8,6 +8,9 @@
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.permittedInsecurePackages = [
+    "mbedtls-2.28.10"
+  ];
 
   nix.package = pkgs.nix;
 

modules/common/default.nix

@@ -1,12 +1,9 @@
-{
+{ ... }: {
-  pkgs,
-  lib,
-  ...
-}: {
   imports = [
     ./core.nix
     ./environment.nix
     ./fonts.nix
+    # ./overlays.nix
     ./users.nix
   ];
 }

modules/common/overlays.nix

@@ -0,0 +1,50 @@
+final: prev: let
+  rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
+  myRustPlatform = prev.makeRustPlatform {
+    cargo = rust_1_90_0;
+    rustc = rust_1_90_0;
+  };
+in {
+  lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
+    version = "0.55.1";
+    src = prev.fetchFromGitHub {
+      owner = "jesseduffield";
+      repo = "lazygit";
+      rev = "v${version}";
+      hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
+    };
+    vendorHash = null;
+    subPackages = [ "." ];
+    ldflags = [
+      "-X main.version=${version}"
+      "-X main.buildSource=nix"
+    ];
+  });
+
+  atuinLatest = (prev.atuin.override {
+    rustPlatform = myRustPlatform;
+  }).overrideAttrs (oldAttrs: rec {
+    version = "18.10.0";
+
+    src = prev.fetchFromGitHub {
+      owner = "atuinsh";
+      repo = "atuin";
+      rev = "v${version}";
+      hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
+    };
+
+    cargoDeps = myRustPlatform.fetchCargoVendor {
+      # name = "atuin-${version}-vendor.tar.gz";
+      inherit src;
+      hash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
+    };
+
+    preCheck = (oldAttrs.preCheck or "") + ''
+      export HOME="$TMPDIR"
+      export XDG_CONFIG_HOME="$TMPDIR/.config"
+      export XDG_DATA_HOME="$TMPDIR/.local/share"
+      export XDG_STATE_HOME="$TMPDIR/.local/state"
+      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
+    '';
+  });
+}

modules/graphics/default.nix

@@ -62,9 +62,9 @@ in {
 
     (mkIf (cfg.gpuVendor == "amd") {
       services.xserver.videoDrivers = ["amdgpu"];
-      hardware.graphics.extraPackages = with pkgs; [
+      # hardware.graphics.extraPackages = with pkgs; [
-        amdvlk
+      #   amdvlk
-      ];
+      # ];
       environment.systemPackages = with pkgs; [
         radeontop
       ];

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)