enabled nix-ld, related libraries

modules/apps/gaming.nix

@@ -142,19 +142,6 @@ 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 
@@ -226,10 +213,7 @@ 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.emulators.enable (
-        lib.optionals cfg.emulators.n64.enable [pkgs.mupen64plus]
-      ));
+      (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]);
 
     nix.settings = let 
       inherit agl;

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/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

@@ -93,7 +93,6 @@ in {
     gamemode.enable = true;
     gamescope.enable = true;
     mangohud.enable = true;
-
     lutris = {
       enable = true;
       wine = {
@@ -105,13 +104,6 @@ in {
       };
     };
 
-    emulators = {
-      enable = true;
-      n64 = {
-        enable = true;
-      };
-    };
-
     ffxiv.enable = true;
     minecraft.enable = true;
     aagl.anime-game-launcher.enable = true;