diff --git a/flake.lock b/flake.lock index 6ba24c5..8091b18 100644 --- a/flake.lock +++ b/flake.lock @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1771469470, + "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1770260404, - "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", + "lastModified": 1771744638, + "narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", + "rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1770315571, - "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", + "lastModified": 1771734689, + "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", + "rev": "8f590b832326ab9699444f3a48240595954a4b10", "type": "github" }, "original": { @@ -571,28 +571,13 @@ "type": "github" } }, - "nixpkgs-mesa-26": { - "locked": { - "lastModified": 1770837954, - "narHash": "sha256-B9rn+KSP/+lgM7j406sDIapS1IedxgACFdiRHzMTzVU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "157721757fca10d3f26d11ace9883f1f0b0bccef", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "157721757fca10d3f26d11ace9883f1f0b0bccef", - "type": "indirect" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -649,11 +634,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1770464364, - "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", + "lastModified": 1771574726, + "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", + "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", "type": "github" }, "original": { @@ -757,7 +742,6 @@ "nix-index-database": "nix-index-database", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs_5", - "nixpkgs-mesa-26": "nixpkgs-mesa-26", "nixpkgs-unstable": "nixpkgs-unstable", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", @@ -822,11 +806,11 @@ ] }, "locked": { - "lastModified": 1770526836, - "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=", + "lastModified": 1771735105, + "narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d", + "rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f", "type": "github" }, "original": { @@ -982,11 +966,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1770130846, - "narHash": "sha256-B9uMrG9ghVJWNBXOMmKMqfxErh58A2AINXsdqMpgyvc=", + "lastModified": 1771632757, + "narHash": "sha256-Eb0v0imSKZDuZ6rCR7CX3PcGfPhdwsA6VFEQhQQQ+R8=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "5e3a56de3af9244d2ebab808c24e5d590115534b", + "rev": "0000b3483cf507cb34c66ac3dcefc20228c85963", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f3d6e23..7b8b624 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,6 @@ nixpkgs.url = "nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - nixpkgs-mesa-26.url = "nixpkgs/157721757fca10d3f26d11ace9883f1f0b0bccef"; - home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index df50d97..97c8965 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -12,12 +12,12 @@ # }; # }; - hardware.graphics.package = pkgs.pkgs-mesa-26.mesa; + hardware.graphics.package = pkgs.unstable.mesa; # Mesa 26 at the time hardware.graphics.enable32Bit = true; hardware.graphics.extraPackages = with pkgs; [ # libva needs to match `hardware.graphics.package` - pkgs-mesa-26.libva + unstable.libva ]; } diff --git a/overlays/default.nix b/overlays/default.nix index 7ef585b..1445371 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -22,7 +22,6 @@ rec { in { unstable = import inputs.nixpkgs-unstable args; - pkgs-mesa-26 = import inputs.nixpkgs-mesa-26 args; }; themes = (