From 2c6342b3520d756572f08068bd86e9c650bcb41f Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 17:46:41 +0200 Subject: [PATCH] 22.11 -> 23.05 --- flake.lock | 116 ++++++++++++++++++---------------------------------- flake.nix | 15 +++---- lib/luj.nix | 2 +- 3 files changed, 45 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 0cac52e..9e0eabb 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1683779844, - "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=", + "lastModified": 1685948350, + "narHash": "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=", "owner": "serokell", "repo": "deploy-rs", - "rev": "c80189917086e43d49eece2bd86f56813500a0eb", + "rev": "65211db63ba1199f09b4c9f27e5eba5ec50d76ac", "type": "github" }, "original": { @@ -165,45 +165,23 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "unstable" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-22.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager-unstable": { "inputs": { "nixpkgs": [ "unstable" ] }, "locked": { - "lastModified": 1681586242, - "narHash": "sha256-2TPuYRCm+snJgZTH2yw4VEXUyYRugir69I1uS5uONx0=", + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "75f4f362e1b5ebdc4076fcbdb4188b4fd736187c", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-23.05", "repo": "home-manager", - "rev": "75f4f362e1b5ebdc4076fcbdb4188b4fd736187c", "type": "github" } }, @@ -231,11 +209,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1685632091, - "narHash": "sha256-RAfDARolNWT4ZF8IH6WwVd2s0jMuaA9zUPeb+I8/L1A=", + "lastModified": 1686306040, + "narHash": "sha256-pkS/Cz4yLUsl3ITipjmAolRpK7PS4c893VtUNMdHWf8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9cf72a30fc040f0bd2fb4651ec7f8e82df962278", + "rev": "cf37922d4285689990a648bc02aecb90a07a36ba", "type": "github" }, "original": { @@ -270,11 +248,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1685378141, - "narHash": "sha256-/ehJbAtSJS86NlqHVOeR2ViBKlImKH4guFVPacTmCr8=", + "lastModified": 1685950944, + "narHash": "sha256-59by/hDMxPhq2KLRdjL5n5HoQjbfLdpykOa7BG6gEYw=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "cd86c196f3500f20539754d347c8378349ca0974", + "rev": "64d0ebd66652a5614b645b1ffb4d592ba50d532a", "type": "github" }, "original": { @@ -375,11 +353,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1683434835, - "narHash": "sha256-idBmY6LKkB5hTcTFroUi1oQdCK1/fDfJA+qNaivl1Wk=", + "lastModified": 1686194558, + "narHash": "sha256-ZEgCpLJ95TJ66A8QPgaetafhw9G7/mq8vZZFX2672Xg=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "ef6f0de57ef175e0de8c7e846a95481ac6f4ce58", + "rev": "6b08b1821c45601c6833c9e5e391c0ab777631a5", "type": "github" }, "original": { @@ -390,11 +368,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685383865, - "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", + "lastModified": 1685655444, + "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", + "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", "type": "github" }, "original": { @@ -454,32 +432,32 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1683286087, - "narHash": "sha256-xseOd7W7xwF5GOF2RW8qhjmVGrKoBz+caBlreaNzoeI=", + "lastModified": 1685931219, + "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf", + "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf", + "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1685468986, - "narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=", + "lastModified": 1686237827, + "narHash": "sha256-fAZB+Zkcmc+qlauiFnIH9+2qgwM0NO/ru5pWEw3tDow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9af373a61647257d16ae6062cddaa9094d24920c", + "rev": "81ed90058a851eb73be835c770e062c6938c8a9e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -490,7 +468,6 @@ "deploy-rs": "deploy-rs", "flake-utils": "flake-utils", "home-manager": "home-manager", - "home-manager-unstable": "home-manager-unstable", "homepage": "homepage", "hyprland": "hyprland", "hyprpaper": "hyprpaper", @@ -559,11 +536,11 @@ "rust-overlay_3": { "flake": false, "locked": { - "lastModified": 1675132198, - "narHash": "sha256-izOVjdIfdv0OzcfO9rXX0lfGkQn4tdJ0eNm3P3LYo/o=", + "lastModified": 1686105195, + "narHash": "sha256-tBTKW+oqfT86Mvq/nm8Tkk3pzhJFXJWXJrj71cTF7lE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "48b1403150c3f5a9aeee8bc4c77c8926f29c6501", + "rev": "1279a72003f5e4b08c8eca1101d8f57452a539f9", "type": "github" }, "original": { @@ -610,11 +587,11 @@ ] }, "locked": { - "lastModified": 1685434555, - "narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=", + "lastModified": 1685848844, + "narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "876846cde9762ae563f018c17993354875e2538e", + "rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b", "type": "github" }, "original": { @@ -640,11 +617,11 @@ }, "unstable": { "locked": { - "lastModified": 1685564631, - "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", + "lastModified": 1686226982, + "narHash": "sha256-nLuiPoeiVfqqzeq9rmXxpybh77VS37dsY/k8N2LoxVg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", + "rev": "a64b73e07d4aa65cfcbda29ecf78eaf9e72e44bd", "type": "github" }, "original": { @@ -654,30 +631,15 @@ "type": "github" } }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1685491729, - "narHash": "sha256-YfpP8tKpcr0Lxlr3PdoMaY3GD/uJRl6E5pp5KQCEuzg=", + "lastModified": 1685803001, + "narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=", "owner": "wlroots", "repo": "wlroots", - "rev": "3f0487d310974f6ff889ca80e4fb4005553814ed", + "rev": "b61d5922f1d0910a848deb100570ad8587aea38d", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 155b4b4..6147564 100644 --- a/flake.nix +++ b/flake.nix @@ -2,17 +2,10 @@ description = "A flake for my personnal configurations"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; - - flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; home-manager = { - url = "github:nix-community/home-manager/release-22.11"; - inputs.nixpkgs.follows = "unstable"; - }; - - home-manager-unstable = { - url = "github:nix-community/home-manager/75f4f362e1b5ebdc4076fcbdb4188b4fd736187c"; + url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "unstable"; }; @@ -25,10 +18,12 @@ url = "github:NixOS/nixpkgs/nixos-unstable"; }; + flake-utils.url = "github:numtide/flake-utils"; + deploy-rs = { url = "github:serokell/deploy-rs"; - inputs.utils.follows = "flake-utils"; inputs.nixpkgs.follows = "unstable"; + inputs.utils.follows = "flake-utils"; }; sops-nix = { diff --git a/lib/luj.nix b/lib/luj.nix index f879190..20c1985 100644 --- a/lib/luj.nix +++ b/lib/luj.nix @@ -37,7 +37,7 @@ inputs: lib: with lib; let macintosh = { arch = "aarch64-linux"; nixpkgs_version = inputs.nixos-apple-silicon.inputs.nixpkgs; - hm_version = inputs.home-manager-unstable; + hm_version = inputs.home-manager; }; lambda = { arch = "aarch64-linux";