mirror of
https://github.com/Crocmagnon/dotfiles.git
synced 2024-11-23 15:08:06 +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
|
README.md
|
||||||
LICENSE
|
LICENSE
|
||||||
Preferences.sublime-settings
|
Preferences.sublime-settings
|
||||||
{{ if ne .chezmoi.os "darwin" }}
|
{{- if ne .chezmoi.os "darwin" }}
|
||||||
Library/Application Support/
|
Library/Application Support/
|
||||||
{{ end }}
|
{{- end }}
|
||||||
{{ if ne .chezmoi.os "linux" }}
|
{{- if ne .chezmoi.os "linux" }}
|
||||||
.config/sublime-text/
|
.config/sublime-text/
|
||||||
{{ end }}
|
{{- end }}
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
fish_add_path /opt/homebrew/bin $HOME/.local/bin $HOME/.cargo/bin $HOME/.krew/bin
|
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
|
fish_add_path /home/linuxbrew/.linuxbrew/bin $HOME/.local/share/JetBrains/Toolbox/scripts
|
||||||
eval "$(brew shellenv)"
|
eval "$(brew shellenv)"
|
||||||
{{ end }}
|
{{- end }}
|
||||||
set -gx VIRTUAL_ENV_DISABLE_PROMPT 1
|
set -gx VIRTUAL_ENV_DISABLE_PROMPT 1
|
||||||
set -gx PYENV_ROOT $HOME/.pyenv
|
set -gx PYENV_ROOT $HOME/.pyenv
|
||||||
fish_add_path $HOME/.pyenv/bin
|
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 }}
|
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 ?"
|
set -g fish_greeting "Yo ✌🏻Bien ?"
|
||||||
{{ else }}
|
{{- else }}
|
||||||
set -g fish_greeting "Yo ✌ Bien ?"
|
set -g fish_greeting "Yo ✌ Bien ?"
|
||||||
{{ end }}
|
{{- end }}
|
||||||
# Install python with pyenv with tcl/tk support
|
# Install python with pyenv with tcl/tk support
|
||||||
# https://stackoverflow.com/a/60469203/2758732
|
# 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'"
|
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
|
autoSetupRemote = true
|
||||||
[help]
|
[help]
|
||||||
autocorrect = immediate
|
autocorrect = immediate
|
||||||
{{ if hasKey . "proxy" }}
|
{{- if hasKey . "proxy" }}
|
||||||
[http]
|
[http]
|
||||||
proxy = {{ .proxy.protocol }}://{{ .proxy.address }}:{{ .proxy.port }}
|
proxy = {{ .proxy.protocol }}://{{ .proxy.address }}:{{ .proxy.port }}
|
||||||
[https]
|
[https]
|
||||||
proxy = {{ .proxy.protocol }}://{{ .proxy.address }}:{{ .proxy.port }}
|
proxy = {{ .proxy.protocol }}://{{ .proxy.address }}:{{ .proxy.port }}
|
||||||
{{ end }}
|
{{- end }}
|
||||||
[alias]
|
[alias]
|
||||||
ci = commit
|
ci = commit
|
||||||
cp = cherry-pick
|
cp = cherry-pick
|
||||||
|
@ -79,12 +79,13 @@
|
||||||
[includeIf "gitdir:~/Projects/gw/**"]
|
[includeIf "gitdir:~/Projects/gw/**"]
|
||||||
path = {{ .chezmoi.homeDir }}/Projects/gw/.gitconfig
|
path = {{ .chezmoi.homeDir }}/Projects/gw/.gitconfig
|
||||||
[filter "lfs"]
|
[filter "lfs"]
|
||||||
clean = git-lfs clean -- %f
|
clean = git-lfs clean -- %f
|
||||||
smudge = git-lfs smudge -- %f
|
smudge = git-lfs smudge -- %f
|
||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
required = true
|
required = true
|
||||||
[checkout]
|
[checkout]
|
||||||
defaultRemote = origin
|
defaultRemote = origin
|
||||||
|
|
||||||
[tag]
|
[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/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
|
||||||
[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
|
[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
|
||||||
|
|
||||||
{{ if eq .chezmoi.os "linux" }}
|
{{- if eq .chezmoi.os "linux" }}
|
||||||
# Set PATH, MANPATH, etc., for Homebrew.
|
# Set PATH, MANPATH, etc., for Homebrew.
|
||||||
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||||
{{ end }}
|
{{- end }}
|
||||||
|
|
|
@ -35,19 +35,19 @@ Host hyperhdr
|
||||||
hostname hyperhdr.local
|
hostname hyperhdr.local
|
||||||
user pi
|
user pi
|
||||||
|
|
||||||
{{ if hasKey . "proxy" }}
|
{{- if hasKey . "proxy" }}
|
||||||
Host github.com
|
Host github.com
|
||||||
Hostname ssh.github.com
|
Hostname ssh.github.com
|
||||||
Port 443
|
Port 443
|
||||||
User git
|
User git
|
||||||
ProxyCommand nc -X connect -x {{ .proxy.address }}:{{ .proxy.port }} %h %p
|
ProxyCommand nc -X connect -x {{ .proxy.address }}:{{ .proxy.port }} %h %p
|
||||||
{{ end }}
|
{{- end }}
|
||||||
|
|
||||||
Host *
|
Host *
|
||||||
AddKeysToAgent yes
|
AddKeysToAgent yes
|
||||||
{{ if eq .chezmoi.os "darwin" }}
|
{{- if eq .chezmoi.os "darwin" }}
|
||||||
UseKeychain yes
|
UseKeychain yes
|
||||||
{{ end }}
|
{{- end }}
|
||||||
SendEnv LANG
|
SendEnv LANG
|
||||||
port 22
|
port 22
|
||||||
XAuthLocation /opt/X11/bin/xauth
|
XAuthLocation /opt/X11/bin/xauth
|
||||||
|
|
Loading…
Reference in a new issue