From 7f05020a9501394a7f779d8e16b7bd4db5261ac8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 24 May 2024 04:29:14 +0000 Subject: [PATCH] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaced neovim with neovim-nightly-overlay as the flake from neovim was removed. Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/44677a1c96810a8e8c4ffaeaad10c842402647c1' (2024-05-12) → 'github:nix-community/home-manager/05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a' (2024-05-26) • Updated input 'lix': 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/005ee33a9a145f714f4837b1c0b5c430ac3bc588.tar.gz?narHash=sha256-%2Baa9ZALET2yJEDK5wmBUcFjj60/lNQqA4%2BDUPK0wzZE%3D' (2024-05-17) → 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5986a720d47041b79ead2d1f58a172f410d29db5.tar.gz?narHash=sha256-VXsSaj3athaUjgbX9bovTNhSOgevU%2B8qWx9pgaQePdE%3D' (2024-05-26) • Updated input 'lix-module': 'https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/53d713eb486f21d653af3ef3528e9a19ecfc45e5.tar.gz?narHash=sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4%3D' (2024-05-16) → 'https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d.tar.gz?narHash=sha256-fzY708SyfHwLOFrg5ZU0fXW9mNdvRvqz64jg97vvpJM%3D' (2024-05-23) • Updated input 'neovim-flake': 'github:neovim/neovim/27fb62988e922c2739035f477f93cc052a4fee1e?dir=contrib' (2024-05-16) → 'github:nix-community/neovim-nightly-overlay/0f91f34a626baade98dfa091cc7a023266644d91' (2024-05-25) • Removed input 'neovim-flake/flake-utils' • Removed input 'neovim-flake/nixpkgs' • Added input 'neovim-src': 'github:neovim/neovim/27fb62988e922c2739035f477f93cc052a4fee1e' (2024-05-16) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/ff1be1e3cdf884df0935ab28745ab13c3c26d828' (2024-05-16) → 'github:NixOS/nixos-hardware/2e7d6c568063c83355fe066b8a8917ee758de1b8' (2024-05-26) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15) → 'github:NixOS/nixpkgs/bfb7a882678e518398ce9a31a881538679f6f092' (2024-05-24) • Updated input 'nixvim': 'github:nix-community/nixvim/72ff1489c7f40dae829fafc689fb6a57099a9739' (2024-05-16) → 'github:nix-community/nixvim/8212bf1cd2d2dfe6ba521dd8c65a13b67e562d1a' (2024-05-26) • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02) → 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9' (2024-05-16) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/c6aaf729f34a36c445618580a9f95a48f5e4e03f' (2024-04-25) → 'github:numtide/treefmt-nix/2fba33a182602b9d49f0b2440513e5ee091d838b' (2024-05-17) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/fa606cccd7b0ccebe2880051208e4a0f61bfc8c1' (2024-05-16) → 'github:cachix/pre-commit-hooks.nix/0e8fcc54b842ad8428c9e705cb5994eaf05c26a0' (2024-05-20) • Updated input 'stylix': 'github:jalil-salame/stylix/feeb35d2857ef6e32292ebdb862c2f6022c727fd' (2024-05-20) → 'github:jalil-salame/stylix/e5a4701b7d96c4909105a4c2366e4af3f188f802' (2024-05-24) --- flake.lock | 92 +++++++++++++++++++++++++++++------------------------- flake.nix | 33 ++++++-------------- 2 files changed, 60 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index 449e782..68e7ff9 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -305,11 +305,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1716711219, + "narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a", "type": "github" }, "original": { @@ -341,11 +341,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1715908244, - "narHash": "sha256-+aa9ZALET2yJEDK5wmBUcFjj60/lNQqA4+DUPK0wzZE=", - "rev": "005ee33a9a145f714f4837b1c0b5c430ac3bc588", + "lastModified": 1716718600, + "narHash": "sha256-VXsSaj3athaUjgbX9bovTNhSOgevU+8qWx9pgaQePdE=", + "rev": "5986a720d47041b79ead2d1f58a172f410d29db5", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/005ee33a9a145f714f4837b1c0b5c430ac3bc588.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5986a720d47041b79ead2d1f58a172f410d29db5.tar.gz" }, "original": { "type": "tarball", @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1715885250, - "narHash": "sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4=", - "rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5", + "lastModified": 1716506851, + "narHash": "sha256-fzY708SyfHwLOFrg5ZU0fXW9mNdvRvqz64jg97vvpJM=", + "rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/53d713eb486f21d653af3ef3528e9a19ecfc45e5.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d.tar.gz" }, "original": { "type": "tarball", @@ -378,16 +378,24 @@ } }, "neovim-flake": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, + "flake": false, + "locked": { + "lastModified": 1716672993, + "narHash": "sha256-KISj1WGeeEb6d2rYFRGYHYiDvNJN1JtRKU2+jE32LMQ=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "0f91f34a626baade98dfa091cc7a023266644d91", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "neovim-src": { + "flake": false, "locked": { - "dir": "contrib", "lastModified": 1715862872, "narHash": "sha256-FCOipXHkAbkuFw9JjEpOIJ8BkyMkjkI0Dp+SzZ4yZlw=", "owner": "neovim", @@ -396,7 +404,6 @@ "type": "github" }, "original": { - "dir": "contrib", "owner": "neovim", "ref": "v0.10.0", "repo": "neovim", @@ -405,11 +412,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715881912, - "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=", + "lastModified": 1716715385, + "narHash": "sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828", + "rev": "2e7d6c568063c83355fe066b8a8917ee758de1b8", "type": "github" }, "original": { @@ -420,11 +427,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -457,11 +464,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1715891811, - "narHash": "sha256-HC3JxKLeXDL2NpHjD+GD+XxvGmYsq/yqSX8TCLa3atA=", + "lastModified": 1716733566, + "narHash": "sha256-Zu0fn7bC+M/LwOOkR1RmeoOuCIbvvFwuqTldVBVe4WY=", "owner": "nix-community", "repo": "nixvim", - "rev": "72ff1489c7f40dae829fafc689fb6a57099a9739", + "rev": "8212bf1cd2d2dfe6ba521dd8c65a13b67e562d1a", "type": "github" }, "original": { @@ -485,11 +492,11 @@ ] }, "locked": { - "lastModified": 1715870890, - "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", "type": "github" }, "original": { @@ -508,6 +515,7 @@ "lix": "lix", "lix-module": "lix-module", "neovim-flake": "neovim-flake", + "neovim-src": "neovim-src", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixvim": "nixvim", @@ -535,11 +543,11 @@ ] }, "locked": { - "lastModified": 1716205882, - "narHash": "sha256-K0mH9Xhiae37eyxjwlmlo+ZqScRIh3rCDpXPzF/uBxI=", + "lastModified": 1716584337, + "narHash": "sha256-u8enWMWhynbYlEFuVtTghwk1+Lu8iT4tBoVWZxWCe/g=", "owner": "jalil-salame", "repo": "stylix", - "rev": "feeb35d2857ef6e32292ebdb862c2f6022c727fd", + "rev": "e5a4701b7d96c4909105a4c2366e4af3f188f802", "type": "github" }, "original": { @@ -572,11 +580,11 @@ ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1715940852, + "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 66dc03d..400a0f6 100644 --- a/flake.nix +++ b/flake.nix @@ -14,12 +14,13 @@ url = "github:jalil-salame/audiomenu"; inputs.nixpkgs.follows = "nixpkgs"; }; + neovim-src = { + url = "github:neovim/neovim/v0.10.0"; + flake = false; + }; neovim-flake = { - url = "github:neovim/neovim?dir=contrib&ref=v0.10.0"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; + url = "github:nix-community/neovim-nightly-overlay"; + flake = false; }; # Lix lix = { @@ -92,6 +93,7 @@ audiomenu, nixvim, neovim-flake, + neovim-src, lix, lix-module, ... @@ -171,26 +173,11 @@ # Provide necessary overlays overlays = { nixvim = nixvim.overlays.default; - neovim-nightly = neovim-flake.overlay; jpassmenu = jpassmenu.overlays.default; audiomenu = audiomenu.overlays.default; # FIXME: remove once merged in nixpkgs - fix-noice-nvim = final: prev: { - vimPlugins = - prev.vimPlugins - // { - noice-nvim = prev.vimUtils.buildVimPlugin { - pname = "noice.nvim"; - version = "2024-05-09"; - src = final.fetchFromGitHub { - owner = "folke"; - repo = "noice.nvim"; - rev = "v2.0.2"; - sha256 = "sha256-YWqphpaxr/729/6NTDEWKOi2FnY/8xgjdsDQ9ePj7b8="; - }; - meta.homepage = "https://github.com/folke/noice.nvim/"; - }; - }; + neovim-nightly = final: prev: { + neovim = final.callPackage (neovim-flake + "/flake/packages/neovim.nix") {inherit neovim-src;}; }; }; @@ -294,7 +281,7 @@ just self.packages.${system}.nvim ]; - QEMU_OPTS_WL = "-smp 4 -device virtio-gpu-rutabaga,gfxstream-vulkan=on,cross-domain=on,hostmem=2G,wsi=headless"; + QEMU_OPTS_WL = "--enable-kvm -smp 4 -device virtio-gpu-rutabaga,gfxstream-vulkan=on,cross-domain=on,hostmem=2G,wsi=headless"; }; } );