From 24624980e1ccb18b957a55bd2eea7aff7fdeb182 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sat, 31 Dec 2022 16:26:44 +0100 Subject: [PATCH] Update deps --- flake.lock | 30 ++++++++++----------- home/programs/nvim/default.nix | 4 +-- home/programs/nvim/plugins.nix | 48 +++++++++++++++++----------------- system/hosts/Styx.nix | 4 --- 4 files changed, 41 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index a77bc79..d6f9d3c 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1672318366, - "narHash": "sha256-DBUVFooXtE4boZk1LvJ8sTg3nxMmJvNAJQ4lpjxDH5U=", + "lastModified": 1672349765, + "narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "cbacdaba3c7b361defb36e1cdfa03ae4e74eb4a8", + "rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1672294434, - "narHash": "sha256-OvBEQhTiYlsIIyzoo0YqRGa4rKgUcrPig/ATmp+eY1Y=", + "lastModified": 1672440083, + "narHash": "sha256-CsOplUdX18GGb190pRN1SuEqCqcFluUy4BoZ/W5/ou4=", "owner": "neovim", "repo": "neovim", - "rev": "b640161a694037299f44c26893bba22d17b6853f", + "rev": "99cf111289bfcd14981255e805da43bac5139141", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1672301646, - "narHash": "sha256-x0762x1AyqfgFUnyRpPnrVGKcHd410HBMxKzGMK/pzM=", + "lastModified": 1672474400, + "narHash": "sha256-RTiQ0hNZlBicV5EJB7HHiZzN79m49ML25b3VC+6pY7I=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5ce69433d8364b8c0f8ac2a8f8491196481955b3", + "rev": "50be3eb7504ebe4da225e59e3b2062c42b12f69e", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1672302212, - "narHash": "sha256-rj9DHvSyodZNEObiko+aS5YKvpZFlx5c90Agz5xDhwI=", + "lastModified": 1672474948, + "narHash": "sha256-sLLXM4eNAMrJ90zcEYWPRMHMMXrQG0ce00LQujQ5xr4=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "9e76516625ca752ff853e06992ba51e2db929b8f", + "rev": "32d28650c8984d2440197c1a1ec5a99d9afbd5bf", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672308958, - "narHash": "sha256-zLvAJ+XTI7gIlUqlrKj8j4+POZXDB6kUOnV0yBvSIMc=", + "lastModified": 1672428209, + "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d879125d61a0be8ecb2afddaca8f2b0530db0260", + "rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", "type": "github" }, "original": { diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 6362c83..341025d 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -10,6 +10,8 @@ in enable = true; package = pkgs.neovim-nightly; + defaultEditor = true; + withNodeJs = false; withRuby = false; withPython3 = false; @@ -413,8 +415,6 @@ in echo 'Done' ''; - sessionVariables.EDITOR = "nvim"; - file = { "${nvim-spell-directory}/de.utf-8.spl".source = builtins.fetchurl { url = "http://ftp.vim.org/pub/vim/runtime/spell/de.utf-8.spl"; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 378ee62..c5107a7 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -112,12 +112,12 @@ rec { }; }; nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: { - version = "2022-12-27"; + version = "2022-12-31"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "fb36ed4c9e962d9fbfa608cd4a5d9313b1e8a8b1"; - sha256 = "097mlnw5a0pzgx3xz11nqysa4drygfl0rm1sf6n5ik2vasllj7m8"; + rev = "168567efb8aa3874f3da8832dbcd3d1a4ff40d3b"; + sha256 = "0iphg3vlzqicaviy8z9dmasm262c41byx31r9196zvgzvnircxqz"; fetchSubmodules = false; }; }); @@ -225,12 +225,12 @@ rec { }; nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-29"; + version = "2022-12-31"; src = pkgs.fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "7d0ce54a4cf6e844d87e49d1576c0fffb6d27a6e"; - sha256 = "0kwhan5qich11wk72j4p4gpybw7yqh45x5frszp3w6xp7jfj7bar"; + rev = "6b43ce561d97412cc512b569db6938e44529293e"; + sha256 = "04rv8pbn35lps03iqvfik10fb67f5lsrb2vv0mqwlxvzkm65m151"; fetchSubmodules = false; }; }; @@ -302,12 +302,12 @@ rec { }; comment-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-12-25"; + version = "2022-12-30"; src = pkgs.fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "45dc21a71ad1450606f5e98261badb28db59d74c"; - sha256 = "05278b42qwm77svl3k2a17vsdlmfjknlwkx01x80na9sciav07mz"; + rev = "7bb563ff2d811a63b207e9de63e3e9c0877cb6d5"; + sha256 = "0f2jsw3xydnc79mfmqsihwaayjf3xjbdvyi50sy06sm8jxp44d9x"; fetchSubmodules = false; }; }; @@ -335,12 +335,12 @@ rec { }; nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-12-27"; + version = "2022-12-30"; src = pkgs.fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "e55033fce468c9c578b946948807f2ac48a6ee08"; - sha256 = "078d1py8q38ffrncd6p0wczalr7x47kxd5fihn4hdn8hyb7qnbbf"; + rev = "c49ad26e894e137e401b1d294948c46327877eaf"; + sha256 = "18igmvp5ggyrll3mafggg6fj00a0m4g2cmixgj9z0iha5r37wyia"; fetchSubmodules = false; }; }; @@ -489,23 +489,23 @@ rec { }; nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-12-27"; + version = "2022-12-31"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "247e392a8beb28c5d43a1375f93f8f90f1cc11ad"; - sha256 = "145aaxfrrabvyjmndcr0sdqsrnwca9qhmk96gq58awhbsv8fq6pc"; + rev = "d816761ec1ea4a605689bc5f4111088459cf74d4"; + sha256 = "0h60nhvwn81q83nvg5cj2j4jwglpa2wbvlyk1fy1l09zjrjpzm8x"; fetchSubmodules = false; }; }; nvim-surround = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-12-25"; + version = "2022-12-30"; src = pkgs.fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "6aafeeda19a98768d1c17ff6dde5548bc77a1a2d"; - sha256 = "0ci25qy82phrlm7lp9zaaiyvf17rk6yvczbiwf6b578r4c8jq87j"; + rev = "64e21061953102b19bbb22e824fbb96054782799"; + sha256 = "11m62i66gicv7spz6bcsxpdqshi19v0306bh69lcmbyawbwyli4a"; fetchSubmodules = false; }; }; @@ -555,12 +555,12 @@ rec { }; urlview-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-12-21"; + version = "2022-12-31"; src = pkgs.fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "9ebb11fff1548ae9406bba8a06d9caabf686ef9a"; - sha256 = "0yjqc4is8zaf2m04a2kh079jp2635nn8nbpkqak416hgigs1agfc"; + rev = "6a2f1ae05ba036ca1e9c505f4d58b9a188ef51bd"; + sha256 = "12rs0c7sx0j8k646ycvypc9vi9k9fx17pihd3fhvccwyjwk7iafi"; fetchSubmodules = false; }; }; @@ -599,12 +599,12 @@ rec { }; noice-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-12-27"; + version = "2022-12-31"; src = pkgs.fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "7816fcd8a43a9de84d7f4695b0688b4f54b25570"; - sha256 = "15a6ghaf87pk22r4clhshrq2fjv95ipwhx2mkj45gk4sn1ssrlcs"; + rev = "661495acc1cc29f53d2defd1c18c87da1cc8f850"; + sha256 = "1cbk9961j2rrshc2947idpb8dc9ypgfmbzg7a66ab7sk1wgk1a4i"; fetchSubmodules = false; }; }; diff --git a/system/hosts/Styx.nix b/system/hosts/Styx.nix index ae01ae4..96999f1 100644 --- a/system/hosts/Styx.nix +++ b/system/hosts/Styx.nix @@ -61,10 +61,6 @@ in environment = { darwinConfig = "$HOME/.config/nixpkgs/system/hosts/Styx.nix"; - - variables = { - EDITOR = "nvim"; - }; }; services = {