mirror of
https://github.com/Crocmagnon/dotfiles.git
synced 2024-12-21 13:21:52 +01:00
Cleanup whitespaces
This commit is contained in:
parent
8b2fe93b7d
commit
c0e55e41ce
5 changed files with 24 additions and 23 deletions
|
@ -1,10 +1,10 @@
|
|||
README.md
|
||||
LICENSE
|
||||
Preferences.sublime-settings
|
||||
{{ if ne .chezmoi.os "darwin" }}
|
||||
{{- if ne .chezmoi.os "darwin" }}
|
||||
Library/Application Support/
|
||||
{{ end }}
|
||||
{{ if ne .chezmoi.os "linux" }}
|
||||
{{- end }}
|
||||
{{- if ne .chezmoi.os "linux" }}
|
||||
.config/sublime-text/
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
fish_add_path /opt/homebrew/bin $HOME/.local/bin $HOME/.cargo/bin $HOME/.krew/bin
|
||||
{{ if eq .chezmoi.os "linux" }}
|
||||
{{- if eq .chezmoi.os "linux" }}
|
||||
fish_add_path /home/linuxbrew/.linuxbrew/bin $HOME/.local/share/JetBrains/Toolbox/scripts
|
||||
eval "$(brew shellenv)"
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
set -gx VIRTUAL_ENV_DISABLE_PROMPT 1
|
||||
set -gx PYENV_ROOT $HOME/.pyenv
|
||||
fish_add_path $HOME/.pyenv/bin
|
||||
|
@ -28,11 +28,11 @@ set -gx ANSIBLE_NOCOWS 1
|
|||
|
||||
set -gx GITEA_TOKEN {{ (bitwardenFields "item" "git.augendre.info").fish_config_token.value | quote }}
|
||||
|
||||
{{ if eq .chezmoi.os "darwin" }}
|
||||
{{- if eq .chezmoi.os "darwin" }}
|
||||
set -g fish_greeting "Yo ✌🏻Bien ?"
|
||||
{{ else }}
|
||||
{{- else }}
|
||||
set -g fish_greeting "Yo ✌ Bien ?"
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
# Install python with pyenv with tcl/tk support
|
||||
# https://stackoverflow.com/a/60469203/2758732
|
||||
set -gx PYTHON_CONFIGURE_OPTS "--with-tcltk-includes='-I/usr/local/opt/tcl-tk/include' --with-tcltk-libs='-L/usr/local/opt/tcl-tk/lib -ltcl8.6 -ltk8.6'"
|
||||
|
|
|
@ -12,12 +12,12 @@
|
|||
autoSetupRemote = true
|
||||
[help]
|
||||
autocorrect = immediate
|
||||
{{ if hasKey . "proxy" }}
|
||||
{{- if hasKey . "proxy" }}
|
||||
[http]
|
||||
proxy = {{ .proxy.protocol }}://{{ .proxy.address }}:{{ .proxy.port }}
|
||||
[https]
|
||||
proxy = {{ .proxy.protocol }}://{{ .proxy.address }}:{{ .proxy.port }}
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
[alias]
|
||||
ci = commit
|
||||
cp = cherry-pick
|
||||
|
@ -79,12 +79,13 @@
|
|||
[includeIf "gitdir:~/Projects/gw/**"]
|
||||
path = {{ .chezmoi.homeDir }}/Projects/gw/.gitconfig
|
||||
[filter "lfs"]
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
[checkout]
|
||||
defaultRemote = origin
|
||||
defaultRemote = origin
|
||||
|
||||
[tag]
|
||||
sort = version:refname
|
||||
sort = version:refname
|
||||
|
||||
|
|
|
@ -5,8 +5,8 @@ export PATH="$PATH:$HOME/.rvm/bin"
|
|||
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
|
||||
[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
|
||||
|
||||
{{ if eq .chezmoi.os "linux" }}
|
||||
{{- if eq .chezmoi.os "linux" }}
|
||||
# Set PATH, MANPATH, etc., for Homebrew.
|
||||
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
|
|
@ -35,19 +35,19 @@ Host hyperhdr
|
|||
hostname hyperhdr.local
|
||||
user pi
|
||||
|
||||
{{ if hasKey . "proxy" }}
|
||||
{{- if hasKey . "proxy" }}
|
||||
Host github.com
|
||||
Hostname ssh.github.com
|
||||
Port 443
|
||||
User git
|
||||
ProxyCommand nc -X connect -x {{ .proxy.address }}:{{ .proxy.port }} %h %p
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
|
||||
Host *
|
||||
AddKeysToAgent yes
|
||||
{{ if eq .chezmoi.os "darwin" }}
|
||||
{{- if eq .chezmoi.os "darwin" }}
|
||||
UseKeychain yes
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
SendEnv LANG
|
||||
port 22
|
||||
XAuthLocation /opt/X11/bin/xauth
|
||||
|
|
Loading…
Reference in a new issue