Install dependencies from script

.github/workflows/install.yml

@@ -5,19 +5,15 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-  workflow_dispatch:
-    inputs:
-      chosen-os:
-        description: "OS to run on"
-        required: true
-        type: choice
-        options:
-          - ubuntu-latest
-          - macos-latest
 
 jobs:
   install-script:
-    runs-on: ${{ inputs.chosen-os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - name: Run Install script

Makefile

@@ -2,47 +2,6 @@ NVIM_HOME := $(shell echo $${XDG_DATA_HOME:-$$HOME/.local/share})
 INIT_DIR := $(HOME)/.config/nvim
 
 
-brewinstall:
-	/bin/bash -c "$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-
-
-brewdeps:
-	brew install \
-		bat \
-		exa \
-		fd \
-		fzf \
-		gcc \
-		make \
-		neovim \
-		ripgrep \
-		stow \
-		tmux
-
-
-brewenv:
-	(echo; echo 'eval "$$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"') >> /home/runner/.bashrc
-	eval "$$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-
-
-nvm:
-	curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
-
-
-node:
-	nvm install node
-
-
-nodedeps:
-	npm i -g \
-		eslint \
-		tldr
-
-
-tpm:
-	-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-
-
 vim:
 	stow -t ~ --ignore=ftplugin vim
 	mkdir -p $(INIT_DIR)

install.sh

@@ -2,14 +2,14 @@
 
 install_brew() {
     echo "Installing brew..."
-	/bin/bash -c "$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 }
 
 install_brew_deps() {
     echo "Installing dependencies from brew..."
     brew install \
         bat \
-        exa \
+        eza \
         fd \
         fzf \
         gcc \
@@ -20,17 +20,47 @@ install_brew_deps() {
         tmux
 }
 
+install_nvm() {
+	curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
+    export NVM_DIR="$HOME/.nvm"
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+}
+
+install_node() {
+    nvm install node
+}
+
+install_node_deps() {
+	npm i -g \
+		eslint \
+		tldr
+}
+
+install_tpm() {
+	-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+}
+
+stow_dotfiles() {
+    make stowall
+}
+
 install() {
     local OS=$(uname -s)
 
     install_brew
-    if [[ $OS eq "Linux" ]]
+    if [[ $OS = "Linux" ]]
     then
-        (echo; echo 'eval "$$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"') >> /home/runner/.bashrc
-        eval "$$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+        (echo; echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"') >> /home/runner/.bashrc
+        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+        export PATH=/home/linuxbrew/.linuxbrew/bin:$PATH
     fi
 
-    install_brew_deps
+    # install_brew_deps
+    install_nvm
+    install_node
+    install_node_deps
+    install_tpm
+    stow_dotfiles
 }
 
 install

zsh/.alias

@@ -1,3 +1,3 @@
 alias vim="nvim"
 alias cat="bat"
-alias ls="exa"
+alias ls="eza"