brew shellenv only if installed

dot_config/fish/private_config.fish.tmpl

@@ -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
+{{- 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" }}
 fish_add_path /home/linuxbrew/.linuxbrew/bin $HOME/.local/share/JetBrains/Toolbox/scripts
 eval "$(brew shellenv)"
@@ -8,32 +12,21 @@ set -gx RUSTC_WRAPPER sccache
 
 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 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_CLONE_METHOD ssh
 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_HTTP_BASIC_PYPI_USERNAME $PYPI_USERNAME
 set -gx POETRY_HTTP_BASIC_PYPI_PASSWORD $PYPI_TOKEN
 
 set -gx ANSIBLE_NOCOWS 1
 
-set -gx GITEA_TOKEN {{ (bitwardenFields "item" "git.augendre.info").fish_config_token.value | quote }}
-
 {{- if eq .chezmoi.os "darwin" }}
 set -g fish_greeting "Yo ✌🏻Bien ?"
 {{- else }}
@@ -53,6 +46,7 @@ set -gx EDITOR nvim
 set -gx DJANGOPROJECT_DATA_DIR $HOME/.djangoproject
 
 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 '$'

dot_config/fish/private_functions/bwunlock.fish

@@ -0,0 +1,3 @@
+function bwunlock
+set -g BW_SESSION (bw login --raw)
+end

dot_config/fish/private_secrets.fish.tmpl

@@ -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 }}
+

dot_config/git/private_config.tmpl

@@ -55,13 +55,6 @@
     editor = nvim
     attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
     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]
   recurse = true
 [fetch]
@@ -120,4 +113,6 @@
   helper = osxkeychain
 
 [include]
-    path = ovh.config
+  path = work.config
+  path = sendemail
+

dot_config/git/private_sendemail.tmpl

@@ -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
+

dot_config/nvim/lua/custom/chadrc.lua

@@ -5,7 +5,7 @@ M.plugins = "custom.plugins"
 M.mappings = require "custom.mappings"
 
 M.ui = {
-  theme = "tomorrow_night",
+  theme = "one_light",
   statusline = {
     theme = "default",
     separator_style = "arrow",

dot_config/nvim/lua/custom/mappings.lua

@@ -64,7 +64,7 @@ M.dap_ui = {
       function()
         require("dapui").eval()
       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

dot_ideavimrc

@@ -1,7 +1,14 @@
-set which-key
 set hlsearch "highlight search: highlight matches - hls/nohls
 set incsearch "incremental search: search while typing - is/nois
 set ignorecase "ignore case during search - ic/noic
 
 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)

private_dot_bashrc

@@ -1,7 +1,7 @@
 export PATH=$PATH:~/bin
 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.
 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
 [[ -s "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
 
-[ -f ~/.ovh.bash ] && source ~/.ovh.bash
+[ -f ~/.work.bash ] && source ~/.work.bash
 

private_dot_ssh/config.tmpl

@@ -1,4 +1,4 @@
-Include ovh.config
+Include work.config
 
 # Home
 Host ubuntu
@@ -39,7 +39,9 @@ Host hyperhdr
 
 Host *
     AddKeysToAgent yes
+    {{- if eq .chezmoi.os "darwin" }}
     UseKeychain yes
+    {{- end }}
     SendEnv LANG
     port 22
     XAuthLocation /opt/X11/bin/xauth