From b65bf47e9073869d48257318d6ad166e54efd2f1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 8 Jan 2026 06:12:50 -0500 Subject: [PATCH] flake: inline dependencies --- flake.lock | 128 ++++++++++++++++------------------------------------- flake.nix | 3 ++ 2 files changed, 41 insertions(+), 90 deletions(-) diff --git a/flake.lock b/flake.lock index 33c646e..f49c85d 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1767803522, - "narHash": "sha256-S6podKjKK1zlogdq7YBI7rmeQNp2e/A7fJjcnBMEBz8=", + "lastModified": 1767863967, + "narHash": "sha256-Yr4d2RRrnz1H1XE4gFYV9gXTXL/WEM8YguLHvtK3Oxs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4a1550b5d54ef8cdb5dd4db5558942e3466a946b", + "rev": "2bb26f2f973bfbb0bf127ff8d1ff5f0a12c0a355", "type": "github" }, "original": { @@ -180,32 +180,11 @@ ] }, "locked": { - "lastModified": 1767802041, - "narHash": "sha256-ZhgbFGQGeJaZ/xkwyHlgUCeHuIdEDqugYkObPL0NCyo=", + "lastModified": 1767864335, + "narHash": "sha256-2L1hc/V2oHMVsAKxyCoSD0q5lL2ap7MR8pk9U2YB9gs=", "owner": "nix-community", "repo": "home-manager", - "rev": "bdaa3743831168787f528570f2b87963e72a2f23", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "impermanence", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747978958, - "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", + "rev": "af7f14ddf770e269bb67cea19708198e618b5c75", "type": "github" }, "original": { @@ -216,15 +195,19 @@ }, "impermanence": { "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs" + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1767548760, - "narHash": "sha256-SSLzVz9l/wDyuXYd7Y4wVe36Lj1qV7u2QqvEYbFvYZ8=", + "lastModified": 1767822991, + "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=", "owner": "nix-community", "repo": "impermanence", - "rev": "f868c97f9e7f62879a97b4ad0e00b64782a845db", + "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5", "type": "github" }, "original": { @@ -261,7 +244,9 @@ "nixpkgs" ], "pre-commit": "pre-commit", - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1767697030, @@ -286,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1767796466, - "narHash": "sha256-8rwPauge7ZsXqVzVVHU1ilG6tLhvcgXUmC6BJjlLA34=", + "lastModified": 1767866249, + "narHash": "sha256-34M8rysW3vuOYijI/Ns59bPkKPecaQW5oOupR45IRwQ=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "5888ba875bd4b3afe746a176699cf1287feddac0", + "rev": "7173b37ee4ff714e34dab539aeccb0cc7e4b24dc", "type": "github" }, "original": { @@ -313,11 +298,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1767797159, - "narHash": "sha256-vbUQBtsyKtFB5YqTKdvOBstAKObPC1pxRigP/LZy8fw=", + "lastModified": 1767833217, + "narHash": "sha256-HLr9k8g1Geq40PLsNw7I5N8TZkBYtQVjkgDPV/Kehxk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "acfdefdd43810c099c0783862d7a41037f874d16", + "rev": "a789aa1512a9157d5d3392b27e60621fd0d83438", "type": "github" }, "original": { @@ -371,11 +356,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1767775754, - "narHash": "sha256-vs72qXEIS0EiuWYm0BtZ5MDRMu0hyjeqG8NaH+3Z0Nw=", + "lastModified": 1767862133, + "narHash": "sha256-wxs62H8lxO+5FH+8JfJMwZyg4Yx3HwY67QSLwYi/olw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "4940d5dd36f72723f85248014d5df5eef3ce7124", + "rev": "6337dd4ccf780724ea6e8adbf1c721fef7515ae3", "type": "github" }, "original": { @@ -438,22 +423,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1767767207, "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", @@ -506,44 +475,23 @@ "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } }, "rust-overlay": { "inputs": { "nixpkgs": [ - "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1767495280, - "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=", + "lastModified": 1767840362, + "narHash": "sha256-ZtsFqUhilubohNZ1TgpQIFsi4biZTwRH9rjZsDRDik8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767754000, - "narHash": "sha256-znoNJs2QZFl+wCFLd6FbUJ00c74kvzOjyQYXc45uFvo=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "0b3a5ad260479f2c9bdadf3ba5b2a4be359cfcdd", + "rev": "d159ea1fc321c60f88a616ac28bab660092a227d", "type": "github" }, "original": { @@ -605,11 +553,11 @@ ] }, "locked": { - "lastModified": 1767738726, - "narHash": "sha256-bHATlMr42JABTJgi4Wc8SJCK8Cv9AnR6HCl3k8eTwEs=", + "lastModified": 1767801790, + "narHash": "sha256-QfX6g3Wj2vQe7oBJEbTf0npvC6sJoDbF9hb2+gM5tf8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4db0238d79254c6d14f251808dc5264b8fc81b73", + "rev": "778a1d691f1ef45dd68c661715c5bf8cbf131c80", "type": "github" }, "original": { @@ -656,11 +604,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1766429945, - "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", + "lastModified": 1767830382, + "narHash": "sha256-0PgS7M1SV6JCN3MugFZPaP8J+Mr2o7lSDFTPVYZSIAY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", + "rev": "74cf1a95a35fd7aec76432bc2cd9b310e0d908c5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b68bac1..90cdffe 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -54,6 +55,8 @@ impermanence = { url = "github:nix-community/impermanence"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; deploy-rs = {