refactored

flake.lock

@@ -47,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748656608,
-        "narHash": "sha256-VU+8/kZ57Y7XTmgMBpybGMxO/elvUn/4yMndZji2pY8=",
+        "lastModified": 1749002293,
+        "narHash": "sha256-86wVDHBgO7VEalk2VU/3k02pe+/0cycSOS0+3V0aKjI=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "b585487bb87faec1c7a09aada7cfe77dd7b3c5fe",
+        "rev": "a5f39e82c1c4c57e87b5c498dd3d0825db297398",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748437600,
-        "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=",
+        "lastModified": 1748889542,
+        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
+        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
     "rpcs3_latest": {
       "flake": false,
       "locked": {
-        "lastModified": 1748720164,
-        "narHash": "sha256-MaQWMp4V92c1mszgqvrbcbAOaqhZLqj75i8950PwNLI=",
+        "lastModified": 1748980799,
+        "narHash": "sha256-NS0AnmYO8EyvrmJEBz/BtyIyjLYpOJpLpYxWfHsZTWs=",
         "owner": "RPCS3",
         "repo": "rpcs3",
-        "rev": "c437fe9ff052f69c3d151a98e22cd77d3d9e013e",
+        "rev": "d15b7a995588561d64ce0cd250038f0757be3417",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,5 +1,6 @@
 {
   description = "NixOS configuration for Cobray";
+
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     home-manager = {
@@ -15,6 +16,7 @@
       flake = false;
     };
   };
+
   outputs = {
     self,
     nixpkgs,
@@ -25,7 +27,6 @@
   } @ inputs: let
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
-    customFontPkgs = import "${self}/pkgs/fonts" {inherit pkgs;};
     customPkgs = import "${self}/pkgs" {
       inherit pkgs;
       lib = nixpkgs.lib;
@@ -34,26 +35,34 @@
   in {
     nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
       inherit system;
-      specialArgs = {
-        inherit inputs customPkgs;
-        lib = nixpkgs.lib;
-      };
+      specialArgs = {inherit inputs;};
       modules = [
         {
-          nixpkgs.config.allowUnfree = true;
-          nixpkgs.overlays = [
+          nixpkgs = {
+            config = {
+              allowUnfree = true;
+              allowAliases = true;
+            };
+            hostPlatform = system;
+            overlays = [
               (final: prev: {
                 inherit
                   (customPkgs)
                   fish-rust
                   pugixml
                   SDL3
+                  rpcs3
                   rpcs3_latest
                   clear-sans
                   binary-font
                   ;
               })
+              (final: prev: {
+                clear-sans = prev.clear-sans.clear-sans;
+                binary-font = prev.binary-font.binary-clock-font;
+              })
             ];
+          };
         }
         ./hosts/configuration.nix
         home-manager.nixosModules.home-manager
@@ -61,9 +70,7 @@
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-            extraSpecialArgs = {
-              inherit inputs customPkgs;
-            };
+            extraSpecialArgs = {inherit inputs;};
             users.cobray = import ./home-manager/cobray.nix;
           };
         }

modules/fonts.nix

@@ -6,8 +6,8 @@
       noto-fonts-cjk-serif
       noto-fonts-emoji
       nerd-fonts._0xproto
-      nerd-fonts-noto
-      nerd-fonts-symbols-only
+      nerd-fonts.noto
+      nerd-fonts.symbols-only
       ipafont
       kochi-substitute
       clear-sans

pkgs/binary-font/default.nix

@@ -3,7 +3,7 @@
   lib,
   ...
 }: {
-  binary-clock-font = pkgs.stden.mkDerivation {
+  binary-clock-font = pkgs.stdenv.mkDerivation {
     pname = "binary-clock-font";
     version = "1.0.0";
     src = pkgs.fetchurl {

pkgs/clear-sans/default.nix

@@ -18,7 +18,7 @@
     meta = with lib; {
       description = "Clear Sans font";
       homepage = "https://github.com/intel/clear-sans";
-      license = licenses.apache;
+      license = licenses.asl20;
       maintainers = [cobray];
       platforms = platforms.all;
     };

pkgs/default.nix

@@ -10,5 +10,6 @@
 in {
   inherit (rpcs3Pkgs) pugixml SDL3 rpcs3 rpcs3_latest;
   fish-rust = pkgs.callPackage ./fish-rust {};
-  inherit (customFontPkgs) clear-sans binary-font;
+  clear-sans = pkgs.callPackage ./clear-sans {};
+  binary-font = pkgs.callPackage ./binary-font {};
 }

pkgs/rpcs3/default.nix

@@ -37,7 +37,7 @@
     src = pkgs.fetchgit {
       url = "https://github.com/RPCS3/rpcs3.git";
       rev = rpcs3_latest.rev;
-      sha256 = "sha256-l7ewWWbFWaziBGrWUMdmSn79tq1Sumnqvjcqr1LYfhU=";
+      sha256 = "sha256-WTb2FHR46qirndxQLcs7k7GPDTTSXb39ydtzuxCe17k=";
       fetchSubmodules = true;
     };
     patches = [];