From 1bd2fc3ae1b6ad1dad4b12d90fbe9e8969417883 Mon Sep 17 00:00:00 2001 From: materus Date: Fri, 3 Nov 2023 16:07:18 +0100 Subject: [PATCH] flake: update lock, change to home-manager stable flake --- flake.lock | 223 +++++++++++++++++++++++++---------------------------- flake.nix | 26 ++++--- 2 files changed, 123 insertions(+), 126 deletions(-) diff --git a/flake.lock b/flake.lock index 8c182d3..80b5eb1 100644 --- a/flake.lock +++ b/flake.lock @@ -29,7 +29,9 @@ "configInputs-stable": { "inputs": { "emacs-overlay": "emacs-overlay_2", - "home-manager": "home-manager_2", + "home-manager": [ + "hm-stable" + ], "nixerus": "nixerus_2", "nixos-hardware": "nixos-hardware_2", "nixpkgs": [ @@ -62,11 +64,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698661082, - "narHash": "sha256-ju60wCA5A+JpiGZV056kroBNvvyC9vNCyYb/eIwZaYo=", + "lastModified": 1699008765, + "narHash": "sha256-UdtqkpdCcFHtNQhNX20sY+b5EDakACMh/hFDuHX496k=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9716242daed6b500616e0d2378a06f5eba53ca2b", + "rev": "99fb18c4f0b7abdcd2d93c98c94e6d3d745ee283", "type": "github" }, "original": { @@ -86,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1698661082, - "narHash": "sha256-ju60wCA5A+JpiGZV056kroBNvvyC9vNCyYb/eIwZaYo=", + "lastModified": 1699008765, + "narHash": "sha256-UdtqkpdCcFHtNQhNX20sY+b5EDakACMh/hFDuHX496k=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9716242daed6b500616e0d2378a06f5eba53ca2b", + "rev": "99fb18c4f0b7abdcd2d93c98c94e6d3d745ee283", "type": "github" }, "original": { @@ -136,6 +138,27 @@ "type": "github" } }, + "hm-stable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1695108154, + "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "07682fff75d41f18327a871088d20af2710d4744", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.05", + "repo": "home-manager", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -144,11 +167,11 @@ ] }, "locked": { - "lastModified": 1698670511, - "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=", + "lastModified": 1698896213, + "narHash": "sha256-u42NZt52F3o7pM5V7sYlLOp5tSN8z9+fO2wFcOs0EOQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "8e5416b478e465985eec274bc3a018024435c106", + "rev": "831b4fa31749208e576050c563e9773aafd04941", "type": "github" }, "original": { @@ -163,30 +186,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1695108154, - "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "lastModified": 1698896213, + "narHash": "sha256-u42NZt52F3o7pM5V7sYlLOp5tSN8z9+fO2wFcOs0EOQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "07682fff75d41f18327a871088d20af2710d4744", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1698670511, - "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "8e5416b478e465985eec274bc3a018024435c106", + "rev": "831b4fa31749208e576050c563e9773aafd04941", "type": "github" }, "original": { @@ -250,11 +254,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1698053470, - "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=", + "lastModified": 1698853384, + "narHash": "sha256-/FQ2WeCjdjdNo9eGTO7JruGAjO2Ccime8y1OU4/Aesk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7", + "rev": "11d50c5d52472ed40d3cb109daad03c836d2b328", "type": "github" }, "original": { @@ -266,11 +270,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1698053470, - "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=", + "lastModified": 1698853384, + "narHash": "sha256-/FQ2WeCjdjdNo9eGTO7JruGAjO2Ccime8y1OU4/Aesk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7", + "rev": "11d50c5d52472ed40d3cb109daad03c836d2b328", "type": "github" }, "original": { @@ -281,70 +285,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1698434055, - "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1698434055, - "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1698434055, - "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1698434055, - "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1697456312, "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", @@ -360,13 +300,61 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs-stable": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1698846319, + "narHash": "sha256-4jyW/dqFBVpWFnhl0nvP6EN4lP7/ZqPxYRjl6var0Oc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1698846319, + "narHash": "sha256-4jyW/dqFBVpWFnhl0nvP6EN4lP7/ZqPxYRjl6var0Oc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1698846319, + "narHash": "sha256-4jyW/dqFBVpWFnhl0nvP6EN4lP7/ZqPxYRjl6var0Oc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { @@ -392,11 +380,11 @@ }, "nur_2": { "locked": { - "lastModified": 1698673581, - "narHash": "sha256-lidNMJ2f+f4Zjr9U0iUxDRAcToMHHGGwhchLZRKYA34=", + "lastModified": 1699022487, + "narHash": "sha256-YgBYhtv4mH/vY19ez/KK+NE931ziZqFKTp+hB6fAqxo=", "owner": "nix-community", "repo": "NUR", - "rev": "9a1a107fc246a416e44e2e965a31d79983614541", + "rev": "cbfae2db1a6fc777c4bcbf4de7b1c02f404b28a8", "type": "github" }, "original": { @@ -422,11 +410,11 @@ }, "nur_4": { "locked": { - "lastModified": 1698673581, - "narHash": "sha256-lidNMJ2f+f4Zjr9U0iUxDRAcToMHHGGwhchLZRKYA34=", + "lastModified": 1699022487, + "narHash": "sha256-YgBYhtv4mH/vY19ez/KK+NE931ziZqFKTp+hB6fAqxo=", "owner": "nix-community", "repo": "NUR", - "rev": "9a1a107fc246a416e44e2e965a31d79983614541", + "rev": "cbfae2db1a6fc777c4bcbf4de7b1c02f404b28a8", "type": "github" }, "original": { @@ -438,11 +426,11 @@ }, "nur_5": { "locked": { - "lastModified": 1698673581, - "narHash": "sha256-lidNMJ2f+f4Zjr9U0iUxDRAcToMHHGGwhchLZRKYA34=", + "lastModified": 1699022487, + "narHash": "sha256-YgBYhtv4mH/vY19ez/KK+NE931ziZqFKTp+hB6fAqxo=", "owner": "nix-community", "repo": "NUR", - "rev": "9a1a107fc246a416e44e2e965a31d79983614541", + "rev": "cbfae2db1a6fc777c4bcbf4de7b1c02f404b28a8", "type": "github" }, "original": { @@ -470,8 +458,9 @@ "inputs": { "configInputs": "configInputs", "configInputs-stable": "configInputs-stable", - "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_3", + "hm-stable": "hm-stable", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_3", "nur": "nur_5", "private": "private" diff --git a/flake.nix b/flake.nix index 62ade8d..4907f5d 100644 --- a/flake.nix +++ b/flake.nix @@ -15,14 +15,6 @@ ref = "nixos-unstable"; }; - nixpkgs-stable = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "nixos-23.05"; - }; - - configInputs = { type = "github"; owner = "materusPL"; @@ -32,6 +24,22 @@ nixpkgs.follows = "nixpkgs"; }; }; + + nixpkgs-stable = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + ref = "nixos-23.05"; + }; + + hm-stable = { + type = "github"; + owner = "nix-community"; + repo = "home-manager"; + ref = "release-23.05"; + inputs.nixpkgs.follows = "nixpkgs-stable"; + }; + configInputs-stable = { type = "github"; owner = "materusPL"; @@ -39,7 +47,7 @@ ref = "inputs"; inputs = { nixpkgs.follows = "nixpkgs-stable"; - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.follows = "hm-stable"; }; }; };