From 8f779d37c56e167fdfb627e3567450f1e8c5475c Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 19 Nov 2023 14:39:10 -0500 Subject: [PATCH] chore: update flake.lock --- common/home/neovim/default.nix | 14 ++------ common/overlays/default.nix | 3 +- flake.lock | 66 +++++++++++++++++----------------- 3 files changed, 37 insertions(+), 46 deletions(-) diff --git a/common/home/neovim/default.nix b/common/home/neovim/default.nix index 71de1ec..fda952f 100644 --- a/common/home/neovim/default.nix +++ b/common/home/neovim/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, neovim-flake, ... }: let +{ pkgs, lib, ... }: let # installs a vim plugin from git with a given tag / branch plugin = owner: repo: rev: hash: pkgs.vimUtils.buildVimPlugin { pname = "${lib.strings.sanitizeDerivationName repo}"; @@ -30,17 +30,7 @@ in { neovim = { enable = true; - # Temp fix https://github.com/nix-community/neovim-nightly-overlay/issues/332 - package = neovim-flake.packages.x86_64-linux.default.override { - libvterm-neovim = pkgs.libvterm-neovim.overrideAttrs (prev: final: { - doCheck = false; - version = "0.3.3"; - src = pkgs.fetchurl { - url = "https://launchpad.net/libvterm/trunk/v0.3.3/+download/libvterm-0.3.3.tar.gz"; - hash = "sha256-CRVvQ90hKL00fL7r5Q2aVx0yxk4M8Y0hEZeUav9yJuA="; - }; - }); - }; + package = pkgs.neovim-nightly; withNodeJs = true; withPython3 = true; withRuby = false; diff --git a/common/overlays/default.nix b/common/overlays/default.nix index 42f44d2..d87959c 100644 --- a/common/overlays/default.nix +++ b/common/overlays/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ neovim-flake, ... }: { imports = [ ./dracula-theme.nix ./regreet.nix @@ -6,6 +6,7 @@ nixpkgs.overlays = [ (import ./blueberry.nix) + neovim-flake.overlay (final: prev: { spotifywm = final.callPackage ./pkgs/spotifywm.nix {}; diff --git a/flake.lock b/flake.lock index ed4edc1..a70dc1a 100644 --- a/flake.lock +++ b/flake.lock @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1700261686, - "narHash": "sha256-kplQg6hKFNuWKrOyGp9D//G/WH1nHGJ43r2m7fagTYY=", + "lastModified": 1700419052, + "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ecd0a800f716b80a6eac58a7ac34d6d33e6fa5ee", + "rev": "993fb02d20760067b8ee19c713d94cee07037759", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1700326824, - "narHash": "sha256-qjrDNAN0uzeCIGqyixL1egV2M1mYFX5FdVC2kiantUU=", + "lastModified": 1700397206, + "narHash": "sha256-ityVJcy3I/E8soXctwWveg58+cXOSQXhDIcU6YR2gjI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "8b57a1973ea8b242783069e9a3e3d31e3cd939a8", + "rev": "646f4bc63861e03b01fed3833bb65d1d014e1bf3", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1699790908, - "narHash": "sha256-8CO4KQhiEyO7rce4KVOq8arpk9802fVwxtN/oLeRFag=", + "lastModified": 1700395747, + "narHash": "sha256-pzLYZGK34vhAFfyAJjcZYX3BK0Ap/QY/rd8B6Q30tHo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "6c60a229fa422698325b2788e93dfeeba3f11391", + "rev": "474538707da35589543af5a1c8c31f9978841add", "type": "github" }, "original": { @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1700265958, - "narHash": "sha256-iARSd74kSmyC8EgSKOBIOTbJe/affJqXqpcAtshj0v8=", + "lastModified": 1700418829, + "narHash": "sha256-eoft9h/YaCnpBynTmsy8TlooT4+lErvB3iXHNXCIGUY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "2b00ef60f29f3e301326df85d09eba61bc00d086", + "rev": "4eeb386379c59132cf10c18df9d76cb1d0a6bd92", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1700252687, - "narHash": "sha256-oyjA6uYNotms3rCDjksYcbcf8Utx/9TzNYGU5OXlahQ=", + "lastModified": 1700415469, + "narHash": "sha256-uRdcRPnOkaL/rk3c/u2zUV6hPDoaplWAbJ6ajlhHdaw=", "owner": "neovim", "repo": "neovim", - "rev": "abac33605fb50d55fc796229f0812c246bf635d2", + "rev": "7ca2d64e8bbfb73f33cf82a2f9c03808bfea3d95", "type": "github" }, "original": { @@ -447,11 +447,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1700270236, - "narHash": "sha256-MzN8aR1vAc5AVEcD2gqbMl42W+VlndGStZKefyQK8fs=", + "lastModified": 1700417576, + "narHash": "sha256-LdNgtetVLSwMvnUMlyIH4JT2dTIKqzvCUHxEU0apeqw=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f85c0e6450de9d1e4625817b7c0fabc819eaa32a", + "rev": "202b759bee4c413212e448f63f2805ae177aa7a0", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1700191326, - "narHash": "sha256-uw4HSOTNLuIxJ0AtXF9xCKHqVYqQ5mUAK/IVY6WJObo=", + "lastModified": 1700345962, + "narHash": "sha256-sn5+xTlgKcNdjvZ9OtjUKeF/rZQRfMvmumVWsx3YuPQ=", "owner": "nix-community", "repo": "nix-melt", - "rev": "e839183742b9e054c300f197a8f156eb47725349", + "rev": "1d68d13c775ddbcec52d797ba2b11f568ff9ffb5", "type": "github" }, "original": { @@ -556,11 +556,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1699750082, - "narHash": "sha256-4Vx6Vr975vPGzGACyu4u6JfWo2Auwy0AeC6sTSOXdTQ=", + "lastModified": 1700354803, + "narHash": "sha256-kJYhswYp1XMdpI2p/2oRcZxvwW83e64r1av/9zypFLU=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "55682344eae38a1975ccd2cfac0dcb4197faedf8", + "rev": "07e160fb6ad2c4bcabecd43425ebaaa4336c5da2", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1700316800, - "narHash": "sha256-bWI2Nzdmy1QzMDIBnIeKe6tAUi4wFN7gX4W3wc7mh2E=", + "lastModified": 1700403207, + "narHash": "sha256-ILWsdtLq4lf7Vf14VWTns5I/6YYR0PlCXtSVWSADV5g=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "546206cea3cdac16cd0eef8c2d1d79ed731bcaf0", + "rev": "39cfeb4ed2036d44bf5333b6d49fbdbd4d747c4c", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699343069, - "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", + "lastModified": 1700108881, + "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", + "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", "type": "github" }, "original": { @@ -656,11 +656,11 @@ }, "nur": { "locked": { - "lastModified": 1700329523, - "narHash": "sha256-Uw8eUG/zdRB9lQbk1DUi9hOG2BVGCfPhuomQCZ+IgRc=", + "lastModified": 1700418095, + "narHash": "sha256-NLJe97r8QPrKX8zS8VVCdtRjTPstqBVmzeX2YZhUFTc=", "owner": "nix-community", "repo": "NUR", - "rev": "3a84b46a853a1cf7aab96719ab8b45efd3c4f572", + "rev": "1835c823616190ae5167b45a8a9ba851e1992ce6", "type": "github" }, "original": {