enabled nix-ld, related libraries

Reviewed-on: #4

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,

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 @ {
@@ -21,18 +25,21 @@
     nix-flatpak,
     darwin,
     home-manager,
+    ghostty,
     rust-overlay,
+    aagl,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail;
+      inherit userName userEmail ghostty;
     };
 
     myOverlays = { ... }: {
       nixpkgs.overlays = [
         rust-overlay.overlays.default
+        aagl.overlays.default
         self.common.overlays
       ];
     };
@@ -47,9 +54,9 @@
     darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
       specialArgs = {
-        inherit userName userEmail;
+        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; role = "workstation"; };
-          # 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;
+        inherit userName userEmail ghostty aagl;
         hostname = "cloud";
-        role = "workstation";
+        role = "devel";
       };
       modules = [
         myOverlays
@@ -86,7 +92,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "workstation"; };
+          home-manager.extraSpecialArgs = extraSpecialArgs;
           home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
@@ -150,28 +156,5 @@
       #   }
       # ];
     };
-
-    # generic non-NixOS Linux machine
-    homeConfigurations."generic" = let
-      hostname = builtins.getEnv "HOSTNAME";
-      system = "x86_64-linux";
-    in home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.${system};
-      
-      extraSpecialArgs = {
-        inherit userName userEmail hostname;
-        isNixOS = false;
-        role = "workstation";
-      };
-      modules = [
-        {
-          nixpkgs.overlays = [
-            rust-overlay.overlays.default
-            self.common.overlays
-          ];
-        }
-        ./home
-      ];
-    };
   };
 }

home/browser.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   lib,
-  isNixOS ? true,
   ...
 }: {
   programs.firefox = {
@@ -10,7 +9,7 @@
   };
 
   programs.chromium = {
-    enable = pkgs.stdenv.isLinux && isNixOS;
+    enable = pkgs.stdenv.isLinux;
     package = pkgs.ungoogled-chromium.override {
       enableWideVine = true;
       commandLineArgs = [
@@ -41,14 +40,37 @@
         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";
+      })
+      (createChromiumExtension {
+        # dark reader
+        id = "eimadpbcbfnmbkopoojfekhnkhdbieeh";
+        sha256 = "sha256:06a9dz589i1da519kivzp7bljksl2xxsd151y7ww0hx28jd1694b";
+        version = "4.9.113";
       })
     ];
   };

home/default.nix

@@ -1,58 +1,64 @@
-{ lib
-, pkgs
-, userName
-, isNixOS ? true
-, ...
-}:
-let
-  # TODO: Have a file structure that holds all the configuration files that can't be configured by Nix (or I haven't found the time to do so)
+{
+  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
-{
-  _module.args = {
-    inherit dirs;
-  };
-
+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 [
-    {
+  # 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";
-    }
-
-    (lib.mkIf isNixOS {
     sessionVariables = {
       XDG_CURRENT_DESKTOP = "sway";
       XDG_SESSION_TYPE = "wayland";
-        XDG_SESSION_DESKTOP = "sway";
+      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 pkgs.stdenv.isLinux {
-      pointerCursor = {
+    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
       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;

home/k9s.nix

@@ -1,32 +0,0 @@
-{ pkgs, ... }: {
-  programs.k9s = {
-    enable = true;
-    package = pkgs.k9s;
-    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.yaml;
-      };
-
-      ui = {
-        skin = "catppuccin-mocha";
-        enableMouse = true;
-        headless = false;
-        logoless = true;
-        crumbsless = false;
-        splashless = true;
-        reactive = false;
-        noIcons = false;
-        defaultsToFullscreen = false;
-      };
-    };
-  };
-}

home/krew.nix

@@ -1,14 +0,0 @@
-{ pkgs, lib, ... }:
-with pkgs;
-let
-  plugins = [
-    "krew"
-    "oidc-login"
-  ];
-in {
-  home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    ${lib.concatMapStringsSep "\n" (plugin: ''
-      $DRY_RUN_CMD ${krew}/bin/krew install ${plugin} || true
-    '') plugins}
-  '';
-}

home/packages/common.nix

@@ -2,19 +2,9 @@
   pkgs,
   ...
 }: {
-  imports = [
-    ../atuin.nix
-    ../shell.nix
-    ../git.nix
-    ../starship.nix
-    ../eza.nix
-    ../neovim.nix
-    ../bat.nix
-  ];
-
-  nixpkgs.config.allowUnfree = true;
-
   home.packages = with pkgs; [
+    yazi # terminal file manager
+
     # archives
     zip
     xz
@@ -22,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
   ];
 }

home/packages/darwin.nix

@@ -1,7 +1,10 @@
-{ lib, pkgs, ... }:
-lib.mkIf pkgs.stdenv.isDarwin {
-  home.packages = with pkgs; [
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
     discord
     ollama
-  ];
+  ]);
 }

home/packages/default.nix

@@ -1,11 +1,11 @@
-{ lib, role ? "workstation", ... }:
 {
-  imports =
-    [
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
     ./common.nix
     ./darwin.nix
     ./linux.nix
-    ]
-    ++ lib.optional (role == "workstation") ./workstation.nix
-    ++ lib.optional (role == "server") ./server.nix;
+  ];
 }

home/packages/linux.nix

@@ -1,16 +1,21 @@
-{ lib, pkgs, isNixOS ? true, ... }:
-lib.mkIf pkgs.stdenv.isLinux {
-  home.packages = with pkgs; [
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
     imv
-    xdg-utils
-  ] ++ lib.optionals isNixOS [
     betterdiscordctl
     vesktop
+    xdg-utils
+    mcrcon
     xfce.thunar
     pavucontrol
     godot
     aseprite
+    zathura
     gpu-screen-recorder
     gpu-screen-recorder-gtk
-  ];
+    # ungoogled-chromium
+  ]);
 }

home/packages/server.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = [
-  ];
-}

home/packages/workstation.nix

@@ -1,33 +0,0 @@
-{
-  lib,
-  pkgs,
-  isNixOS ? true,
-  ...
-}: {
-  imports = [
-    ../terminal.nix
-    ../browser.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
-  ];
-}

home/shell.nix

@@ -1,11 +1,9 @@
 {pkgs, lib, ...}: {
   programs.fish = {
     enable = true;
-    shellInit = ''
-      if test -d $HOME/.krew/bin
-        set -gx PATH $HOME/.krew/bin $PATH
-      end
-    '';
+    # initExtra = ''
+    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
+    # '';
 
     shellAliases = {
       # ls aliases

home/terminal.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ lib, pkgs, ghostty, ... }: {
   programs.alacritty = {
     enable = pkgs.stdenv.isLinux;
     settings = {
@@ -103,4 +103,9 @@
   programs.kitty = {
     enable = false; # TODO: to enable later
   };
+
+  home.packages = if pkgs.stdenv.isLinux then
+    [ ghostty.packages.${pkgs.system}.default ]
+  else
+    [ ];
 }

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";
@@ -62,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 {
@@ -108,9 +119,34 @@ in {
     ffxiv = {
       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 "Genshin Impact launcher (legacy)";
       };
 
-  config = {
+      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 = let 
+    agl = cfg.aagl;
+  in {
     programs.steam = lib.mkIf cfg.steam.enable {
       enable = true;
       remotePlay.openFirewall = cfg.steam.firewall.remotePlay;
@@ -139,6 +175,26 @@ in {
         ];
     };
 
+    programs.anime-game-launcher = lib.mkIf agl.anime-game-launcher.enable {
+      enable = true;
+    };
+
+    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;
+    };
+
     environment.systemPackages =
       (lib.optionals cfg.lutris.enable (
         [cfg.lutris.package] ++
@@ -154,6 +210,19 @@ 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;
+    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=" ];
+      }
+    );
   };
 }

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

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";
 }

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

modules/common/overlays.nix

@@ -1,9 +1,8 @@
 final: prev: let
-  # Use latest rust from overlay which should work on non-NixOS
-  rust_latest = prev.rust-bin.stable.latest.default;
+  rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
   myRustPlatform = prev.makeRustPlatform {
-    cargo = rust_latest;
-    rustc = rust_latest;
+    cargo = rust_1_90_0;
+    rustc = rust_1_90_0;
   };
 in {
   lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
@@ -48,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"
-  #   ];
-  # });
 }

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
       ];

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.

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
@@ -89,8 +89,10 @@ in {
         localNetworkGameTransfers = true;
       };
     };
+    vkbasalt.enable = true;
     gamemode.enable = true;
     gamescope.enable = true;
+    mangohud.enable = true;
     lutris = {
       enable = true;
       wine = {
@@ -100,14 +102,11 @@ in {
       compatibility = {
         protonSupport = true;
       };
-      extraPackages = with pkgs; [
-        gamemode
-        mangohud
-      ];
     };
 
     ffxiv.enable = true;
     minecraft.enable = true;
+    aagl.anime-game-launcher.enable = true;
   };
 
   # Power management (see ../../pwrMgmt/default.nix)

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