Skip to content

Commit c5c011e

Browse files
committed
added more tools to Makefile
1 parent bcc4b00 commit c5c011e

File tree

4 files changed

+64
-30
lines changed

4 files changed

+64
-30
lines changed

Makefile

Lines changed: 61 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ FORCE_INSTALL?=false
2424
$(SRC_DOTFILES) dotfiles-dotfiles \
2525
$(SRC_VSCODE_SETTINGS) dotfiles-vscode \
2626
dev-node dev-go dev-php \
27-
editor-vim-vundle editor-micro editor-micro-plugins editor-neovim \
28-
tool-brew tool-powerline-go tool-bat \
27+
editor-micro editor-micro-plugins editor-neovim \
28+
tool-brew tool-powerline-go tool-bat tool-zoxide tool-fzf tool-ripgrep \
2929
@base @base-tools @dotfiles-group @tools-group \
3030
dotfiles tools editors devs \
3131
all \
@@ -67,16 +67,9 @@ dotfiles-vscode: $(SRC_VSCODE_SETTINGS)
6767
dst=$(addprefix $(DEST_VSCODE_SETTINGS_DIR)/,$$vscodeDotFile); \
6868
ln -vsf "$$src" "$$dst"; \
6969
done
70-
71-
#: Install VimVundle package mamanger (see: https://github.com/VundleVim/Vundle.vim) #editors
72-
editor-vim-vundle:
73-
-@[ -L $(VIM_VUNDLE_DIR) ] && unlink $(VIM_VUNDLE_DIR)
74-
-@[ -d $(VIM_VUNDLE_DIR) ] && rm -rf $(VIM_VUNDLE_DIR)
75-
-@mkdir -p $(VIM_VUNDLE_DIR)
76-
git clone $(VIM_VUNDLE_REPO) $(VIM_VUNDLE_DIR)/Vundle.vim
7770

7871
#: Install Neovim (see: https://github.com/neovim/neovim) #editors
79-
editor-neovim:
72+
editor-neovim: tool-brew
8073
@if [[ "$(FORCE_INSTALL)" != "false" ]] || ! command -v nvim >/dev/null; then \
8174
if [[ "$$(uname -s)" == "Darwin" ]]; then \
8275
brew install neovim; \
@@ -89,7 +82,7 @@ editor-neovim:
8982
fi
9083

9184
#: Install micro (see: https://micro-editor.github.io/) #editors
92-
editor-micro:
85+
editor-micro: tool-brew
9386
@if ! command -v micro >/dev/null; then \
9487
if [ "$$(uname -s)" == "Darwin" ]; then \
9588
brew install micro; \
@@ -110,24 +103,29 @@ editor-micro-plugins: editor-micro
110103
echo -e "$(@):\n micro editor is not installed"; \
111104
fi
112105

106+
#: Install Homebrew (see: https://brew.sh) #tools
107+
tool-brew:
108+
@if [[ "$$(uname -s)" == "Darwin" ]]; then \
109+
if [[ "$(FORCE_INSTALL)" != "false" ]] || ! brew --version >/dev/null; then \
110+
/bin/bash -c "$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"; \
111+
fi \
112+
fi
113+
113114
#: Install powerline-go (see: https://github.com/justjanne/powerline-go) #tools
114115
tool-powerline-go: dev-go bin-folder
115116
@platAsset="powerline-go-$$(go env GOOS)-$$(go env GOARCH)"; \
116117
url="https://github.com/justjanne/powerline-go/releases/latest/download/$$platAsset"; \
117118
curl -L $$url -o $(DST_BIN_DIR)/powerline-go; \
118119
chmod a+x $(DST_BIN_DIR)/powerline-go
119120

120-
#: Install Homebrew (see: https://brew.sh) #tools
121-
tool-brew:
122-
@if [[ "$$(uname -s)" == "Darwin" ]]; then \
123-
if ! brew --version >/dev/null; then \
124-
/bin/bash -c "$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"; \
125-
fi \
126-
fi
121+
122+
#: Install oh-my-posh (see: https://ohmyposh.dev/) #tools
123+
tool-oh-my-posh: bin-folder
124+
curl -s https://ohmyposh.dev/install.sh | bash -s -- -d ~/bin
127125

128126
#: Install bat (see: https://github.com/sharkdp/bat) #tools
129-
tool-bat: brew
130-
@if ! command -v bat >/dev/null; then \
127+
tool-bat: tool-brew
128+
@if [[ "$(FORCE_INSTALL)" != "false" ]] || ! command -v bat >/dev/null; then \
131129
if [ "$$(uname -s)" == "Darwin" ]; then \
132130
brew install bat; \
133131
else \
@@ -137,8 +135,46 @@ tool-bat: brew
137135
echo -e "$(@):\n $$(bat --version)"; \
138136
fi
139137

138+
#: Install zoxide (see: https://github.com/ajeetdsouza/zoxide) #tools
139+
tool-zoxide: tool-brew
140+
@if [[ "$(FORCE_INSTALL)" != "false" ]] || ! command -v zoxide >/dev/null; then \
141+
if [ "$$(uname -s)" == "Darwin" ]; then \
142+
brew install zoxide; \
143+
else \
144+
sudo apt install -y zoxide; \
145+
fi \
146+
else \
147+
echo -e "$(@):\n $$(zoxide --version)"; \
148+
fi
149+
150+
151+
#: Install fzf (see: https://github.com/junegunn/fzf) #tools
152+
tool-fzf: tool-brew
153+
@if [[ "$(FORCE_INSTALL)" != "false" ]] || ! command -v fzf >/dev/null; then \
154+
if [ "$$(uname -s)" == "Darwin" ]; then \
155+
brew install fzf; \
156+
else \
157+
sudo apt install -y fzf; \
158+
fi \
159+
else \
160+
echo -e "$(@):\n $$(fzf --version)"; \
161+
fi
162+
163+
#: Install ripgrep (see: https://github.com/BurntSushi/ripgrep) #tools
164+
tool-ripgrep: tool-brew
165+
@if [[ "$(FORCE_INSTALL)" != "false" ]] || ! command -v ripgrep >/dev/null; then \
166+
if [ "$$(uname -s)" == "Darwin" ]; then \
167+
brew install ripgrep; \
168+
else \
169+
sudo apt install -y ripgrep; \
170+
fi \
171+
else \
172+
echo -e "$(@):\n $$(rg --version)"; \
173+
fi
174+
175+
140176
#: Install NodeJs (see: https://nodejs.org) #dev
141-
dev-node: brew
177+
dev-node: tool-brew
142178
@if [[ "$(FORCE_INSTALL)" != "false" ]] || ! command -v node >/dev/null; then \
143179
if [ "$$(uname -s)" == "Darwin" ]; then \
144180
brew install node; \
@@ -159,7 +195,7 @@ dev-node-nvm:
159195
fi
160196

161197
#: Install Go (see: https://go.dev) #dev
162-
dev-go: brew
198+
dev-go: tool-brew
163199
@if ! command -v go >/dev/null; then \
164200
if [ "$$(uname -s)" = "Darwin" ]; then \
165201
brew install go; \
@@ -171,7 +207,7 @@ dev-go: brew
171207
fi
172208

173209
#: Install PHP (see: https://php.net) #dev
174-
dev-php: brew
210+
dev-php: tool-brew
175211
@if ! command -v php >/dev/null; then \
176212
if [ "$$(uname -s)" == "Darwin" ]; then \
177213
brew install php; \
@@ -188,7 +224,7 @@ release-tag:
188224

189225

190226
@base: dotfiles-dotfiles bin-folder
191-
@base-tools: tool-powerline-go tool-bat
227+
@base-tools: tool-powerline-go tool-oh-my-posh tool-bat tool-zoxide tool-fzf tool-ripgrep
192228

193229
ifeq ($(shell uname -s), Darwin)
194230
@dotfiles-group: @base dotfiles-vscode
@@ -202,7 +238,7 @@ endif
202238
dotfiles: @dotfiles-group
203239

204240
#: Installs micro and VimVundle
205-
editors: editor-micro editor-micro-plugins editor-vim-vundle
241+
editors: editor-micro editor-micro-plugins editor-neovim
206242

207243
#: Installs powerline-go. On MacOS: Homebrew #group
208244
tools: @tools-group

brew/Brewfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ brew "bash"
1010
brew "bash-completion@2"
1111
brew "coreutils"
1212
brew "binutils"
13-
brew "bat"
14-
brew "ripgrep"
15-
brew "neovim"
16-
brew "micro"
1713
# dev
1814
brew "git"
1915
brew "git-lfs"

dotfiles/zshrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ source "$HOME/.shell/env"
1515
source "$HOME/.shell/aliases"
1616
source "$HOME/.shell/xvm"
1717

18+
time_ms
19+
1820
# Set name of the theme to load --- if set to "random", it will
1921
# load a random theme each time oh-my-zsh is loaded, in which case,
2022
# to know which specific one was loaded, run: echo $RANDOM_THEME

vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
//
105105
"workbench.editor.closeOnFileDelete": true,
106106
"workbench.editor.revealIfOpen": true,
107-
"workbench.iconTheme": "catppuccin-frappe",
107+
"workbench.iconTheme": "catppuccin-latte",
108108
"workbench.list.openMode": "singleClick",
109109
"workbench.preferredDarkColorTheme": "Catppuccin Frappé",
110110
"workbench.preferredLightColorTheme": "Catppuccin Latte",

0 commit comments

Comments
 (0)