added emulation to apps/gaming module, added mupen64plus n64 emulator

2025-11-18 00:16:45 -05:00
8 changed files with 77 additions and 121 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1765245541,
-        "narHash": "sha256-Q4KU8bvFL3tJb1sTAPFG6qvi0KP8HvAfLG7mGqdSQV8=",
+        "lastModified": 1761836926,
+        "narHash": "sha256-HnNzEUuBqmJCUV/N/IbL0wFT1LHmNGWTLkUg7yRIhpY=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "f251969383969412b94a98c9378deaa114a76338",
+        "rev": "e601b479a3d08124ee6ceea391cdc3f395aab54e",
        "type": "github"
      },
      "original": {
@@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762912391,
-        "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=",
+        "lastModified": 1759509947,
+        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126",
+        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
        "type": "github"
      },
      "original": {
@@ -62,11 +62,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@@ -102,11 +102,11 @@
        "zon2nix": "zon2nix"
      },
      "locked": {
-        "lastModified": 1765752037,
-        "narHash": "sha256-hjqxmMTTiGBBELqnwiomBv8FaowC5MPHMVr+tKQZybU=",
+        "lastModified": 1761933492,
+        "narHash": "sha256-DNGhpvYt6dVbkDse4s/L/jJvejvOV0bs+YWfAAskJ7g=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "1d7fe9e70d5800de8de6244ebb1d07efb74ec36e",
+        "rev": "765ee6842930f0d6918574b9b87c2ee6583e4727",
        "type": "github"
      },
      "original": {
@@ -122,11 +122,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763992789,
-        "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
+        "lastModified": 1758463745,
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
        "type": "github"
      },
      "original": {
@@ -170,11 +170,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1763191728,
-        "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=",
-        "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
+        "lastModified": 315532800,
+        "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
+        "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
@@ -183,11 +183,24 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1765363881,
-        "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=",
+        "lastModified": 1758360447,
+        "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
+        "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1761597516,
+        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0",
+        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
        "type": "github"
      },
      "original": {
@@ -197,7 +210,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1744536153,
        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -220,7 +233,7 @@
        "ghostty": "ghostty",
        "home-manager": "home-manager",
        "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
        "rust-overlay": "rust-overlay_2"
      }
    },
@@ -229,11 +242,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1764470739,
-        "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=",
+        "lastModified": 1761791894,
+        "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a",
+        "rev": "59c45eb69d9222a4362673141e00ff77842cd219",
        "type": "github"
      },
      "original": {
@@ -244,14 +257,14 @@
    },
    "rust-overlay_2": {
      "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1765680428,
-        "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=",
+        "lastModified": 1761964689,
+        "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f",
+        "rev": "63d22578600f70d293aede6bc737efef60ebd97f",
        "type": "github"
      },
      "original": {
@@ -291,11 +304,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763295135,
-        "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=",
+        "lastModified": 1760401936,
+        "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a",
+        "rev": "365085b6652259753b598d43b723858184980bbe",
        "type": "github"
      },
      "original": {
@@ -306,10 +319,7 @@
    },
    "zon2nix": {
      "inputs": {
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
        "lastModified": 1758405547,
--- a/modules/apps/gaming.nix
+++ b/modules/apps/gaming.nix
@@ -142,6 +142,19 @@ in {
        enable = lib.mkEnableOption "Zenless Zone Zero (ZZZ) launcher";
      };
    };
+
+    emulators = {
+      enable = lib.mkEnableOption "Emulation";
+
+      n64 = {
+        enable = lib.mkEnableOption "Nintendo 64 (N64) emulator";
+        package = lib.mkOption {
+          type = lib.types.package;
+          default = pkgs.mupen64plus;
+          description = "Package used for the Nintendo 64 (N64) emulator";
+        };
+      };
+    };
  };

  config = let 
@@ -213,7 +226,10 @@ in {
      (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]);
+      (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]) ++
+      (lib.optionals cfg.emulators.enable (
+        lib.optionals cfg.emulators.n64.enable [pkgs.mupen64plus]
+      ));

    nix.settings = let 
      inherit agl;
--- a/modules/common/README.md
+++ b/modules/common/README.md
@@ -7,11 +7,3 @@ 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
--- a/modules/common/environment.nix
+++ b/modules/common/environment.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, ... }: {
+{ lib, pkgs, ... }: {
  environment.systemPackages = with pkgs; [
    git
    vim
@@ -13,73 +13,11 @@
    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";
 }
--- a/modules/common/fonts.nix
+++ b/modules/common/fonts.nix
@@ -12,8 +12,4 @@
      monaspace
    ]
    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-
-  environment.systemPackages = with pkgs; [
-    adwaita-icon-theme
-  ];
 }
--- a/modules/machine/README.md
+++ b/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. There is some infrastructure missing here like my routers and switches that I also name after summons.
+These are named after Final Fantasy summons.
--- a/modules/machine/cloud/configuration.nix
+++ b/modules/machine/cloud/configuration.nix
@@ -93,6 +93,7 @@ in {
    gamemode.enable = true;
    gamescope.enable = true;
    mangohud.enable = true;
+
    lutris = {
      enable = true;
      wine = {
@@ -104,6 +105,13 @@ in {
      };
    };

+    emulators = {
+      enable = true;
+      n64 = {
+        enable = true;
+      };
+    };
+
    ffxiv.enable = true;
    minecraft.enable = true;
    aagl.anime-game-launcher.enable = true;
--- a/modules/virtualization/hardware.nix
+++ b/modules/virtualization/hardware.nix
@@ -1,8 +1,4 @@
-{ pkgs, ... }: {
+{...}: {
  virtualisation.libvirtd.enable = true;
  programs.virt-manager.enable = true;
-  environment.systemPackages = with pkgs; [
-    qemu
-    quickemu
-  ];
 }