Update makefiles

Makefile

@@ -1,5 +1,26 @@
-mac:
+brew:
+	/bin/bash -c "$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+
+brewdeps: brew
+	brew install \
+		bat \
+		exa \
+		fd \
+		fzf \
+		make \
+		neovim \
+		ripgrep \
+		stow \
+		tmux
+
+
+tpm:
+	-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+
+
+mac: brewdeps tpm
 	make -f ./makefiles/mac.mk all
 
-ubuntu:
+ubuntu: brewdeps tpm
 	make -f ./makefiles/ubuntu.mk all

makefiles/mac.mk

@@ -1,48 +1,29 @@
 NVIM_HOME := $(shell echo $${XDG_DATA_HOME:-$$HOME/.local/share})
-
-stow:
-	brew install stow
-
-
-ripgrep:
-	brew install ripgrep
-
-
-fd:
-	brew install fd
-
-
 INIT_DIR := $(HOME)/.config/nvim
 
-
-vim: stow ripgrep fd
-	brew install neovim make
+vim:
 	stow -t ~ --ignore=ftplugin vim
 	mkdir -p $(INIT_DIR)
 	stow -t $(INIT_DIR) vim
 
 
-tmux-install:
-	brew install tmux
-
-
-tpm: tmux-install
+tpm:
 	-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
 
 
-tmux-conf: stow tpm
+tmux-conf:
 	stow -t ~ tmux
 	tmux start-server
 	tmux new-session -d
 	~/.tmux/plugins/tpm/bin/install_plugins
 	tmux kill-server
 
 
-gitconfig: stow
+gitconfig:
 	stow --adopt -t ~ git
 
 
-intellij: stow
+intellij:
 	stow -t ~ intellij
 
 

makefiles/ubuntu.mk

@@ -1,50 +1,25 @@
 NVIM_HOME := $(shell echo $${XDG_DATA_HOME:-$$HOME/.local/share})
-
-stow:
-	sudo apt-get install -y stow
-
-
-ripgrep:
-	curl -LO https://github.com/BurntSushi/ripgrep/releases/download/13.0.0/ripgrep_13.0.0_amd64.deb
-	sudo dpkg -i ripgrep_13.0.0_amd64.deb
-
-
-fd:
-	sudo apt-get install -y fd-find
-
-
 INIT_DIR := $(HOME)/.config/nvim
 
-vim: stow ripgrep fd
-	sudo apt-get install -y build-essential git
-	curl -L -o nvim-linux64.deb https://github.com/neovim/neovim/releases/download/v0.7.0/nvim-linux64.deb
-	sudo apt install ./nvim-linux64.deb
+vim:
 	stow -t ~ --ignore=ftplugin vim
 	mkdir -p $(INIT_DIR)
 	stow -t $(INIT_DIR) vim
 
 
-tmux-install:
-	sudo apt-get install -y tmux
-
-
-tpm: tmux-install
-	-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-
-
-tmux-conf: stow tpm
+tmux-conf: tpm
 	stow -t ~ tmux
 	tmux start-server
 	tmux new-session -d
 	~/.tmux/plugins/tpm/bin/install_plugins
 	tmux kill-server
 
 
-gitconfig: stow
+gitconfig:
 	stow -t ~ git
 
 
-intellij: stow
+intellij:
 	stow -t ~ intellij