Skip to content

Commit a05add8

Browse files
committed
refactor(installer): improve installation script and prune unused tools
1 parent 764363d commit a05add8

File tree

17 files changed

+81
-68
lines changed

17 files changed

+81
-68
lines changed

β€Ž.github/workflows/ci.ymlβ€Ž

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,3 @@ jobs:
4646

4747
- name: πŸ’… Lint bash files
4848
run: bash scripts/self/lint
49-
50-
build:
51-
name: πŸš€ Build
52-
runs-on: ${{ matrix.os }}
53-
needs: lint
54-
strategy:
55-
matrix:
56-
os:
57-
- macos-latest
58-
- ubuntu-latest
59-
60-
steps:
61-
- name: ⬇️ Checkout project
62-
uses: actions/checkout@v4
63-
64-
- name: πŸ“₯ Install .dotfiles
65-
run: echo "$HOME/.dotfiles" | bash installer

β€Ž.gitmodulesβ€Ž

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
[submodule "modules/dotbot"]
22
path = modules/dotbot
33
url = https://github.com/anishathalye/dotbot
4-
ignore = dirty
4+
5+
[submodule "modules/private"]
6+
path = modules/private
7+
url = git@github.com:borjapazr/dotfiles-private.git

β€Žinstallerβ€Ž

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@ main() {
158158

159159
_s "πŸŽ‰ .dotfiles installed correctly! πŸŽ‰"
160160
_s "πŸ™ Please, restart your terminal to see the changes"
161-
162-
_a "πŸ“‹ Check the installation logs"
163-
cat "$DOTFILES_LOG_FILE"
164161
}
165162

166163
main "$@"

β€Žlangs/js/global_modules.txtβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@angular/cli
21
dockly
32
gitmoji-cli
43
http-server

β€Žmodules/privateβ€Ž

Submodule private added at 1918eee

β€Žos/mac/brew/Brewfileβ€Ž

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
1-
tap "homebrew/core"
21
tap "homebrew/bundle"
32
tap "denisidoro/tools"
43
tap "clementtsang/bottom"
54
tap "moncho/dry"
65
tap "github/gh"
76
tap "homebrew/bundle"
8-
tap "homebrew/cask"
9-
tap "homebrew/cask-drivers"
10-
tap "homebrew/cask-fonts"
11-
tap "homebrew/cask-versions"
12-
tap "homebrew/core"
137
tap "homebrew/services"
148
brew "fzf"
159
brew "denisidoro/tools/navi"
1610
brew "denisidoro/tools/docpars"
1711
brew "lazydocker"
18-
brew "podman-desktop"
1912
brew "eza"
2013
brew "coreutils"
2114
brew "bash"
@@ -39,7 +32,6 @@ brew "lynis"
3932
brew "ccat"
4033
brew "gcc"
4134
brew "asdf"
42-
brew "jdx/tap/rtx"
4335
brew "shfmt"
4436
brew "shellcheck"
4537
brew "git"
@@ -73,34 +65,27 @@ brew "yq"
7365
brew "miller"
7466
brew "starship"
7567
brew "go-task/tap/go-task"
76-
brew "mise"
7768
brew "duf"
7869
brew "rm-improved"
7970
brew "tre-command"
8071
brew "ctop"
8172
brew "gping"
8273
brew "thefuck"
83-
brew "cleanclip"
8474
brew "step"
8575
brew "hadolint"
8676
brew "zimfw"
8777
cask "raycast"
88-
cask "docker"
8978
cask "notion"
9079
cask "dbeaver-community"
91-
cask "iterm2-nightly"
80+
cask "iterm2@beta"
9281
cask "gas-mask"
9382
cask "rectangle"
9483
cask "postman"
9584
cask "iina"
9685
cask "shottr"
97-
cask "cheatsheet"
98-
cask "bitwarden"
99-
cask "bitwarden-cli"
10086
cask "devtoys"
10187
cask "mos"
10288
cask "appcleaner"
103-
cask "fig"
10489
cask "visual-studio-code"
10590
cask "wezterm"
10691
cask "brave-browser"

β€Žrestoration_scripts/01-hello_friend.shβ€Ž

Lines changed: 0 additions & 1 deletion
This file was deleted.

β€Žscripts/ai/promptsβ€Ž

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source "$DOTFILES_PATH/scripts/core/_main.sh"
6+
7+
##? Paste the selected prompt
8+
#?? 1.0.0
9+
##?
10+
##? Usage:
11+
##? prompt
12+
docs::parse "$@"
13+
14+
prompts_dir="$DOTFILES_PATH/modules/private/ai/prompts"
15+
prompt=$(ls -1 "$prompts_dir" | choose)
16+
17+
cat "$prompts_dir/$prompt" | pbcopy
18+
19+
dot mac paste_text -n

β€Žscripts/mac/paste_textβ€Ž

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source "$DOTFILES_PATH/scripts/core/_main.sh"
6+
7+
##? Paste a text
8+
#?? 1.0.0
9+
##?
10+
##? Usage:
11+
##? paste_text <text>
12+
##? paste_text <text> --returning
13+
##? paste_text --nocopy
14+
##?
15+
##? Options:
16+
##? -h --help Show this screen.
17+
##? -r --returning Adds a final return press
18+
##? -n --nocopy No need to copy
19+
docs::parse "$@"
20+
21+
if $nocopy; then
22+
osascript -e "
23+
tell application \"System Events\"
24+
keystroke \"v\" using command down
25+
end tell"
26+
else
27+
if $returning; then
28+
osascript -e "
29+
set the clipboard to \"$1\"
30+
tell application \"System Events\"
31+
keystroke \"v\" using command down
32+
key code 36
33+
end tell"
34+
else
35+
osascript -e "
36+
set the clipboard to \"$1\"
37+
tell application \"System Events\"
38+
keystroke \"v\" using command down
39+
end tell"
40+
fi
41+
fi

β€Žscripts/self/installβ€Ž

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ update_system
1414

1515
install_requirements
1616

17-
install_ohmyzsh_plugins
18-
install_ohmyzsh_themes
19-
2017
log::info "πŸ”— Aplying symlinks"
2118
"$DOTFILES_PATH/bin/dot" symlinks apply | log::file "πŸ”— Aplying symlinks" || true
2219

@@ -27,15 +24,3 @@ fi
2724

2825
log::info "πŸ“₯ Importing packages"
2926
"$DOTFILES_PATH/bin/dot" package import 2>&1 | log::file "πŸ“₯ Importing packages"
30-
31-
log::info "πŸ”™ Executing custom restoration scripts"
32-
install_scripts_path="$DOTFILES_PATH/restoration_scripts"
33-
if [ -d "$install_scripts_path" ]; then
34-
find "$install_scripts_path" -mindepth 1 -maxdepth 1 -type l,f -name '*.sh' |
35-
sort |
36-
while read -r install_script; do
37-
{ [[ -x "$install_script" ]] && . "$install_script" | log::file "πŸ”™ Executing afterinstall: $(basename "$install_script")"; } || {
38-
log::error "Install script error in $(basename "$install_script")"
39-
}
40-
done
41-
fi

0 commit comments

Comments
Β (0)