Skip to content

Commit 2918449

Browse files
cpplaincpplain
committed
Use bash scripts for install and add env file
1 parent 7226353 commit 2918449

5 files changed

Lines changed: 68 additions & 32 deletions

File tree

‎Makefile‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

home/.Brewfile renamed to home/.config/Brewfile

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,37 @@
11
tap "homebrew/bundle"
22
tap "homebrew/cask-fonts"
3-
4-
brew "fd" # telescope.nvim dependency
3+
brew "bash-language-server"
4+
brew "clang-format"
5+
brew "fd"
56
brew "fish"
6-
brew "fisher"
77
brew "go"
8-
brew "lazygit"
8+
brew "gopls"
9+
brew "lua-language-server"
910
brew "luarocks"
11+
brew "marksman"
1012
brew "minikube"
1113
brew "neovim"
1214
brew "node@20"
1315
brew "nodenv"
16+
brew "prettierd"
1417
brew "pyenv"
15-
brew "[email protected]"
18+
brew "pyright"
1619
brew "[email protected]"
20+
brew "[email protected]"
21+
brew "ruby-build"
1722
brew "rbenv"
18-
brew "ripgrep" # telescope.nvim dependency
23+
brew "ripgrep"
24+
brew "ruff"
25+
brew "ruff-lsp"
26+
brew "shfmt"
1927
brew "starship"
28+
brew "stylua"
29+
brew "taplo"
2030
brew "tree"
31+
brew "typescript-language-server"
32+
brew "vscode-langservers-extracted"
2133
brew "wget"
22-
34+
brew "yaml-language-server"
2335
cask "1password"
2436
cask "arq"
2537
cask "docker"

‎scripts/install-brew.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ set -e
44

55
arch=$(uname -m)
66
brew=/opt/homebrew/bin/brew
7-
test "x86_64" == $arch && brew=/usr/local/bin/brew
7+
if test "x86_64" == $arch; then
8+
brew=/usr/local/bin/brew
9+
fi
810

911
if test -e $brew; then
1012
echo "Homebrew already installed"

‎scripts/install-packages.sh‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,22 @@
22

33
set -e
44

5-
arch=$(uname -m)
5+
if test ! -e ~/.env; then
6+
echo "Environment not set. You must run 'install.sh -p | -w' first."
7+
exit 1
8+
fi
9+
610
brew=/opt/homebrew/bin/brew
7-
test "x86_64" == $arch && brew=/usr/local/bin/brew
11+
if test $(uname -m) == x86_64; then
12+
brew=/usr/local/bin/brew
13+
fi
14+
15+
brewfile=~/.config/Brewfile
16+
if test $(grep work ~/.env); then
17+
brewfile=~/.config/Brewfile_work
18+
fi
819

920
echo "Installing Homebrew packages"
10-
eval "$($brew shellevn)"
11-
$brew bundle --global --verbose --force --no-lock
21+
echo "Using file '$brewfile'"
22+
eval "$($brew shellenv)"
23+
$brew bundle --file $brewfile --verbose --force --no-lock

‎scripts/install.sh‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
#!/usr/bin/env bash
22

3+
set -e
4+
5+
help() {
6+
echo "usage: $(basename ${BASH_SOURCE[0]}) -p | -w"
7+
echo " -p personal"
8+
echo " -w work"
9+
}
10+
11+
if test $# -ne 1; then
12+
help
13+
exit 1
14+
fi
15+
16+
while getopts ":pw" opt; do
17+
case $opt in
18+
p)
19+
echo "Setting env to personal"
20+
echo "personal" >~/.env
21+
;;
22+
w)
23+
echo "Setting env to work"
24+
echo "work" >~/.env
25+
;;
26+
\?)
27+
help
28+
exit 1
29+
;;
30+
esac
31+
done
32+
333
./link.sh
434
./install-brew.sh
535
./install-packages.sh

0 commit comments

Comments
 (0)