mirror of
https://github.com/Crocmagnon/dotfiles.git
synced 2024-05-20 01:42:51 +02:00
Compare commits
10 commits
37470f5811
...
aed1729be5
Author | SHA1 | Date | |
---|---|---|---|
Gabriel Augendre | aed1729be5 | ||
Gabriel Augendre | 4fb9aec200 | ||
Gabriel Augendre | 1f3dee3936 | ||
Gabriel Augendre | ae6f7b99b0 | ||
Gabriel Augendre | 91031641ae | ||
Gabriel Augendre | 52d545abeb | ||
Gabriel Augendre | 571009b4f0 | ||
Gabriel Augendre | b041cf009b | ||
Gabriel Augendre | e01079b745 | ||
Gabriel Augendre | 9bbe4a9fba |
|
@ -1,4 +1,8 @@
|
||||||
fish_add_path /opt/homebrew/opt/curl/bin /opt/homebrew/bin /opt/homebrew/sbin $HOME/.local/bin $HOME/.cargo/bin $HOME/go/bin
|
fish_add_path /opt/homebrew/opt/curl/bin /opt/homebrew/bin /opt/homebrew/sbin $HOME/.local/bin $HOME/.cargo/bin $HOME/go/bin
|
||||||
|
{{- if not (get . "sudo") }}
|
||||||
|
fish_add_path $HOME/.local/homebrew/bin
|
||||||
|
command -v brew > /dev/null; and eval "$(brew shellenv)"
|
||||||
|
{{- end }}
|
||||||
{{- 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)"
|
||||||
|
@ -8,32 +12,21 @@ set -gx RUSTC_WRAPPER sccache
|
||||||
|
|
||||||
set -gx VIRTUAL_ENV_DISABLE_PROMPT 1
|
set -gx VIRTUAL_ENV_DISABLE_PROMPT 1
|
||||||
|
|
||||||
set -gx HOMEBREW_GITHUB_API_TOKEN {{ (bitwardenFields "item" "github.com").fish_api_token.value | quote }}
|
|
||||||
set -gx HOMEBREW_BINTRAY_USER "crocmagnon"
|
|
||||||
set -gx HOMEBREW_BINTRAY_KEY {{ (bitwardenFields "item" "Bintray").fish_key.value | quote }}
|
|
||||||
|
|
||||||
set -gx LANG en_US.UTF-8
|
set -gx LANG en_US.UTF-8
|
||||||
|
|
||||||
set -gx BAT_THEME "Solarized (dark)"
|
set -gx BAT_THEME "Solarized (dark)"
|
||||||
|
|
||||||
set -gx SCW_SECRET_TOKEN {{ (bitwardenFields "item" "console.scaleway.com").fish_secret_token.value | quote }}
|
|
||||||
set -gx SCW_ACCESS_KEY {{ (bitwardenFields "item" "console.scaleway.com").fish_access_key.value | quote }}
|
|
||||||
|
|
||||||
set -gx GITLABBER_FOLDER_NAMING path
|
set -gx GITLABBER_FOLDER_NAMING path
|
||||||
set -gx GITLABBER_CLONE_METHOD ssh
|
set -gx GITLABBER_CLONE_METHOD ssh
|
||||||
set -gx GITLABBER_GIT_CONCURRENCY 10
|
set -gx GITLABBER_GIT_CONCURRENCY 10
|
||||||
|
|
||||||
set -gx PYPI_USERNAME __token__
|
|
||||||
set -gx PYPI_TOKEN {{ (bitwardenFields "item" "PyPi").token.value | quote }}
|
|
||||||
|
|
||||||
set -gx POETRY_PYPI_TOKEN_PYPI $PYPI_TOKEN
|
set -gx POETRY_PYPI_TOKEN_PYPI $PYPI_TOKEN
|
||||||
set -gx POETRY_HTTP_BASIC_PYPI_USERNAME $PYPI_USERNAME
|
set -gx POETRY_HTTP_BASIC_PYPI_USERNAME $PYPI_USERNAME
|
||||||
set -gx POETRY_HTTP_BASIC_PYPI_PASSWORD $PYPI_TOKEN
|
set -gx POETRY_HTTP_BASIC_PYPI_PASSWORD $PYPI_TOKEN
|
||||||
|
|
||||||
set -gx ANSIBLE_NOCOWS 1
|
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 ?"
|
set -g fish_greeting "Yo ✌🏻Bien ?"
|
||||||
{{- else }}
|
{{- else }}
|
||||||
|
@ -53,6 +46,7 @@ set -gx EDITOR nvim
|
||||||
set -gx DJANGOPROJECT_DATA_DIR $HOME/.djangoproject
|
set -gx DJANGOPROJECT_DATA_DIR $HOME/.djangoproject
|
||||||
|
|
||||||
mise activate fish | source
|
mise activate fish | source
|
||||||
test -e {$HOME}/.config/fish/ovh.fish; and source {$HOME}/.config/fish/ovh.fish
|
test -e {$HOME}/.config/fish/work.fish; and source {$HOME}/.config/fish/work.fish
|
||||||
|
test -e {$HOME}/.config/fish/secrets.fish; and source {$HOME}/.config/fish/secrets.fish
|
||||||
|
|
||||||
set tide_character_icon '$'
|
set tide_character_icon '$'
|
||||||
|
|
3
dot_config/fish/private_functions/bwunlock.fish
Normal file
3
dot_config/fish/private_functions/bwunlock.fish
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
function bwunlock
|
||||||
|
set -g BW_SESSION (bw login --raw)
|
||||||
|
end
|
12
dot_config/fish/private_secrets.fish.tmpl
Normal file
12
dot_config/fish/private_secrets.fish.tmpl
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
set -gx SCW_SECRET_TOKEN {{ (bitwardenFields "item" "console.scaleway.com").fish_secret_token.value | quote }}
|
||||||
|
set -gx SCW_ACCESS_KEY {{ (bitwardenFields "item" "console.scaleway.com").fish_access_key.value | quote }}
|
||||||
|
|
||||||
|
set -gx HOMEBREW_GITHUB_API_TOKEN {{ (bitwardenFields "item" "github.com").fish_api_token.value | quote }}
|
||||||
|
set -gx HOMEBREW_BINTRAY_USER "crocmagnon"
|
||||||
|
set -gx HOMEBREW_BINTRAY_KEY {{ (bitwardenFields "item" "Bintray").fish_key.value | quote }}
|
||||||
|
|
||||||
|
set -gx PYPI_USERNAME __token__
|
||||||
|
set -gx PYPI_TOKEN {{ (bitwardenFields "item" "PyPi").token.value | quote }}
|
||||||
|
|
||||||
|
set -gx GITEA_TOKEN {{ (bitwardenFields "item" "git.augendre.info").fish_config_token.value | quote }}
|
||||||
|
|
|
@ -55,13 +55,6 @@
|
||||||
editor = nvim
|
editor = nvim
|
||||||
attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
|
attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
[sendemail]
|
|
||||||
smtpserver = smtp.migadu.com
|
|
||||||
smtpuser = {{ (bitwarden "item" "Migadu email").login.username }}
|
|
||||||
smtpencryption = ssl
|
|
||||||
smtpserverport = 465
|
|
||||||
smtppass = {{ (bitwarden "item" "Migadu email").login.password | quote }}
|
|
||||||
confirm = auto
|
|
||||||
[submodule]
|
[submodule]
|
||||||
recurse = true
|
recurse = true
|
||||||
[fetch]
|
[fetch]
|
||||||
|
@ -120,4 +113,6 @@
|
||||||
helper = osxkeychain
|
helper = osxkeychain
|
||||||
|
|
||||||
[include]
|
[include]
|
||||||
path = ovh.config
|
path = work.config
|
||||||
|
path = sendemail
|
||||||
|
|
||||||
|
|
8
dot_config/git/private_sendemail.tmpl
Normal file
8
dot_config/git/private_sendemail.tmpl
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
[sendemail]
|
||||||
|
smtpserver = smtp.migadu.com
|
||||||
|
smtpuser = {{ (bitwarden "item" "Migadu email").login.username }}
|
||||||
|
smtpencryption = ssl
|
||||||
|
smtpserverport = 465
|
||||||
|
smtppass = {{ (bitwarden "item" "Migadu email").login.password | quote }}
|
||||||
|
confirm = auto
|
||||||
|
|
|
@ -5,7 +5,7 @@ M.plugins = "custom.plugins"
|
||||||
M.mappings = require "custom.mappings"
|
M.mappings = require "custom.mappings"
|
||||||
|
|
||||||
M.ui = {
|
M.ui = {
|
||||||
theme = "tomorrow_night",
|
theme = "one_light",
|
||||||
statusline = {
|
statusline = {
|
||||||
theme = "default",
|
theme = "default",
|
||||||
separator_style = "arrow",
|
separator_style = "arrow",
|
||||||
|
|
|
@ -64,7 +64,7 @@ M.dap_ui = {
|
||||||
function()
|
function()
|
||||||
require("dapui").eval()
|
require("dapui").eval()
|
||||||
end,
|
end,
|
||||||
"Debug - eval expression"
|
"Debug - eval expression (Alt+K)"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -81,4 +81,27 @@ M.general = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
M.nvterm = {
|
||||||
|
n = {
|
||||||
|
["<leader>ti"] = {
|
||||||
|
function()
|
||||||
|
require("nvterm.terminal").toggle "float"
|
||||||
|
end,
|
||||||
|
"Toggle floating term"
|
||||||
|
},
|
||||||
|
["<leader>tv"] = {
|
||||||
|
function()
|
||||||
|
require("nvterm.terminal").toggle "vertical"
|
||||||
|
end,
|
||||||
|
"Toggle vertical term"
|
||||||
|
},
|
||||||
|
["<leader>th"] = {
|
||||||
|
function()
|
||||||
|
require("nvterm.terminal").toggle "horizontal"
|
||||||
|
end,
|
||||||
|
"Toggle horizontal term"
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
@ -1,7 +1,14 @@
|
||||||
set which-key
|
|
||||||
set hlsearch "highlight search: highlight matches - hls/nohls
|
set hlsearch "highlight search: highlight matches - hls/nohls
|
||||||
set incsearch "incremental search: search while typing - is/nois
|
set incsearch "incremental search: search while typing - is/nois
|
||||||
set ignorecase "ignore case during search - ic/noic
|
set ignorecase "ignore case during search - ic/noic
|
||||||
|
|
||||||
Plug 'machakann/vim-highlightedyank'
|
Plug 'machakann/vim-highlightedyank'
|
||||||
|
|
||||||
|
set number
|
||||||
|
set relativenumber
|
||||||
|
set ideajoin "custom join with code smartness
|
||||||
|
set idearefactormode=keep
|
||||||
|
|
||||||
|
set which-key "enable which-key plugin
|
||||||
|
let g:WhichKey_ShowVimActions = "true" "show vim actions (not shown by default)
|
||||||
|
set notimeout "make vim not timeout waiting for the end of a command. useful because which-key will only display its popup for the timeout duration (default 1000 for 1s)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
export PATH=$PATH:~/bin
|
export PATH=$PATH:~/bin
|
||||||
export LC_ALL=fr_FR.UTF-8
|
export LC_ALL=fr_FR.UTF-8
|
||||||
|
|
||||||
eval "$(~/bin/mise activate bash)"
|
[ command -v mise &> /dev/null ] && eval "$(mise activate bash)"
|
||||||
|
|
||||||
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
|
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
|
||||||
export PATH="$PATH:$HOME/.rvm/bin:$HOME/Projects/golang/bin"
|
export PATH="$PATH:$HOME/.rvm/bin:$HOME/Projects/golang/bin"
|
||||||
|
@ -9,5 +9,5 @@ export PATH="$PATH:$HOME/.rvm/bin:$HOME/Projects/golang/bin"
|
||||||
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
|
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
|
||||||
[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
|
[[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
|
||||||
|
|
||||||
[ -f ~/.ovh.bash ] && source ~/.ovh.bash
|
[ -f ~/.work.bash ] && source ~/.work.bash
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
Include ovh.config
|
Include work.config
|
||||||
|
|
||||||
# Home
|
# Home
|
||||||
Host ubuntu
|
Host ubuntu
|
||||||
|
@ -39,7 +39,9 @@ Host hyperhdr
|
||||||
|
|
||||||
Host *
|
Host *
|
||||||
AddKeysToAgent yes
|
AddKeysToAgent yes
|
||||||
|
{{- if eq .chezmoi.os "darwin" }}
|
||||||
UseKeychain yes
|
UseKeychain yes
|
||||||
|
{{- 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