Skip to content

Commit 339ba20

Browse files
committed
🐚 shell refactor
1 parent 715ddec commit 339ba20

22 files changed

+366
-443
lines changed

.pre-commit-config.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
default_stages: [commit]
1+
default_stages: [pre-commit]
22
fail_fast: false
33

44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v4.5.0
6+
rev: v5.0.0
77
hooks:
88
- id: trailing-whitespace
99
- id: end-of-file-fixer
@@ -21,9 +21,12 @@ repos:
2121
args: [--print-width=88, --tab-width=4]
2222

2323
- repo: https://github.com/scop/pre-commit-shfmt
24-
rev: v3.8.0-1
24+
rev: v3.11.0-1
2525
hooks:
2626
- id: shfmt
27+
types: [file]
28+
files: (^bin/|^shell/|^linux/|\.sh$)
29+
exclude: '\.md$'
2730

2831
- repo: https://github.com/JohnnyMorganz/StyLua
2932
rev: v0.20.0

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ xbrew-cleanup-force: ## Cleanup x86 Homebrew, remove unused packages.
6161
.PHONY: pyenv-install-all
6262
pyenv-install-all: ## Install all python versions into pyenv.
6363
@echo "Installing all python versions into pyenv 🐍"
64-
pyenv install 3.12 3.11 3.10 3.9 3.8 --skip-existing
65-
pyenv global 3.12 3.11 3.10 3.9 3.8
64+
pyenv install 3.12 3.11 3.10 3.9 --skip-existing
65+
pyenv global 3.12 3.11 3.10 3.9
6666
pyenv rehash
6767
@echo "Python versions installed successfully 🎉"
6868

@@ -129,6 +129,12 @@ docker-build:
129129
docker-run:
130130
docker run --rm -it --env TERM --env COLORTERM juftin/juftin:latest
131131

132+
# Pull / Recreate all Submodules
133+
.PHONY: submodules
134+
submodules:
135+
git submodule update --init --recursive --remote --jobs=4
136+
git pull --recurse-submodules --jobs=4
137+
132138
.DEFAULT_GOAL := help
133139
.PHONY: help
134140
help: ## Show this help message and exit.

bootstrap/bootstrap.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ function symlink_item() {
290290
##########################################################
291291

292292
function symlink_shell() {
293+
symlink_item "${DOTFILES_DIR}/shell/.shell_startup" "${HOME}/.shell_startup"
293294
symlink_item "${DOTFILES_DIR}/shell/.shell_vars" "${HOME}/.shell_vars"
294295
symlink_item "${DOTFILES_DIR}/shell/.shell_aliases" "${HOME}/.shell_aliases"
295296
symlink_item "${DOTFILES_DIR}/shell/.shell_functions" "${HOME}/.shell_functions"

bootstrap/oh-my-bash

Submodule oh-my-bash updated 73 files

bootstrap/oh-my-zsh

Submodule oh-my-zsh updated 141 files

bootstrap/pyenv

Submodule pyenv updated 189 files

0 commit comments

Comments
 (0)