From f74f742066bacebd2e2b9b8fd9097f4702b5e295 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Thu, 21 Aug 2025 19:55:38 -0600 Subject: [PATCH] quick update --- flake.lock | 24 +++++------ hosts/modules/core.nix | 1 + hosts/modules/npm.nix | 2 +- hosts/system-packages.nix | 2 +- pkgs/rpcs3/default.nix | 90 --------------------------------------- 5 files changed, 15 insertions(+), 104 deletions(-) delete mode 100644 pkgs/rpcs3/default.nix diff --git a/flake.lock b/flake.lock index d00898c..dce8e44 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1755776884, + "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1755050545, - "narHash": "sha256-DPdNnDwDvGWn/AZ8B3G95o8EIM4/ewIfgTgR+Rlul9o=", + "lastModified": 1755655044, + "narHash": "sha256-43fb+p7xXCIimF7r8XhrDKo3uTkeKhMbzcJ4VdUOG/M=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "064757499f6d48e343552e328eb757a30fa6d17a", + "rev": "96cda5144e73514cd52d3e0e8b2bf116a5266b22", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754937576, - "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", + "lastModified": 1755704039, + "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", + "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", "type": "github" }, "original": { @@ -204,11 +204,11 @@ }, "unstable": { "locked": { - "lastModified": 1755020227, - "narHash": "sha256-gGmm+h0t6rY88RPTaIm3su95QvQIVjAJx558YUG4Id8=", + "lastModified": 1755736253, + "narHash": "sha256-jlIQRypNhB1PcB1BE+expE4xZeJxzoAGr1iUbHQta8s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "695d5db1b8b20b73292501683a524e0bd79074fb", + "rev": "596312aae91421d6923f18cecce934a7d3bfd6b8", "type": "github" }, "original": { diff --git a/hosts/modules/core.nix b/hosts/modules/core.nix index 0f02d39..4575002 100644 --- a/hosts/modules/core.nix +++ b/hosts/modules/core.nix @@ -26,5 +26,6 @@ nix-prefetch-git icu libclang + argc ]; } diff --git a/hosts/modules/npm.nix b/hosts/modules/npm.nix index 560acb8..7845690 100644 --- a/hosts/modules/npm.nix +++ b/hosts/modules/npm.nix @@ -14,7 +14,7 @@ in { config = lib.mkIf config.npm.enable { environment.systemPackages = with pkgs; [ - nodejs_23 + nodejs_24 nodePackages.npm yarn bun diff --git a/hosts/system-packages.nix b/hosts/system-packages.nix index c1a061c..442abcd 100644 --- a/hosts/system-packages.nix +++ b/hosts/system-packages.nix @@ -28,7 +28,7 @@ ./modules/libs.nix ./modules/rgb.nix ]; - programs.npm.enable = true; + npm.enable = true; services.udisks2.enable = true; # Some programs need SUID wrappers, can be configured further or are diff --git a/pkgs/rpcs3/default.nix b/pkgs/rpcs3/default.nix deleted file mode 100644 index a3583a8..0000000 --- a/pkgs/rpcs3/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ - pkgs, - rpcs3_latest, - ... -}: { - pugixml = pkgs.pugixml.overrideAttrs (oldAttrs: rec { - version = "1.15"; - src = pkgs.fetchurl { - url = "https://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz"; - sha256 = "sha256-ZVreV/pwP7QhwuuaARO1BkvdsUXUFd0fiMeTU9kNURo="; - }; - }); - SDL3 = pkgs.stdenv.mkDerivation rec { - pname = "SDL3"; - version = "3.1.3"; - src = pkgs.fetchFromGitHub { - owner = "libsdl-org"; - repo = "SDL"; - rev = "preview-${version}"; - sha256 = "sha256-S7yRcLHMPgq6+gec8l+ESxp2dJ+6Po/UNsBUXptQzMQ="; - }; - nativeBuildInputs = [pkgs.cmake]; - buildInputs = [pkgs.libGL pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.alsa-lib]; - cmakeFlags = [ - "-DSDL_STATIC=OFF" - "-DSDL_SHARED=ON" - "-DSDL_INSTALL_CMAKEDIR=${placeholder "out"}/lib/cmake/SDL3" - ]; - }; - rpcs3_latest = pkgs.rpcs3.overrideAttrs (oldAttrs: { - meta = { - maintainers = ["Cobray"]; - description = "Latest build of PS3 emulator"; - homepage = "https://rpcs3.net/"; - license = pkgs.lib.licenses.gpl2; - }; - src = pkgs.fetchgit { - url = "https://github.com/RPCS3/rpcs3.git"; - rev = rpcs3_latest.rev; - sha256 = "sha256-GfPOCiF8bBGdXE9UG6jgkb4VcDAcBNqp9hqfLykIpyA="; - fetchSubmodules = true; - }; - patches = []; - nativeBuildInputs = - (oldAttrs.nativeBuildInputs or []) - ++ [ - pkgs.llvmPackages_19.llvm.dev - pkgs.llvmPackages_19.clang - pkgs.pkg-config - pkgs.qt6.qmake - pkgs.qt6.full - pkgs.xxd - pkgs.wayland-scanner - ]; - buildInputs = - (oldAttrs.buildInputs or []) - ++ [ - pkgs.llvmPackages_19.llvm - pkgs.llvmPackages_19.libclang - pkgs.qt6.full - pkgs.vulkan-loader - pkgs.vulkan-tools - pkgs.wayland - pkgs.wayland-protocols - pkgs.libxkbcommon - pkgs.libpulseaudio - pkgs.libevdev - pkgs.udev - pkgs.glew - pkgs.libpng - pkgs.zstd - ]; - cmakeFlags = - (oldAttrs.cmakeFlags or []) - ++ [ - "-DCMAKE_PREFIX_PATH=${pkgs.qt6.full}:${pkgs.wayland}" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_CURL=ON" - "-DUSE_SYSTEM_WOLFSSL=ON" - "-DUSE_QT=ON" - "-DUSE_VULKAN=ON" - "-DUSE_WAYLAND=ON" - "-DUSE_PULSEAUDIO=ON" - "-DUSE_LIBEVDEV=ON" - "-DUSE_SYSTEM_ZSTD=ON" - "-DUSE_DISCORD_RPC=ON" - "-DUSE_SDL=OFF" - ]; - }); -}