Merge branch 'fuz' of forge.o9.re:olivier/dotfiles into fuz

* ajout d'Hamsket au bon bureau
* Arrêt de l'utilisation de hamster-indicator
* corrections mineures dans .tmux pour incompatibilité

.config/i3/config

@@ -165,7 +165,7 @@ bindsym $mod+r mode "resize"
 assign [class="jetbrains-idea|Code"] 1
 assign [class="Google-chrome|Vivaldi-stable|Opera|Firefox|Navigator|Nightly|Chromium"] 2
 assign [class="Thunderbird|Mail|jetbrains-phpstorm"] 3
-assign [class="Mattermost|mattermost-desktop|Rambox|Slack|Scudcloud|Gitter|Dino"] 4
+assign [class="Mattermost|mattermost-desktop|Rambox|Slack|Scudcloud|Gitter|Dino|Hamsket"] 4
 
 ##### STATUS BAR
 
@@ -240,7 +240,7 @@ smart_gaps on
 exec_always --no-startup-id "kill -9 `ps aux | grep random_wallpaper |grep -v 'grep'| awk '{print $2}'`; random_wallpaper &"
 
 # Hasmter indicator
-exec --no-startup-id hamster
+#exec --no-startup-id hamster
 
 # Clipit : Presse-papiers pour le bureau
 exec --no-startup-id clipit

.config/kitty/kitty.conf

@@ -184,7 +184,8 @@ rectangle_select_modifiers ctrl+alt
 allow_remote_control no
 
 # The value of the TERM environment variable to set
-term xterm-kitty
+#term xterm-kitty
+term xterm-256color
 
 # The width (in pts) of window borders. Will be rounded to the nearest number of pixels based on screen resolution.
 # Note that borders are displayed only when more than one window is visible. They are meant to separate multiple windows.

.profile

@@ -22,6 +22,11 @@ if [ "$0" = "/usr/sbin/lightdm-session" -a "$DESKTOP_SESSION" = "i3" ]; then
   export $(gnome-keyring-daemon -s)
 fi
 
+# Environnement Pyenv
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init --path)"
+
 # Démarrage de l'environnement préféré
 if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
   case $HOST in

.ssh/config

@@ -26,7 +26,7 @@ Port 22
 Host ovh
 Hostname 37.187.17.29
 User od
-Port 22
+Port 4555
 
 # ??
 Host pi
@@ -117,3 +117,48 @@ Host backup
 Hostname 37.187.17.29
 User root
 Port 22
+
+## Serveur salon (Beelink)
+Host suc
+Hostname 192.168.1.42
+User od
+Port 22
+
+## Labo K8s
+Host deux
+Hostname 192.168.1.102
+User od
+Port 22
+
+Host trois
+Hostname 192.168.1.103
+User od
+Port 22
+
+Host quatre
+Hostname 192.168.1.104
+User od
+Port 22
+
+## Labo K8S AMD64
+Host douze
+Hostname 192.168.1.112
+User nous
+Port 22
+
+Host treize
+Hostname 192.168.1.113
+User maison
+Port 22
+
+Host quatorze
+Hostname 192.168.1.202
+User od
+Port 22
+
+## Formation DevOps - Datascientest
+Host devu
+Hostname 54.229.27.155
+User ubuntu
+Port 22
+IdentityFile ~/.ssh/data_enginering_machine.pem

.tmux.conf

@@ -84,7 +84,7 @@ set -g status-left "#{pane_current_path}"
 set -g status-left-length  30
 
 # Activer mon layout par defaut
-new -s projets -n dev
+#new -s projets -n dev
-splitw -v -p 50 -t dev
+#splitw -v -p '50' -t dev
-neww -n autre
+#neww -n autre
-selectw -t dev
+#selectw -t dev

.warprc

@@ -1,6 +1,11 @@
 ans:/home/od/projets/buffet
+blog:~/projets/blog
 buf:/home/od/projets/buffet
+cal:~/projets/effeuillage
 cloud:~/freshmile/cloud
+fastapi:~/devu/exam_DOSSMANN/fastapi_exam_DOSSMANN
+graille:~/projets/graille
+ops:~/projets/ops
 patchwork:/home/od/projets/patchwork
 p:~/freshmile/pulp
 ps:~/freshmile/pulp/Seed

.zprofile

@@ -1,5 +1,9 @@
 emulate sh -c '. ~/.profile'
 
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init --path)"
+
 # Start X automatically
 if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
   exec startx

.zshenv

@@ -1,5 +1,5 @@
 typeset -U PATH path
-path=("$HOME/.local/bin" "$HOME/bin" "/opt/sublime_merge" "$path[@]")
+path=("$HOME/.local/bin" "$HOME/bin" "/opt/sublime_merge" "$path[@]", "$(go env GOPATH)/bin")
 export PATH
 
 # Autocomplètement supplémentaire (Docker)

.zshrc

@@ -68,7 +68,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git httpie ng npm nvm pass pip sudo wd)
+plugins=(git httpie ng npm nvm pass pip sudo wd pyenv)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -87,6 +87,7 @@ export PYTHONWARNINGS="ignore::DeprecationWarning"
 #export FLASK_SKIP_DOTENV=1 ## make problems with poetry and flask applications
 export PIPENV_QUIET=1  # enlève les courtesy notice
 export ENABLE_WARNINGS=false # enlève les warnings dans le setup RERO-ils
+export KUBECONFIG=$HOME/kubeconfig
 
 # You may need to manually set your language environment
 export LANG=fr_FR.UTF-8
@@ -136,6 +137,10 @@ alias pyt='poetry run pytest -vvs --no-cov --disable-warnings'
 alias pytc='poetry run pytest -vvs --disable-warnings --cov-report=xml:cov.xml'
 # projet rero
 alias rero="ALIAS=rero /home/od/projets/rerologik/agnes"
+# coloration de la commande IP
+alias ip='ip -c'
+alias k='kubectl'
+alias devu="${HOME}/devu42/devu/devu"
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh
@@ -175,6 +180,6 @@ case $HOST in
     source /usr/share/nvm/init-nvm.sh
     # Virtualenv (for Python development)
     export WORKON_HOME=~/.virtualenvs
-    source /usr/bin/virtualenvwrapper.sh
+    #source /usr/bin/virtualenvwrapper.sh
     ;;
 esac

bin/random_wallpaper

@@ -7,15 +7,16 @@
 directory="$HOME/wallpapers"
 minutes=15
 PROGRAM=`which feh`
+is_wayland=false
 
 # Some tests
-if [[ "$XDG_SESSION_TYPE" -eq "wayland" ]]; then
+if [[ "${XDG_SESSION_TYPE}" == "wayland" ]]; then
   PROGRAM=`which swaymsg`
   if [ -z "${PROGRAM}" ]; then
     echo "This script needs the swaymsg program."
     exit 1
   fi
-  wayland=1
+  is_wayland=true
 elif [ -z "${PROGRAM}" ]; then
   echo "This script needs the feh program. Install it."
   exit 1
@@ -48,7 +49,7 @@ while true; do
 
   # Change background
   file="${array_files["$NUMBER"]}"
-  if [[ -n wayland ]]; then
+  if "${is_wayland}"; then
     $PROGRAM output "*" bg "$directory/$file" fill
   else
     feh --bg-fill "$directory/$file"