From 8a6a63ba4e43aecb97a87cb5cef36064f57b0340 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sun, 16 Jan 2022 17:59:55 +0100
Subject: [PATCH] Improved neovim setup

---
 home.nix                  | 10 +++++-----
 programs/nvim/default.nix |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/home.nix b/home.nix
index 94baa99..8f4e2db 100644
--- a/home.nix
+++ b/home.nix
@@ -60,12 +60,12 @@
         "$HOME/.bin/calculate-nix-path"
 
         # neovim
-        echo -n "Running LuaCacheClear: "
-        nvim -c 'try | execute "LuaCacheClear" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless
-        printf '\nRemoving luacache file: '
+        echo -n 'Removing luacache file: '
         rm -f "$HOME/.cache/nvim/luacache"
-        echo "Done"
-        echo 'Running TSUpdateSync ...'
+        echo 'Done'
+        echo -n 'Running LuaCacheClear: '
+        nvim -c 'try | execute "LuaCacheClear" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless
+        printf '\nRunning TSUpdateSync ... '
         nvim -c 'try | execute "TSUpdateSync" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless
         printf '\n'
       '';
diff --git a/programs/nvim/default.nix b/programs/nvim/default.nix
index 7d091a0..678a747 100644
--- a/programs/nvim/default.nix
+++ b/programs/nvim/default.nix
@@ -25,7 +25,8 @@ in
     withPython3 = false;
 
     extraConfig = ''
-      let $CC = '${pkgs.clang}/bin/cc'
+      let $CC = '${pkgs.clang}/bin/clang'
+      let $CXX = '${pkgs.clang}/bin/clang++'
 
       lua require('impatient')
       lua require('nix_init')