added aagl flake, implemeneted into gaming apps module

flake update
2025-11-02 10:25:27 -05:00 · 2025-11-01 18:46:26 -04:00
19 changed files with 229 additions and 222 deletions
--- a/defaults/k9s/catppuccin-mocha.yaml
+++ b/defaults/k9s/catppuccin-mocha.yaml
--- 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,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": 1761172581,
-        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
+        "lastModified": 1761933492,
+        "narHash": "sha256-DNGhpvYt6dVbkDse4s/L/jJvejvOV0bs+YWfAAskJ7g=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
+        "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": 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": {
@@ -156,7 +210,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1744536153,
        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -174,24 +228,43 @@
    },
    "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": 1761100675,
-        "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=",
+        "lastModified": 1761791894,
+        "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae",
+        "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": {
@@ -246,7 +319,7 @@
    },
    "zon2nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
        "lastModified": 1758405547,
--- 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,7 +39,9 @@
    myOverlays = { ... }: {
      nixpkgs.overlays = [
        rust-overlay.overlays.default
-      ] ++ (nixpkgs.lib.attrValues self.common.overlays);
+        aagl.overlays.default
+        self.common.overlays
+      ];
    };
  in {
    meta = import ./meta;
@@ -49,7 +56,7 @@
      specialArgs = {
        inherit userName userEmail ghostty;
        hostname = "sephiroth";
-        role = "workstation";
+        role = "devel";
      };
      modules = [
        myOverlays
@@ -60,8 +67,7 @@
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; };
-          # home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs;
          home-manager.backupFileExtension = "bak";
          home-manager.users.${userName} = import ./home;
        }
@@ -72,9 +78,9 @@
    nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {
-        inherit userName userEmail ghostty;
+        inherit userName userEmail ghostty aagl;
        hostname = "cloud";
-        role = "workstation";
+        role = "devel";
      };
      modules = [
        myOverlays
@@ -150,23 +156,5 @@
      #   }
      # ];
    };
-
-    # generic non-NixOS Linux machine
-    homeConfigurations."generic" = let
-      hostname = builtins.getEnv "HOSTNAME";
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
-    in home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      # system = "x86_64-linux";
-      extraSpecialArgs = extraSpecialArgs // { 
-        isNixOS = false; 
-        hostname = hostname;
-        role = "workstation";
-      };
-      modules = [
-        myOverlays
-        ./home
-      ];
-    };
  };
 }
--- a/home/browser.nix
+++ b/home/browser.nix
@@ -1,8 +1,6 @@
 {
  pkgs,
  lib,
-  isNixOS,
-  role,
  ...
 }: {
  programs.firefox = {
@@ -11,7 +9,7 @@
  };

  programs.chromium = {
-    enable = pkgs.stdenv.isLinux && isNixOS;
+    enable = pkgs.stdenv.isLinux;
    package = pkgs.ungoogled-chromium.override {
      enableWideVine = true;
      commandLineArgs = [
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,57 +1,64 @@
-{ lib
-, pkgs
-, userName
-, userEmail
-, ghostty
-, isNixOS ? true
-, role
-, ...
-}:
-let
-  # Have a file structure that holds all the configuration files that can't be configured by Nix
+{
+  lib,
+  pkgs,
+  userName,
+  userEmail,
+  ghostty,
+  ...
+}: let
+  # Have a file sturcture that holds all the configuration files that can't be configured by Nix
+  # or maybe I'm too lazy to do anything about it? I dunno
  dirs = {
    defaults = ../defaults;
  };
-in
-{
+in {
  # Import sub modules
-  imports = [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+    ./atuin.nix
+    ./shell.nix
    ./packages
+    ./git.nix
+    ./starship.nix
+    ./eza.nix
+    ./neovim.nix
+    ./direnv.nix
+    ./sway.nix
+    ./terminal.nix
+    ./browser.nix
+    ./zellij.nix
+    ./bat.nix
+    ./lazygit.nix
  ];

-  home = lib.mkMerge [
-    {
-      username = userName;
-      homeDirectory =
-        if pkgs.stdenv.isDarwin
-        then "/Users/${userName}"
-        else "/home/${userName}";
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home = {
+    username = userName;
+    homeDirectory =
+      if pkgs.stdenv.isDarwin
+      then "/Users/${userName}"
+      else "/home/${userName}";

-      stateVersion = "24.11";
-    }
+    sessionVariables = {
+      XDG_CURRENT_DESKTOP = "sway";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_SESSION_DESKTOP="sway";
+      XDG_CONFIG_HOME = "$HOME/.config";
+      XDG_CACHE_HOME = "$HOME/.cache";
+      XDG_DATA_HOME = "$HOME/.local/share";
+      XDG_STATE_HOME = "$HOME/.local/state";
+      NIXOS_OZONE_WL = "1";
+    };

-    (lib.mkIf isNixOS {
-      sessionVariables = {
-        XDG_CURRENT_DESKTOP = "sway";
-        XDG_SESSION_TYPE = "wayland";
-        XDG_SESSION_DESKTOP = "sway";
-        XDG_CONFIG_HOME = "$HOME/.config";
-        XDG_CACHE_HOME = "$HOME/.cache";
-        XDG_DATA_HOME = "$HOME/.local/share";
-        XDG_STATE_HOME = "$HOME/.local/state";
-        NIXOS_OZONE_WL = "1";
-      };
-    })
+    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
+      gtk.enable = true;
+      package = pkgs.catppuccin-cursors.mochaDark;
+      name = "catppuccin-mocha-dark-cursors";
+      size = 22;
+    };

-    (lib.mkIf pkgs.stdenv.isLinux {
-      pointerCursor = {
-        gtk.enable = true;
-        package = pkgs.catppuccin-cursors.mochaDark;
-        name = "catppuccin-mocha-dark-cursors";
-        size = 22;
-      };
-    })
-  ];
+    stateVersion = "24.11";
+  };

  # Let Home Manager install and manage itself.
  programs.home-manager.enable = true;
--- a/home/k9s.nix
+++ b/home/k9s.nix
@@ -1,32 +0,0 @@
-{ pkgs, ... }: {
-  programs.k9s = {
-    enable = true;
-    package = pkgs.k9sLatest;
-    settings.k9s = {
-      refreshRate = "2s";
-      liveViewAutoRefresh = false;
-      apiServerTimeout = "30s";
-      maxConnRetry = 5;
-      readOnly = true;
-      noExitOnCtrlC = false;
-      portForwardAddress = "localhost";
-      skipLatestRevCheck = false;
-      
-      skin = {
-        catppuccin-mocha = ./defaults/k9s/catppuccin-mocha.yml;
-      };
-
-      ui = {
-        skin = "catppuccin-mocha";
-        enableMouse = true;
-        headless = false;
-        logoless = true;
-        crumbsless = false;
-        splashless = true;
-        reactive = false;
-        noIcons = false;
-        defaultsToFullscreen = false;
-      };
-    };
-  };
-}
--- a/home/krew.nix
+++ b/home/krew.nix
@@ -1,12 +0,0 @@
-{ pkgs, lib, ... }:
-with pkgs;
-let
-  plugins = writeText "plugins" ''
-    krew
-    oidc-login
-  '';
-in {
-  home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    $DRY_RUN_CMD ${krewfile}/bin/krewfile -command ${krew}/bin/krew -file ${plugins}
-  '';
-}
--- a/home/packages/common.nix
+++ b/home/packages/common.nix
@@ -1,19 +1,10 @@
 {
-  lib,
  pkgs,
  ...
 }: {
-  imports = [
-    ../atuin.nix
-    ../shell.nix
-    ../git.nix
-    ../starship.nix
-    ../eza.nix
-    ../neovim.nix
-    ../bat.nix
-  ];
-
  home.packages = with pkgs; [
+    yazi # terminal file manager
+
    # archives
    zip
    xz
@@ -21,22 +12,39 @@
    p7zip

    # utils
-    yazi
    tmux
    bottom
    ripgrep
    jq
    yq-go
    fzf
+    fh
    aria2
-    gnupg
+    yt-dlp
+    obsidian
+    vscode
+    weechat
    inetutils

    # misc
+    cowsay
    file
    which
    tree
    gnutar
+    gnupg
+    zoxide
    babelfish
+
+    # language-specific package managers
+    nodejs
+    cargo
+    python3
+
+    # nix specific stuff
+    nixd
+    deadnix
+    alejandra
+    statix
  ];
 }
--- a/home/packages/darwin.nix
+++ b/home/packages/darwin.nix
@@ -1,9 +1,10 @@
 {
  pkgs,
+  lib,
  ...
 }: {
-  home.packages = with pkgs; [
+  home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
    discord
    ollama
-  ];
+  ]);
 }
--- a/home/packages/default.nix
+++ b/home/packages/default.nix
@@ -1,9 +1,11 @@
-{ pkgs, lib, role, ... }:
 {
-  imports =
-    [ ./common.nix ]
-    ++ lib.optional pkgs.stdenv.isDarwin ./darwin.nix
-    ++ lib.optional pkgs.stdenv.isLinux ./linux.nix
-    ++ lib.optional (role == "workstation") ./workstation.nix
-    ++ lib.optional (role == "server") ./server.nix;
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    ./common.nix
+    ./darwin.nix
+    ./linux.nix
+  ];
 }
--- a/home/packages/linux.nix
+++ b/home/packages/linux.nix
@@ -1,8 +1,9 @@
 {
  pkgs,
+  lib,
  ...
 }: {
-  home.packages = with pkgs; [
+  home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
    imv
    betterdiscordctl
    vesktop
@@ -15,5 +16,5 @@
    gpu-screen-recorder
    gpu-screen-recorder-gtk
    # ungoogled-chromium
-  ];
+  ]);
 }
--- a/home/packages/server.nix
+++ b/home/packages/server.nix
@@ -1,4 +0,0 @@
-{ pkgs, ... }: {
-    home.packages = with pkgs; [
-    ];
-}
--- a/home/packages/workstation.nix
+++ b/home/packages/workstation.nix
@@ -1,39 +0,0 @@
-{
-  lib,
-  pkgs,
-  dirs,
-  userName,
-  userEmail,
-  ghostty,
-  isNixOS,
-  ...
-}: {
-  imports = map (module: import module { inherit lib pkgs dirs userName userEmail ghostty isNixOS; }) [
-    ../terminal.nix
-    ../broswer.nix
-    ../zellij.nix
-    ../lazygit.nix
-    ../k9s.nix
-    ../krew.nix
-    ../direnv.nix
-  ] ++ lib.optional isNixOS [
-    ../sway.nix
-  ];
-
-  home.packages = with pkgs; [
-    fh
-    kubectl # kube config is deliberately not included
-    kubectx
-    obsidian
-    vscode
-    yt-dlp
-    weechat
-    nodejs
-    cargo
-    python3
-    nixd
-    deadnix
-    alejandra
-    statix
-  ];
-}
--- a/home/terminal.nix
+++ b/home/terminal.nix
@@ -1,4 +1,4 @@
-{ pkgs, ghostty, ... }: {
+{ lib, pkgs, ghostty, ... }: {
  programs.alacritty = {
    enable = pkgs.stdenv.isLinux;
    settings = {
--- a/lib/checkSystem.nix
+++ b/lib/checkSystem.nix
--- a/modules/apps/gaming.nix
+++ b/modules/apps/gaming.nix
@@ -2,10 +2,13 @@
  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=" ];
+      }
+    );
  };
 }
--- a/modules/common/overlays.nix
+++ b/modules/common/overlays.nix
@@ -47,18 +47,4 @@ in {
      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
    '';
  });
-
-  k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec {
-    version = "0.30.16";
-    src = prev.fetchFromGitHub {
-      owner = "derailed";
-      repo = "k9s";
-      rev = "v${version}";
-      hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r";
-    };
-    ldflags = [
-      "-X github.com/derailed/k9s/version.Version=${version}"
-      "-X github.com/derailed/k9s/version.BuildSource=nix"
-    ];
-  });
 }
--- 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
      ];
--- 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)
Author	SHA1	Message	Date
Wyatt J. Miller	6024b77535	added aagl flake, implemeneted into gaming apps module	2025-11-02 10:25:27 -05:00
Wyatt J. Miller	257fab9832	flake update	2025-11-01 18:46:26 -04:00