From 930b13700ac8b899479ecabda7996f2278e6e531 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sat, 13 Dec 2025 21:39:18 -0500 Subject: [PATCH] rebase flake back to 25.11/rolling --- flake.lock | 61 ++++++++++++++++++++++++------------------------------ flake.nix | 20 +++++++++--------- 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index a318a28..23776c9 100644 --- a/flake.lock +++ b/flake.lock @@ -8,17 +8,16 @@ ] }, "locked": { - "lastModified": 1763596466, - "narHash": "sha256-CTSUc4Fk1lHMQZMJ5LczPDYGLq5UjXDFKLSpuA3mKmI=", + "lastModified": 1765528634, + "narHash": "sha256-uIavvJkDwTZD1QY/oSkDtPN9xwkLwQayoZ5xOni4SBY=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "73b7103c4e3996e3e20868d510b0e8797f279323", + "rev": "fc1440d6e6adb24d9b2650670744bae35654c867", "type": "github" }, "original": { "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "73b7103c4e3996e3e20868d510b0e8797f279323", "type": "github" } }, @@ -29,17 +28,16 @@ ] }, "locked": { - "lastModified": 1764325801, - "narHash": "sha256-LQ7tsrXs1wuB6KBwUctL3JlUsG/FWI2pCI6NkoO52dk=", + "lastModified": 1765485905, + "narHash": "sha256-fk6zFzzcwz6su99K7UTxS2497+z/Cdk3FzNsacsmZKA=", "owner": "catppuccin", "repo": "nix", - "rev": "a696fed6b9b6aa89ef495842cdca3fc2a7cef0de", + "rev": "b49c675acd80931fc8b54290920a90189b461dcf", "type": "github" }, "original": { "owner": "catppuccin", "repo": "nix", - "rev": "a696fed6b9b6aa89ef495842cdca3fc2a7cef0de", "type": "github" } }, @@ -55,7 +53,6 @@ "original": { "owner": "abhinandh-s", "repo": "catppuccin-nix", - "rev": "b482f6e3ee1ae61c83e52f50653e54bf72900b13", "type": "github" } }, @@ -82,11 +79,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765495779, + "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", "type": "github" }, "original": { @@ -141,17 +138,17 @@ ] }, "locked": { - "lastModified": 1764776959, - "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=", + "lastModified": 1765605144, + "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1680d594a9281651cbf7d126941a8c8e2396183", + "rev": "90b62096f099b73043a747348c11dbfcfbdea949", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.11", "repo": "home-manager", - "rev": "e1680d594a9281651cbf7d126941a8c8e2396183", "type": "github" } }, @@ -205,7 +202,6 @@ "original": { "owner": "sodiboo", "repo": "niri-flake", - "rev": "46e723aa46565b67910187b4b7ad48b615d7f576", "type": "github" } }, @@ -244,17 +240,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1765311797, + "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-25.11", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" } }, @@ -284,17 +280,17 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1764755396, - "narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=", + "lastModified": 1765647805, + "narHash": "sha256-CdaiOfpBiS4kw/DR0Ut+02fpFnjM8hNZMZ53a1pavak=", "owner": "nix-community", "repo": "nixvim", - "rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969", + "rev": "f0b0cc7cae2cf5d76608c9164ab8824a2387e146", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-25.11", "repo": "nixvim", - "rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969", "type": "github" } }, @@ -305,17 +301,16 @@ ] }, "locked": { - "lastModified": 1765651326, - "narHash": "sha256-HmAbejLwUPCZrdU81KP4+WOkWrgX1n74pi1TCVSOleQ=", + "lastModified": 1765675278, + "narHash": "sha256-GSa/jaWld+WKxt39DDBPoX1j+kCdNmFF9stTWbeVhp8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "6b2661e1d4d0e223d631be87931029929431de6f", + "rev": "7d795256de6dbe7b4044161af2b6002421bdb188", "type": "github" }, "original": { "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "6b2661e1d4d0e223d631be87931029929431de6f", "type": "github" } }, @@ -327,17 +322,16 @@ ] }, "locked": { - "lastModified": 1764795584, - "narHash": "sha256-Sq6SWFDCftLrnZ8GXO39b2HxH2NE8jtDeU2ud37F9qs=", + "lastModified": 1765679538, + "narHash": "sha256-y6PplijrOq2lI7QjHjcBbi/NT2R1PrpNnjkMgB/83r4=", "owner": "nix-community", "repo": "NUR", - "rev": "156e6d0e026c1a7687a74c908ee0ccf0df796f72", + "rev": "a23427eb9342c578becbe0179e2654e622c41cdb", "type": "github" }, "original": { "owner": "nix-community", "repo": "NUR", - "rev": "156e6d0e026c1a7687a74c908ee0ccf0df796f72", "type": "github" } }, @@ -384,7 +378,6 @@ "original": { "owner": "nix-community", "repo": "plasma-manager", - "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 6d9814c..3f2a422 100644 --- a/flake.nix +++ b/flake.nix @@ -2,50 +2,50 @@ description = "My NixOS Configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; catppuccin = { - url = "github:catppuccin/nix/a696fed6b9b6aa89ef495842cdca3fc2a7cef0de"; + url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; catppuccin-palette = { - url = "github:abhinandh-s/catppuccin-nix/b482f6e3ee1ae61c83e52f50653e54bf72900b13"; + url = "github:abhinandh-s/catppuccin-nix"; }; home-manager = { - url = "github:nix-community/home-manager/e1680d594a9281651cbf7d126941a8c8e2396183"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; plasma-manager = { - url = "github:nix-community/plasma-manager/b24ed4b272256dfc1cc2291f89a9821d5f9e14b4"; + url = "github:nix-community/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; niri = { - url = "github:sodiboo/niri-flake/46e723aa46565b67910187b4b7ad48b615d7f576"; + url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; noctalia = { - url = "github:noctalia-dev/noctalia-shell/6b2661e1d4d0e223d631be87931029929431de6f"; + url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; }; nur = { - url = "github:nix-community/NUR/156e6d0e026c1a7687a74c908ee0ccf0df796f72"; + url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { - url = "github:nix-community/nixvim/64d9e2616f4ee2acee380d61ccf1f3d610e7e969"; + url = "github:nix-community/nixvim/nixos-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; apple-silicon = { - url = "github:nix-community/nixos-apple-silicon/73b7103c4e3996e3e20868d510b0e8797f279323"; + url = "github:nix-community/nixos-apple-silicon"; inputs.nixpkgs.follows = "nixpkgs"; }; };