Skip to content

Commit

Permalink
Merge pull request #262 from joclement/next
Browse files Browse the repository at this point in the history
next
  • Loading branch information
joclement authored Jan 31, 2025
2 parents a14bb07 + 21319e2 commit 915c3d9
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 19 deletions.
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ repos:
^vim/autoload/plug\.vim$
)
- repo: https://github.com/codespell-project/codespell
rev: 193cd7d27cd571f79358af09a8fb8997e54f8fff # frozen: v2.3.0
rev: 63c8f8312b7559622c0d82815639671ae42132ac # frozen: v2.4.1
hooks:
- id: codespell
exclude: |
(?x)(
^vim/autoload/plug\.vim$
)
- repo: https://github.com/google/yamlfmt
rev: fd52a481d81c428362a4fa165a9dd93dfb854086 # frozen: v0.14.0
rev: 000ae56472e8e0785d5554055f346ae64b6ef2b9 # frozen: v0.15.0
hooks:
- id: yamlfmt
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: a23f6b85d0fdd5bb9d564e2579e678033debbdff # frozen: v0.10.0.1
hooks:
- id: shellcheck
- repo: https://github.com/commitizen-tools/commitizen
rev: 27499d727f5ceff802bda34bbda314644824ce06 # frozen: v4.1.0
rev: c6119812f7c21e6b2b01583025e2664945c550a3 # frozen: v4.1.1
hooks:
- id: commitizen
- id: commitizen-branch
Expand All @@ -56,15 +56,15 @@ repos:
^.git/COMMIT_EDITMSG$
)
- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
rev: 1a92c0953500d402fc49ceb67ad7fbf7cabad38a # frozen: 3.0.3
rev: c764d820bfc7d772ae9cc86b4696c375aee944a4 # frozen: 3.2.0
hooks:
- id: editorconfig-checker
- repo: https://github.com/scop/pre-commit-shfmt
rev: d2cee4b6903c30e2b0bdafe30e583d3a6cda80db # frozen: v3.10.0-2
hooks:
- id: shfmt
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: cb3c2be894b151dff143b1baf6acbd55f2b7faed # frozen: 0.30.0
rev: a20fe80ebdd4aec6791598c9ff559985580f91ea # frozen: 0.31.1
hooks:
- id: check-github-workflows
- id: check-renovate
Expand Down
8 changes: 5 additions & 3 deletions env.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__path_append_if_dir_exists() {
if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
if [[ -d $1 ]] && [[ ":$PATH:" != *":$1:"* ]]; then
PATH="$PATH:$1"
fi
}
Expand All @@ -12,8 +12,6 @@ __path_append_if_dir_exists "$HOME"/.poetry/bin

__path_append_if_dir_exists "$HOME"/.fzf/bin

unset -f __path_append_if_dir_exists

CARGO_ENV="$HOME"/.cargo/env
if [ -f "$CARGO_ENV" ]; then
# shellcheck source=/dev/null
Expand All @@ -32,3 +30,7 @@ export HISTIGNORE='*sudo -S*'
# ---------------------------------------------------------------------

export MAKE_PARALLELIZATION=8

# ---------------------------------------------------------------------

export UV_PYTHON_DOWNLOADS=never
1 change: 1 addition & 0 deletions gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ __pycache__/
.ruff_cache/
.pytest_cache/
pyrightconfig.json
*.egg-info/

### Lua
lua_modules
Expand Down
3 changes: 1 addition & 2 deletions install.conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@
~/CPPLINT.cfg:

- create:
- ~/.git-template
- ~/.zfunc
~/.git-template:

- shell:
- git submodule update --recursive --init --jobs=$(nproc)
Expand Down
4 changes: 3 additions & 1 deletion shared_shell.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# This file contains all the settings shared between different shells(bash, zsh)
# shellcheck disable=SC2046,SC2086

# shellcheck source=shared_shell.sh
source "$HOME"/.shared_aliases.sh
Expand All @@ -13,5 +14,6 @@ fi
eval "$(dircolors ~/.dircolors-solarized/dircolors.ansi-dark)"

export DIRENV_LOG_FORMAT=""
# shellcheck disable=SC2046,SC2086
eval "$(direnv hook $(basename $SHELL))"

eval "$(uv generate-shell-completion $(basename $SHELL))"
8 changes: 1 addition & 7 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ if [[ -r "$P10K_INSTANT_PROMPT" ]]; then
source "$P10K_INSTANT_PROMPT"
fi

# Uncomment the following line to use case-sensitive completion.
# For completion
CASE_SENSITIVE="true"

# Shows dots if waiting for autocompletion, ...
COMPLETION_WAITING_DOTS="true"

# DISABLE AUTOCORRECTION
DISABLE_CORRECTION="true"

export TERM="xterm-256color"
Expand All @@ -22,9 +20,6 @@ if [ -f "$HOME"/.private_zshrc_begin ]; then
source "$HOME"/.private_zshrc_begin
fi

# for custom autocompletion
fpath+=$HOME/.zfunc

###############################antigen stuff####################################

source ~/.antigen/antigen.zsh
Expand All @@ -33,7 +28,6 @@ antigen use oh-my-zsh

antigen bundles <<EOBUNDLES
# for working with git
voronkovich/gitignore.plugin.zsh
# to go to parent dirs quickly
Expand Down

0 comments on commit 915c3d9

Please sign in to comment.