Update nixpkgses

flake.lock

@@ -173,11 +173,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1694382265,
-        "narHash": "sha256-bHM6/6GYzY/seA0YaSSN4opvoIqfWsfRKmdS6tMsh6A=",
+        "lastModified": 1695850660,
+        "narHash": "sha256-KimiTIK2RjLo3zGH+5CEtI8ZY2XGQYGM/u74v2YD2kw=",
         "ref": "refs/heads/main",
-        "rev": "c9ffcdf53555f2e796a26dd2c8c8174957b55020",
-        "revCount": 1635,
+        "rev": "9d813802a9bffeb08ba92172ebb9eddb216319b6",
+        "revCount": 1717,
         "type": "git",
         "url": "ssh://gitea@git.dtth.ch/nki/phanpy"
       },
@@ -410,6 +410,24 @@
         "type": "github"
       }
     },
+    "flake-parts_5": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1693611461,
+        "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -839,6 +857,25 @@
         "type": "github"
       }
     },
+    "nix-gaming": {
+      "inputs": {
+        "flake-parts": "flake-parts_5",
+        "nixpkgs": "nixpkgs_9"
+      },
+      "locked": {
+        "lastModified": 1695063925,
+        "narHash": "sha256-uJEBdoWy+ixiZytrcw2lZf5aXcL7RL5pgMuVb+v/nfg=",
+        "owner": "fufexan",
+        "repo": "nix-gaming",
+        "rev": "68d010acc841d9b19fc9fce184acc935cc086ee4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "fufexan",
+        "repo": "nix-gaming",
+        "type": "github"
+      }
+    },
     "nixos-m1": {
       "inputs": {
         "flake-compat": "flake-compat_5",
@@ -895,6 +932,24 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "dir": "lib",
+        "lastModified": 1693471703,
+        "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
+        "type": "github"
+      },
+      "original": {
+        "dir": "lib",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1678872516,
@@ -913,11 +968,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1694760568,
-        "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
+        "lastModified": 1695806987,
+        "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e",
+        "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57",
         "type": "github"
       },
       "original": {
@@ -928,6 +983,22 @@
       }
     },
     "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1695559356,
+        "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_11": {
       "locked": {
         "lastModified": 1656753965,
         "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
@@ -943,7 +1014,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_11": {
+    "nixpkgs_12": {
       "locked": {
         "lastModified": 1685533922,
         "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=",
@@ -1070,16 +1141,16 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1694753796,
-        "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=",
-        "owner": "nixos",
+        "lastModified": 1694760568,
+        "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2",
+        "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.05",
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1133,7 +1204,7 @@
     "rnix-lsp": {
       "inputs": {
         "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_11",
         "utils": "utils_2"
       },
       "locked": {
@@ -1165,8 +1236,9 @@
         "kakoune": "kakoune",
         "lanzaboote": "lanzaboote",
         "mpd-mpris": "mpd-mpris",
+        "nix-gaming": "nix-gaming",
         "nixos-m1": "nixos-m1",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_10",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "rnix-lsp": "rnix-lsp",
@@ -1524,7 +1596,7 @@
       "inputs": {
         "flake-utils": "flake-utils_10",
         "naersk": "naersk_3",
-        "nixpkgs": "nixpkgs_11"
+        "nixpkgs": "nixpkgs_12"
       },
       "locked": {
         "lastModified": 1694957290,

flake.nix

@@ -44,6 +44,7 @@
     };
     eza.url = github:eza-community/eza/v0.12.0;
     eza.inputs.nixpkgs.follows = "nixpkgs";
+    nix-gaming.url = github:fufexan/nix-gaming;
 
     # --- Sources
     kakoune.url = github:mawww/kakoune;
@@ -88,6 +89,14 @@
       };
       nixpkgsAsRegistry = nixpkgsAsRegistry_ nixpkgs;
 
+      osuStable = { pkgs, ... }: {
+        nix.settings = {
+          substituters = [ "https://nix-gaming.cachix.org" ];
+          trusted-public-keys = [ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ];
+        };
+        environment.systemPackages = [ inputs.nix-gaming.packages.${pkgs.hostPlatform.system}.osu-stable ];
+      };
+
       # Common Nix modules
       common-nix = stable: { ... }: {
         imports = [
@@ -133,6 +142,7 @@
         modules = [
           (common-nixos nixpkgs)
           ./nki-home/configuration.nix
+          osuStable
           inputs.home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;

home/osu.nix

@@ -1,29 +1,31 @@
 { pkgs, config, lib, ... }:
 
 let
-  osu-pkg = with pkgs; with lib;
-    appimageTools.wrapType2 rec {
-      pname = "osu-lazer-bin";
-      version = "2023.123.0";
+  osu-pkg = pkgs.unstable.osu-lazer-bin;
+  # with pkgs; with lib;
+  #   appimageTools.wrapType2 rec {
+  #     pname = "osu-lazer-bin";
+  #     version = "2023.914.0";
 
-      src = fetchurl {
-        url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        sha256 = "sha256-edu93pvTEM5/s0kW55U1xfYGDl0eUpGXypvuYIwsM3w=";
-      };
+  #     src = fetchurl {
+  #       url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
+  #       # sha256 = "sha256-edu93pvTEM5/s0kW55U1xfYGDl0eUpGXypvuYIwsM3w=";
+  #       hash = lib.fakeHash;
+  #     };
 
-      extraPkgs = pkgs: with pkgs; [ icu ];
+  #     extraPkgs = pkgs: with pkgs; [ icu ];
 
-      extraInstallCommands =
-        let contents = appimageTools.extract { inherit pname version src; };
-        in
-        ''
-          mv -v $out/bin/${pname}-${version} $out/bin/osu\!
-          install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications
-          for i in 16 32 48 64 96 128 256 512 1024; do
-            install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png
-          done
-        '';
-    };
+  #     extraInstallCommands =
+  #       let contents = appimageTools.extract { inherit pname version src; };
+  #       in
+  #       ''
+  #         mv -v $out/bin/${pname}-${version} $out/bin/osu\!
+  #         install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications
+  #         for i in 16 32 48 64 96 128 256 512 1024; do
+  #           install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png
+  #         done
+  #       '';
+  #   };
 in
 {
   home.packages = [ osu-pkg ];