@@ -24,8 +24,8 @@ FORCE_INSTALL?=false
24
24
$(SRC_DOTFILES) dotfiles-dotfiles \
25
25
$(SRC_VSCODE_SETTINGS) dotfiles-vscode \
26
26
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 \
29
29
@base @base-tools @dotfiles-group @tools-group \
30
30
dotfiles tools editors devs \
31
31
all \
@@ -67,16 +67,9 @@ dotfiles-vscode: $(SRC_VSCODE_SETTINGS)
67
67
dst=$(addprefix $(DEST_VSCODE_SETTINGS_DIR ) /,$$vscodeDotFile) ; \
68
68
ln -vsf " $$ src" " $$ dst" ; \
69
69
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
77
70
78
71
# : Install Neovim (see: https://github.com/neovim/neovim) #editors
79
- editor-neovim :
72
+ editor-neovim : tool-brew
80
73
@if [[ " $( FORCE_INSTALL) " != " false" ]] || ! command -v nvim > /dev/null; then \
81
74
if [[ " $$ (uname -s)" == " Darwin" ]]; then \
82
75
brew install neovim; \
@@ -89,7 +82,7 @@ editor-neovim:
89
82
fi
90
83
91
84
# : Install micro (see: https://micro-editor.github.io/) #editors
92
- editor-micro :
85
+ editor-micro : tool-brew
93
86
@if ! command -v micro > /dev/null; then \
94
87
if [ " $$ (uname -s)" == " Darwin" ]; then \
95
88
brew install micro; \
@@ -110,24 +103,29 @@ editor-micro-plugins: editor-micro
110
103
echo -e " $( @) :\n micro editor is not installed" ; \
111
104
fi
112
105
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
+
113
114
# : Install powerline-go (see: https://github.com/justjanne/powerline-go) #tools
114
115
tool-powerline-go : dev-go bin-folder
115
116
@platAsset=" powerline-go-$$ (go env GOOS)-$$ (go env GOARCH)" ; \
116
117
url=" https://github.com/justjanne/powerline-go/releases/latest/download/$$ platAsset" ; \
117
118
curl -L $$ url -o $(DST_BIN_DIR ) /powerline-go; \
118
119
chmod a+x $(DST_BIN_DIR ) /powerline-go
119
120
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
127
125
128
126
# : 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 \
131
129
if [ " $$ (uname -s)" == " Darwin" ]; then \
132
130
brew install bat; \
133
131
else \
@@ -137,8 +135,46 @@ tool-bat: brew
137
135
echo -e " $( @) :\n $$ (bat --version)" ; \
138
136
fi
139
137
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
+
140
176
# : Install NodeJs (see: https://nodejs.org) #dev
141
- dev-node : brew
177
+ dev-node : tool- brew
142
178
@if [[ " $( FORCE_INSTALL) " != " false" ]] || ! command -v node > /dev/null; then \
143
179
if [ " $$ (uname -s)" == " Darwin" ]; then \
144
180
brew install node; \
@@ -159,7 +195,7 @@ dev-node-nvm:
159
195
fi
160
196
161
197
# : Install Go (see: https://go.dev) #dev
162
- dev-go : brew
198
+ dev-go : tool- brew
163
199
@if ! command -v go > /dev/null; then \
164
200
if [ " $$ (uname -s)" = " Darwin" ]; then \
165
201
brew install go; \
@@ -171,7 +207,7 @@ dev-go: brew
171
207
fi
172
208
173
209
# : Install PHP (see: https://php.net) #dev
174
- dev-php : brew
210
+ dev-php : tool- brew
175
211
@if ! command -v php > /dev/null; then \
176
212
if [ " $$ (uname -s)" == " Darwin" ]; then \
177
213
brew install php; \
@@ -188,7 +224,7 @@ release-tag:
188
224
189
225
190
226
@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
192
228
193
229
ifeq ($(shell uname -s) , Darwin)
194
230
@dotfiles-group : @base dotfiles-vscode
@@ -202,7 +238,7 @@ endif
202
238
dotfiles : @dotfiles-group
203
239
204
240
# : Installs micro and VimVundle
205
- editors : editor-micro editor-micro-plugins editor-vim-vundle
241
+ editors : editor-micro editor-micro-plugins editor-neovim
206
242
207
243
# : Installs powerline-go. On MacOS: Homebrew #group
208
244
tools : @tools-group
0 commit comments