mirror of
https://gitea.blesmrt.net/mikaela/shell-things.git
synced 2025-08-21 05:47:23 +02:00
Compare commits
No commits in common. "b4dd5794d2ec64aa7fee861d4b8551488b6948e2" and "a7c5896e2873b67921a8b21c1c678a3199c28ad9" have entirely different histories.
b4dd5794d2
...
a7c5896e28
@ -25,6 +25,7 @@ repos:
|
|||||||
- id: destroyed-symlinks
|
- id: destroyed-symlinks
|
||||||
- id: detect-private-key
|
- id: detect-private-key
|
||||||
- id: end-of-file-fixer
|
- id: end-of-file-fixer
|
||||||
|
exclude: .*\.nginx$
|
||||||
- id: fix-byte-order-marker
|
- id: fix-byte-order-marker
|
||||||
- id: trailing-whitespace
|
- id: trailing-whitespace
|
||||||
# Markdown allows double trailing space for forced line change. The
|
# Markdown allows double trailing space for forced line change. The
|
||||||
@ -117,15 +118,17 @@ repos:
|
|||||||
hooks:
|
hooks:
|
||||||
- id: prettier
|
- id: prettier
|
||||||
# These are handled by Black below
|
# These are handled by Black below
|
||||||
exclude_types: [python, pyi, jupyter]
|
exclude_types:
|
||||||
additional_dependencies: [
|
[python, pyi, jupyter]
|
||||||
|
#additional_dependencies:
|
||||||
|
#[
|
||||||
# https://www.npmjs.com/package/prettier
|
# https://www.npmjs.com/package/prettier
|
||||||
"prettier@3.0.3",
|
#"prettier@3.0.1",
|
||||||
# https://www.npmjs.com/package/prettier-plugin-nginx
|
# https://www.npmjs.com/package/prettier-plugin-nginx
|
||||||
"prettier-plugin-nginx@1.0.3",
|
#"prettier-plugin-nginx@1.0.3",
|
||||||
# https://www.npmjs.com/package/prettier-plugin-toml
|
# https://www.npmjs.com/package/prettier-plugin-toml
|
||||||
"prettier-plugin-toml@1.0.0",
|
#"prettier-plugin-toml@1.0.0",
|
||||||
]
|
#]
|
||||||
|
|
||||||
# Black, opinionated Python code formatter
|
# Black, opinionated Python code formatter
|
||||||
# - repo: https://github.com/psf/black
|
# - repo: https://github.com/psf/black
|
||||||
@ -150,6 +153,7 @@ repos:
|
|||||||
alias: ec
|
alias: ec
|
||||||
# I don't actually care about line lengths as more than a guideline
|
# I don't actually care about line lengths as more than a guideline
|
||||||
args: [-disable-max-line-length]
|
args: [-disable-max-line-length]
|
||||||
|
exclude: .*\.nginx$
|
||||||
|
|
||||||
# # Python linter
|
# # Python linter
|
||||||
# - repo: local
|
# - repo: local
|
||||||
|
20
rc/bashrc
20
rc/bashrc
@ -541,6 +541,13 @@ fi
|
|||||||
# More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
|
# More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
|
||||||
alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
|
alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
|
||||||
|
|
||||||
|
# I use nvim, while I keep running vim instead
|
||||||
|
if hash nvim 2>/dev/null; then
|
||||||
|
alias vim="echo 'using nvim instead' && nvim"
|
||||||
|
else
|
||||||
|
alias vim="echo 'nvim not found' && \vim"
|
||||||
|
fi
|
||||||
|
|
||||||
# Allow custom aliases to be put in .aliases or .bash_aliases .
|
# Allow custom aliases to be put in .aliases or .bash_aliases .
|
||||||
|
|
||||||
# .aliases
|
# .aliases
|
||||||
@ -807,19 +814,6 @@ ssh-verify-file() {
|
|||||||
ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig <$2
|
ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig <$2
|
||||||
}
|
}
|
||||||
|
|
||||||
# I use nvim, while I keep running vim instead
|
|
||||||
if hash nvim 2>/dev/null; then
|
|
||||||
vim() {
|
|
||||||
echo 'using nvim instead'
|
|
||||||
nvim $@
|
|
||||||
}
|
|
||||||
else
|
|
||||||
vim() {
|
|
||||||
echo 'nvim not found'
|
|
||||||
\vim $@
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Source files for miscannellious modifications.
|
# Source files for miscannellious modifications.
|
||||||
|
|
||||||
# acme.sh
|
# acme.sh
|
||||||
|
19
rc/zshrc
19
rc/zshrc
@ -523,6 +523,13 @@ fi
|
|||||||
# More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
|
# More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
|
||||||
alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
|
alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
|
||||||
|
|
||||||
|
# I use nvim, while I keep running vim instead
|
||||||
|
if hash nvim 2>/dev/null; then
|
||||||
|
alias vim="echo 'using nvim instead' && nvim"
|
||||||
|
else
|
||||||
|
alias vim="echo 'nvim not found' && \vim"
|
||||||
|
fi
|
||||||
|
|
||||||
# Allow custom aliases to be put in .aliases or .zsh_aliases .
|
# Allow custom aliases to be put in .aliases or .zsh_aliases .
|
||||||
|
|
||||||
# .aliases
|
# .aliases
|
||||||
@ -793,18 +800,6 @@ ssh-verify-file () {
|
|||||||
ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig < $2
|
ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig < $2
|
||||||
}
|
}
|
||||||
|
|
||||||
# I use nvim, while I keep running vim instead
|
|
||||||
if hash nvim 2>/dev/null; then
|
|
||||||
vim() {
|
|
||||||
echo 'using nvim instead'
|
|
||||||
nvim $@
|
|
||||||
}
|
|
||||||
else
|
|
||||||
vim() {
|
|
||||||
echo 'nvim not found'
|
|
||||||
\vim $@
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Source files for miscannellious modifications.
|
# Source files for miscannellious modifications.
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user