refactor: clean up FIXMEs and overlays

common/packages.nix

@@ -12,7 +12,6 @@ inputs @ {
     ++ (builtins.attrValues {
       inherit
         (self.overlays)
-        misc
         xdg-desktop-portal-kde
         ;
     });

devices/bbsteamie/modules/desktop/steam.nix

@@ -68,8 +68,7 @@ defaultSession: {
 
       self.packages.${pkgs.system}.protonhax
 
-      # FIXME: Ryujinx ACNH crashes on Vulkan
+      # FIXME: Ryujinx ACNH crashes on Vulkan https://github.com/Ryujinx/Ryujinx/issues/6708
-      # https://github.com/Ryujinx/Ryujinx/issues/6708
       pkgs.ryujinx
     ];
   };

devices/homie/modules/music/default.nix

@@ -84,4 +84,14 @@
   environment.etc."spotifyd/credentials.json" = {
     source = config.sops.secrets.spotifyd.path;
   };
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      # FIXME: remove this if https://github.com/NixOS/nixpkgs/pull/342913 is merged
+      spotifyd = prev.spotifyd.override {
+        withMpris = false;
+        withKeyring = false;
+      };
+    })
+  ];
 }

devices/nos/modules/llm.nix

@@ -6,6 +6,16 @@ in {
   # In case tailscale is down
   boot.kernel.sysctl."net.ipv4.ip_nonlocal_bind" = 1;
 
+  nixpkgs.overlays = [
+    # We can get rid of this once full CUDA support works
+    (final: prev: {
+      ctranslate2 = prev.ctranslate2.override {
+        withCUDA = true;
+        withCuDNN = true;
+      };
+    })
+  ];
+
   services = {
     # Speech-to-Text
     wyoming.faster-whisper.servers."en" = {

inputs.nix

@@ -56,8 +56,7 @@ let
       repo = "nixos-pcsd";
     };
 
-    # FIXME: use nixpkgs once this reaches unstable
+    # FIXME: use nixpkgs once this reaches unstable https://pr-tracker.nelim.org/?pr=340054
-    # https://github.com/NixOS/nixpkgs/pull/340054
     headscale = mkDep {
       owner = "juanfont";
       repo = "headscale";

lib/default.nix

@@ -18,4 +18,4 @@ in
   {inherit lib mkVersion capitalise;}
   // (import ./inputs.nix lib lock)
   // optionalAttrs (inputs != {}) (import ./flake-lib.nix inputs)
-  // optionalAttrs (pkgs != {}) (import ./pkgs.nix pkgs mkVersion capitalise self)
+  // optionalAttrs (pkgs != {}) (import ./pkgs.nix {inherit pkgs mkVersion capitalise self;})

lib/flake-lib.nix

@@ -13,6 +13,7 @@ inputs: rec {
       };
     };
 
+  # Enable use of `nixpkgs.overlays` on both NixOS and NixOnDroid
   allowModularOverrides = {
     cudaSupport ? false,
     system,
@@ -77,6 +78,7 @@ inputs: rec {
             };
 
             config.environment.packages = config.environment.systemPackages;
+
             # This disables the assertion that fails because of nixpkgs.overlays
             config._module.args.isFlake = mkForce false;
           })

lib/pkgs.nix

@@ -1,4 +1,9 @@
-pkgs: mkVersion: capitalise: self: {
+{
+  capitalise,
+  mkVersion,
+  pkgs,
+  self,
+}: {
   buildPlugin = pname: src:
     pkgs.vimUtils.buildVimPlugin {
       inherit pname src;

outputs.nix

@@ -72,7 +72,7 @@
         ];
       };
       binto = mkNixOS {
-        # FIXME: https://github.com/NixOS/nixpkgs/issues/338315
+        # FIXME: https://pr-tracker.nelim.org/?pr=339619
         # cudaSupport = true;
         extraModules = [./devices/binto];
       };
@@ -81,7 +81,7 @@
 
       # NAS
       nos = mkNixOS {
-        # FIXME: https://github.com/NixOS/nixpkgs/issues/338315
+        # FIXME: https://pr-tracker.nelim.org/?pr=339619
         # cudaSupport = true;
         extraModules = [
           ./devices/nos

overlays/default.nix

@@ -1,4 +1,3 @@
 {...}: {
-  misc = import ./misc;
   xdg-desktop-portal-kde = import ./xdg-desktop-portal-kde;
 }

overlays/misc/default.nix

@@ -1,12 +0,0 @@
-final: prev: {
-  ctranslate2 = prev.ctranslate2.override {
-    withCUDA = true;
-    withCuDNN = true;
-  };
-
-  # FIXME: remove this if https://github.com/NixOS/nixpkgs/pull/342913 is merged
-  spotifyd = prev.spotifyd.override {
-    withMpris = false;
-    withKeyring = false;
-  };
-}