From f45c7c2f50db1d4ce6ce867d06508574eb5fe522 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Mon, 27 May 2024 10:56:46 +0200 Subject: [PATCH] flake: switch to NixOS 24.05 --- flake.lock | 110 ++++++++++++++++++++----------------------- flake.nix | 7 ++- overlays/default.nix | 8 +--- 3 files changed, 57 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index 59b4ea35..806d0145 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1714136352, - "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1711973905, - "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=", + "lastModified": 1715699772, + "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", "owner": "serokell", "repo": "deploy-rs", - "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b", + "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -150,36 +150,20 @@ ] }, "locked": { - "lastModified": 1714203603, - "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, - "master": { - "locked": { - "lastModified": 1714330337, - "narHash": "sha256-65nCfo2G6Yjb6aBgdeMODuTRaydyCV3TOHPIWJ1GT3Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c5e4e2b2651d0e3bf28c26a44f640436688345bd", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -187,11 +171,11 @@ ] }, "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", + "lastModified": 1716511055, + "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", + "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", "type": "github" }, "original": { @@ -219,11 +203,11 @@ }, "nixos-flake": { "locked": { - "lastModified": 1711376798, - "narHash": "sha256-37wawZGSX/dD1rn7TwFJhUdpozC2VPEQXetpfpK/D+w=", + "lastModified": 1716406291, + "narHash": "sha256-qHjJ6alc4o3p51hrPp3JGdC5Pbz5EjF+UZq1HbK8av0=", "owner": "srid", "repo": "nixos-flake", - "rev": "7b19503e7f8c7cc0884fc2fbd669c0cc2e05aef5", + "rev": "aa9100167350cbdffaa272b0fd382d7c23606b86", "type": "github" }, "original": { @@ -234,11 +218,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1714201532, - "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", + "lastModified": 1716715385, + "narHash": "sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", + "rev": "2e7d6c568063c83355fe066b8a8917ee758de1b8", "type": "github" }, "original": { @@ -249,36 +233,30 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1716542732, + "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs_2": { @@ -304,7 +282,6 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "home-manager": "home-manager", - "master": "master", "nix-darwin": "nix-darwin", "nixos-22-05": "nixos-22-05", "nixos-flake": "nixos-flake", @@ -312,6 +289,7 @@ "nixpkgs": "nixpkgs", "triton-vmtools": "triton-vmtools", "tritonshell": "tritonshell", + "unstable": "unstable", "wayland-pipewire-idle-inhibit": "wayland-pipewire-idle-inhibit" } }, @@ -425,6 +403,22 @@ "url": "https://git.pub.solar/teutat3s/tritonshell" } }, + "unstable": { + "locked": { + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_2" @@ -454,11 +448,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1712274476, - "narHash": "sha256-REwWVCN4VQB1XrxSk2nsggIw82OILzsU4Mq5FYXIIOU=", + "lastModified": 1715732413, + "narHash": "sha256-mZ7F+y0u7CJEPQsJ7ZyTC9tuvWfT1Y0MRWmhkuc1OEk=", "owner": "rafaelrc7", "repo": "wayland-pipewire-idle-inhibit", - "rev": "5b8c23f28c1e4c2fde8477a1783d997d83f38f1d", + "rev": "c5e5ccb55db795b0da895ac18cca5fc78a543042", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c320c40d..a55a2ac1 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,8 @@ inputs = { # Track channels with commits tested and built by hydra nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05"; - #nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - master.url = "github:nixos/nixpkgs/master"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + unstable.url = "github:nixos/nixpkgs/nixos-unstable"; #fork.url = "github:teutat3s/nixpkgs/fix-element-desktop-screen-sharing"; @@ -18,7 +17,7 @@ nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/master"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/overlays/default.nix b/overlays/default.nix index 39f21d16..27b81688 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -18,15 +18,11 @@ "slack" ]; }; - fork = import inputs.fork { - system = prev.system; - }; - master = import inputs.master { - system = prev.system; - }; in { #element-desktop = fork.element-desktop; + neovim-unwrapped = unstable.neovim-unwrapped; + vimPlugins = unstable.vimPlugins; #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;}; }) (import ../pkgs)