From 04c23cf7783085e424b3f79ab92232b09caf688d Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sun, 24 Apr 2022 13:30:38 +0200
Subject: [PATCH] nvim Updates

---
 config/nvim/nifoc/formatting.fnl |  8 ++++----
 config/nvim/nifoc/nix.fnl        |  7 +++++++
 flake.lock                       | 24 ++++++++++++------------
 programs/nvim/plugins.nix        | 18 +++++++++---------
 4 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 config/nvim/nifoc/nix.fnl

diff --git a/config/nvim/nifoc/formatting.fnl b/config/nvim/nifoc/formatting.fnl
index fb0b174..b428b25 100644
--- a/config/nvim/nifoc/formatting.fnl
+++ b/config/nvim/nifoc/formatting.fnl
@@ -15,13 +15,13 @@
 
   (fn mod.maybe-format-buffer []
     (let [formatprg (vim.opt_local.formatprg:get)
-          formatprg-exe (-> formatprg (vim.split " " {:trimempty true}) (. 1))
-          neoformat (.. "Neoformat " formatprg-exe)]
+          formatprg-exe (-> formatprg (vim.split " " {:trimempty true}) (. 1))]
       (if (= b.nifoc_lsp_formatter_enabled 1)
           (vim.lsp.buf.formatting_sync nil 1000)
           (not= formatprg-exe nil)
-          (cmd (.. "try | undojoin | " neoformat " | catch /E790/ | " neoformat
-                   " | endtry")))))
+          (let [neoformat (.. "Neoformat " formatprg-exe)]
+            (cmd (.. "try | undojoin | " neoformat " | catch /E790/ | "
+                     neoformat " | endtry"))))))
 
   mod)
 
diff --git a/config/nvim/nifoc/nix.fnl b/config/nvim/nifoc/nix.fnl
new file mode 100644
index 0000000..acc8d14
--- /dev/null
+++ b/config/nvim/nifoc/nix.fnl
@@ -0,0 +1,7 @@
+;; Move certain PATH entries to the end of the variable, because XCode CLI is not installed
+;; (and I don't want to see the prompt)
+(let [current-path vim.env.PATH
+      move-paths ":/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
+      new-path (-> current-path (string.gsub move-paths "") (.. move-paths))]
+  (set vim.env.PATH new-path))
+
diff --git a/flake.lock b/flake.lock
index 85e28e0..8a39249 100644
--- a/flake.lock
+++ b/flake.lock
@@ -73,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650478719,
-        "narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=",
+        "lastModified": 1650784624,
+        "narHash": "sha256-RTYGFBlxEmhhLLH9UfObyz2d4alhCSf6NQpyID7Mqvg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644",
+        "rev": "65a32578d9b1394bea5c6336721ec392aadc89fb",
         "type": "github"
       },
       "original": {
@@ -96,11 +96,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1650672068,
-        "narHash": "sha256-lt++oCZbD3+qrdMlqVBmecckUExg9A1PhLWkImqLgPM=",
+        "lastModified": 1650772118,
+        "narHash": "sha256-NraNzPwGZGBu6RXirOJQ8932uqsrQ3Qet9GsZF7RJ2E=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "4e4914ab2e523f100c06fc5fb253f8625cc67232",
+        "rev": "843d9223a14c599fda1b2abf1e7072be738fb831",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650701691,
-        "narHash": "sha256-JwvkAgRMtdMKQLjoBFcCu7IyAlAJUisPiksLONWGp1A=",
+        "lastModified": 1650788138,
+        "narHash": "sha256-Iot/SCprDCfV8TpZnYd6dSbpwaBlZHDhDz/3Iq+s1j8=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "ee0dc151a425951a0a6d95a7164b7184e6e0766a",
+        "rev": "59ae20737472f594ab0922a7cd74124fc13cb78a",
         "type": "github"
       },
       "original": {
@@ -154,11 +154,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1650647760,
-        "narHash": "sha256-Ng8CGYLSTxeI+oEux0x+tSRA6K7ydoyfJNQf56ld+Uo=",
+        "lastModified": 1650726686,
+        "narHash": "sha256-hE5PCqQlsdgWH3AUTwesvjZWs5ZUZ8SjMS5cnFB6W54=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b80f570a92d04e8ace67ff09c34aa48708a5c88c",
+        "rev": "3c0f57e36ed0cf9947281e3b31f1bebb7ce5d4a1",
         "type": "github"
       },
       "original": {
diff --git a/programs/nvim/plugins.nix b/programs/nvim/plugins.nix
index e3a33a0..555bda2 100644
--- a/programs/nvim/plugins.nix
+++ b/programs/nvim/plugins.nix
@@ -91,23 +91,23 @@
   };
   nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2022-04-23";
+    version = "2022-04-24";
     src = pkgs.fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "909b5d26fddad5043e354046571e7c7353b53b61";
-      sha256 = "1x1b7r73g41nqra4bar0k8alzawzc81xxcgj9cw05r3504imvnf4";
+      rev = "91f912f2d17d1e2048cccca537d78f48753d7458";
+      sha256 = "1jpmr41mknd01pwbjmyix1b2amm27jxpdbb2afaqh2yf5k7v1nsy";
       fetchSubmodules = false;
     };
   };
   nvim-ts-rainbow = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow";
-    version = "2022-04-17";
+    version = "2022-04-24";
     src = pkgs.fetchFromGitHub {
       owner = "p00f";
       repo = "nvim-ts-rainbow";
-      rev = "04284dc97eac0d0ecfea68e10be824d1a6585de0";
-      sha256 = "1i8i58m1r1322wvs8jl0nzs6lgqw78ibkp5hah07kgi2ynzr3dj3";
+      rev = "a7767e2a1761078abb97f6516e45c56147e0952e";
+      sha256 = "0ms95gxvydzf078y8mp2xqinm9bbk750nqc3ayyi26ipqba6f13x";
       fetchSubmodules = false;
     };
   };
@@ -362,12 +362,12 @@
   };
   lualine-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "lualine.nvim";
-    version = "2022-04-18";
+    version = "2022-04-24";
     src = pkgs.fetchFromGitHub {
       owner = "nvim-lualine";
       repo = "lualine.nvim";
-      rev = "18a07f790ed7ed1f11d1b130c02782e9dfd8dd7d";
-      sha256 = "09bfj2g7jn693xwi5f3zk90p4vg6jpijr1y8pl5k4hjbrg8nb68k";
+      rev = "de2c4beaf50552647273b5eaa33095e90a6d00a0";
+      sha256 = "0whcwy5xmkmmj7lb4w9g31rm6clx1pcnng3q22hcwyvrlxbkk263";
       fetchSubmodules = false;
     };
   };