From 20225b42957e79454f5c2ce18fb5a51850f5b8f2 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Wed, 3 Dec 2025 16:49:54 -0500 Subject: [PATCH] pin flake to stable 25.11 --- flake.lock | 28 +++++++++++++++------------- flake.nix | 6 +++--- system/hosts/peach/default.nix | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index adc4a66..e86a238 100644 --- a/flake.lock +++ b/flake.lock @@ -123,15 +123,16 @@ ] }, "locked": { - "lastModified": 1764636297, - "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", + "lastModified": 1764776959, + "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", + "rev": "e1680d594a9281651cbf7d126941a8c8e2396183", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -166,16 +167,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -190,15 +191,16 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1764663787, - "narHash": "sha256-nlW6BI2CiP6wlhjwpxOc8W6lMU9eaojAyVZFWlbQ/fg=", + "lastModified": 1764755396, + "narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=", "owner": "nix-community", "repo": "nixvim", - "rev": "2d8db68a8fd4a21e2017df167c6535499adc02d1", + "rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } @@ -211,11 +213,11 @@ ] }, "locked": { - "lastModified": 1764709261, - "narHash": "sha256-d6+4Y54c4EpCOzheViK8PIE+3wnvRzXXFt5C7kIDF6c=", + "lastModified": 1764795584, + "narHash": "sha256-Sq6SWFDCftLrnZ8GXO39b2HxH2NE8jtDeU2ud37F9qs=", "owner": "nix-community", "repo": "NUR", - "rev": "8acc5e762d63ba1c79707d517f6174278da03784", + "rev": "156e6d0e026c1a7687a74c908ee0ccf0df796f72", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c242ce0..26d2b87 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "My NixOS Configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; catppuccin = { url = "github:catppuccin/nix"; @@ -10,7 +10,7 @@ }; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -26,7 +26,7 @@ }; nixvim = { - url = "github:nix-community/nixvim"; + url = "github:nix-community/nixvim/nixos-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix index ae3f0ab..506e6dc 100644 --- a/system/hosts/peach/default.nix +++ b/system/hosts/peach/default.nix @@ -33,14 +33,14 @@ }; }; - hardware.graphics.package = - # Workaround for Mesa 25.3.0 regression - # https://github.com/nix-community/nixos-apple-silicon/issues/380 - assert pkgs.mesa.version == "25.3.0"; - (import (fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/c5ae371f1a6a7fd27823bc500d9390b38c05fa55.tar.gz"; - sha256 = "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE="; - }) { localSystem = pkgs.stdenv.hostPlatform; }).mesa; + # hardware.graphics.package = + # # Workaround for Mesa 25.3.0 regression + # # https://github.com/nix-community/nixos-apple-silicon/issues/380 + # assert pkgs.mesa.version == "25.3.0"; + # (import (fetchTarball { + # url = "https://github.com/NixOS/nixpkgs/archive/c5ae371f1a6a7fd27823bc500d9390b38c05fa55.tar.gz"; + # sha256 = "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE="; + # }) { localSystem = pkgs.stdenv.hostPlatform; }).mesa; swapDevices = [ {