From faa7f74773dfcbe021e446a676c93fe346848ce1 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 5 Jul 2022 17:18:08 -0400
Subject: [PATCH] add shfmt and shellcheck to system-wide neovim packages

---
 modules/darwin/dotfiles.nix       | 5 ++---
 modules/editor/neovim/default.nix | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/darwin/dotfiles.nix b/modules/darwin/dotfiles.nix
index 0ef0264..df47921 100644
--- a/modules/darwin/dotfiles.nix
+++ b/modules/darwin/dotfiles.nix
@@ -13,9 +13,8 @@
             if test "$argv[1]" = "offline"
                 set option "--option substitute false"
             end
-            pushd ${config.dotfilesPath}
-            git add --all
-            popd
+            commandline -r "git -C ${config.dotfilesPath} add --all"
+            commandline -f execute
             commandline -r "darwin-rebuild switch $option --flake ${config.dotfilesPath}#macbook"
             commandline -f execute
           '';
diff --git a/modules/editor/neovim/default.nix b/modules/editor/neovim/default.nix
index 2ebec2c..c8b46d8 100644
--- a/modules/editor/neovim/default.nix
+++ b/modules/editor/neovim/default.nix
@@ -5,6 +5,8 @@
     home.packages = with pkgs; [
       neovim
       gcc # for tree-sitter
+      shfmt # used everywhere
+      shellcheck # used everywhere
     ];
 
     xdg.configFile = {