diff --git a/flake.lock b/flake.lock index 38f3d36..84d9834 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1750443503, - "narHash": "sha256-TVDR3EyVhOdgcWKhSa5tFqEKgCzRgADcfaThmimkIFw=", + "lastModified": 1750497756, + "narHash": "sha256-4UW5oR9kqzs2BnzxeDvEnoMaD1NTmHwf41Wzt8+E6ac=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4b39688c50935c3b279f1443221573cd54698240", + "rev": "b4bf921a1c856836190c9e61e31214aead109c80", "type": "github" }, "original": { @@ -238,7 +238,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -290,39 +290,6 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_9" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "freetype2": { "flake": false, "locked": { @@ -523,11 +490,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750371888, - "narHash": "sha256-+8f8R1PdcmmuOES6GtwgdtXKClvXr6kYPa76AHRoLCs=", + "lastModified": 1750503503, + "narHash": "sha256-UWxbL6a81GWBg990pcct1dzm4HuWIEd1Q6mpV7bHrnM=", "owner": "hyprwm", "repo": "hypridle", - "rev": "cff17e8b52c129dab5b9ca4a6fe214e616e36ab8", + "rev": "25578b71370d1ba7bf08127ca4b0959452df4d04", "type": "github" }, "original": { @@ -804,41 +771,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1746827285, - "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", - "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_2", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746838955, - "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", - "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" - } - }, "musnix": { "inputs": { "nixpkgs": [ @@ -891,11 +823,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750417464, - "narHash": "sha256-PKOpEqaOn6ZYgNIuP1FF04d+3AYusxSydu764z007ac=", + "lastModified": 1750471128, + "narHash": "sha256-oR2yjhAPXZDmfFb4UwBeVQcJBtrUNFwufovzN8sTBVc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "21a26d38e174b418a2649db76505041b8b4eccbb", + "rev": "13e7a34df7aa4e7d8ec4dd9df9d5a01973f28f49", "type": "github" }, "original": { @@ -996,7 +928,7 @@ "nixpkgs" ], "nixpkgs-lib": "nixpkgs-lib_3", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1748538518, @@ -1128,11 +1060,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1750259320, - "narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=", + "lastModified": 1750400657, + "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "github" }, "original": { @@ -1144,16 +1076,16 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1750151854, - "narHash": "sha256-3za+1J9FifMetO7E/kwgyW+dp+8pPBNlWKfcBovnn6M=", + "lastModified": 1750400657, + "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad5c70bcc5cc5178205161b7a7d61a6e80f6d244", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -1330,7 +1262,6 @@ "hypridle": "hypridle", "hyprlock": "hyprlock", "isd": "isd", - "lix-module": "lix-module", "musnix": "musnix", "nh": "nh", "niri": "niri", @@ -1572,21 +1503,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": "nixpkgs_3" @@ -1688,7 +1604,7 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", @@ -1714,7 +1630,7 @@ }, "xwayland-satellite": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -1769,7 +1685,7 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 6e5e611..3b27cd9 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; home-manager = { url = "github:nix-community/home-manager"; @@ -183,7 +178,6 @@ inherit system; specialArgs = configArgs; modules = [ - # inputs.lix-module.nixosModules.default inputs.disko.nixosModules.disko inputs.musnix.nixosModules.musnix inputs.niri.nixosModules.niri diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index c070043..9904b6c 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -57,7 +57,7 @@ }) (final: prev: { - wineWowPackages.stagingFull = pkgs-stable.wineWowPackages.stagingFull.overrideAttrs (old: { + wineWowPackages.yabridge = prev.wineWowPackages.yabridge.overrideAttrs (old: { patches = [ ../../patches/wine-6006.patch ]; waylandSupport = true; fontconfigSupport = true; diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index daffd66..e5aceeb 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -68,7 +68,6 @@ polychromatic - swayidle emojify smile @@ -130,7 +129,7 @@ obs-studio-plugins.wlrobs obs-studio-plugins.obs-gstreamer - wineWowPackages.stagingFull + wineWowPackages.yabridge winetricks virt-manager diff --git a/modules/home/music.nix b/modules/home/music.nix index 868498f..1791b3d 100644 --- a/modules/home/music.nix +++ b/modules/home/music.nix @@ -25,10 +25,10 @@ zenity # needed for bitwigh drivenbymoss extension (yabridge.override { - wine = wineWowPackages.stagingFull; + wine = wineWowPackages.yabridge; }) (yabridgectl.override { - wine = wineWowPackages.stagingFull; + wine = wineWowPackages.yabridge; }) supercollider-with-plugins diff --git a/packages/rmpc-latest.nix b/packages/rmpc-latest.nix index e5156cf..32fc3e0 100644 --- a/packages/rmpc-latest.nix +++ b/packages/rmpc-latest.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { owner = "mierak"; repo = "rmpc"; rev = "master"; - hash = "sha256-dMFqofhhRsibw3D09JLGWK4Zk8n353OCvTV3+G6hAes="; + hash = "sha256-EFGC50H74liww9yF2GAIVnuy64CA6H7qoLqlqQ7n3j0="; }; useFetchCargoVendor = true;