diff --git a/Makefile b/Makefile index 30722d7a..4f44e616 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SUBMODULES := $(CONFIG_DIR)/nvim .PHONY: default clean nixos home /etc/nixos/config default: $(SUBMODULES) - git submodule update + git -C ./nvim pull --ff-only command -v nix > /dev/null || exit 1 [ -e /etc/nixos/ ] && make nixos || make home bat cache --build diff --git a/home/tui/neovim.nix b/home/tui/neovim.nix index bbcabf9b..80c98ca8 100644 --- a/home/tui/neovim.nix +++ b/home/tui/neovim.nix @@ -8,20 +8,13 @@ withNodeJs = true; withRuby = true; withPython3 = true; - extraPython3Packages = ps: - with ps; [ - # Extra python packages for magma-nvim - jupyter-client - ueberzug - cairosvg - pnglatex - ]; extraPackages = with pkgs; [ # Used by installed plugins git curl gnutar gnumake + gnused gcc fzf ripgrep diff --git a/nvim b/nvim index 497fed2c..25921919 160000 --- a/nvim +++ b/nvim @@ -1 +1 @@ -Subproject commit 497fed2c07ed966a1f6ed82f3722025b18b13b4c +Subproject commit 25921919d1e10a06dbbab6bb69b81a4bb817c678