BUG: Chromium ne se lance plus sous Xorg

.Xresources

@@ -65,25 +65,3 @@ rofi.color-window: #002b37, #002b37, #003642
 rofi.color-normal: #002b37, #819396, #002b37, #003642, #819396
 rofi.color-active: #002b37, #008ed4, #002b37, #003642, #008ed4
 rofi.color-urgent: #002b37, #da4281, #002b37, #003642, #da4281
-rofi.font: DejaVu 18
-
-! -------------------------------------
-! DPI pour écran très haute résolution
-! -------------------------------------
-
-Xft.dpi: 200
-
-! These might also be useful depending on your monitor and personal preference:
-Xft.autohint: 0
-Xft.lcdfilter:  lcddefault
-Xft.hintstyle:  hintfull
-Xft.hinting: 1
-Xft.antialias: 1
-Xft.rgba: rgb
-
-
-! --------------------------------------------------------
-! Pour la police de xterm (pour Stardew Valley notamment)
-! --------------------------------------------------------
-
-XTerm.vt100.faceName: DejaVu Sans Mono:size=13:antialias=false

.config/chromium-flags.conf

@@ -1,7 +1,3 @@
 # Permet à Chromium de se lancer dans Wayland
 #--enable-features=UseOzonePlatform
 #--ozone-platform=wayland
-# Permet de gérer l'écran HiDPI
---force-device-scale-factor=2
-# Désactive l'accélération graphique mal gérée sous Chromium
-#--disable-gpu

.config/environment.d/envvars.conf

@@ -1,9 +1,2 @@
 # Active wayland pour Firefox
 MOZ_ENABLE_WAYLAND=1
-# Modifie le comportement JAVA pour PHPStorm
-_JAVA_AWT_WM_NONREPARENTING=1
-# Pour la résolution HiDPI
-GDK_SCALE=2
-GDK_DPI_SCALE=0.5
-QT_AUTO_SCREEN_SCALE_FACTOR=1
-QT_ENABLE_HIGHDPI_SCALING=1

.config/i3/config

@@ -22,7 +22,7 @@ set $mod Mod4
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
-font pango:DejaVu Sans Mono 18
+font pango:DejaVu Sans Mono 10
 
 # Before i3 v4.8, we used to recommend this one as the default:
 # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
@@ -42,7 +42,7 @@ bindsym $mod+Shift+A kill
 
 # start dmenu (a program launcher)
 #bindsym $mod+d exec dmenu_run
-bindsym $mod+d exec rofi -show combi -font "DejaVu Sans Mono 20"
+bindsym $mod+d exec rofi -show combi
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
@@ -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|Hamsket"] 4
+assign [class="Mattermost|mattermost-desktop|Rambox|Slack|Scudcloud|Gitter|Dino"] 4
 
 ##### STATUS BAR
 
@@ -187,8 +187,8 @@ bindsym XF86AudioLowerVolume exec pactl set-sink-volume $sink -5% #decrease soun
 bindsym XF86AudioMute exec pactl set-sink-mute $sink toggle # mute sound
 
 # Brightness controls
-bindsym XF86MonBrightnessUp exec brightnessctl s +20 # increase screen brightness
+bindsym XF86MonBrightnessUp exec xbacklight -inc 5 # increase screen brightness
-bindsym XF86MonBrightnessDown exec brightnessctl s 20- # decrease screen brightness
+bindsym XF86MonBrightnessDown exec xbacklight -dec 5 # decrease screen brightness
 
 # Player controls (via MPRIS, in example mpv-mpris)
 # play/pause
@@ -213,12 +213,6 @@ bindsym XF86Sleep exec systemctl suspend
 ## STARTUP PROGRAMS
 ###
 
-# Résolution par défaut
-#exec_always --no-startup-id "xrandr --output eDP1 --mode 1680x1050"
-
-# Rotation de l'écran
-exec_always --no-startup-id "libinput-xrandr-autorotate -touchscreens 'Screen0'"
-
 # Transparency (need picom)
 exec_always --no-startup-id "killall picom; picom -b"
 
@@ -243,10 +237,10 @@ smart_gaps on
 
 # Random wallpaper (need ~/bin/random_wallpaper from
 # https://github.com/blankoworld/dotfiles/blob/master/bin/random_wallpaper)
-exec_always --no-startup-id "kill -9 `ps aux | grep random_wallpaper |grep -v 'grep'| awk '{print $2}'`; watch -n 900 feh --randomize --bg-fill ~/wallpapers/* &"
+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/dark.conf

@@ -1,21 +0,0 @@
-background            #001e26
-foreground            #708183
-cursor                #708183
-selection_background  #002731
-color0                #002731
-color8                #465a61
-color1                #d01b24
-color9                #bd3612
-color2                #728905
-color10               #465a61
-color3                #a57705
-color11               #52676f
-color4                #2075c7
-color12               #708183
-color5                #c61b6e
-color13               #5856b9
-color6                #259185
-color14               #81908f
-color7                #e9e2cb
-color15               #fcf4dc
-selection_foreground #001e26

.config/kitty/kitty.conf

@@ -18,7 +18,7 @@ bold_font        Fira Code Bold
 bold_italic_font Fira Code Retina
 
 # Font size (in pts)
-font_size        13.0
+font_size        14.0
 
 # The amount the font size is changed by (in pts) when increasing/decreasing
 # the font size in a running terminal.
@@ -184,8 +184,7 @@ 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.
@@ -426,5 +425,5 @@ macos_option_as_alt yes
 x11_bell_volume 80
 
 # Ajout du thème Solarized Light sur https://github.com/dexpota/kitty-themes
-include ./dark.conf
+include ./theme.conf
 

.config/kitty/theme.conf

@@ -0,0 +1 @@
+./Solarized_Dark_-_Patched.conf

.config/polybar/config

@@ -21,7 +21,7 @@ alert = #bd2c40
 [bar/default]
 ;monitor = ${env:MONITOR:HDMI-1}
 width = 100%
-height = 45
+height = 27
 ;offset-x = 1%
 ;offset-y = 1%
 radius = 0
@@ -30,28 +30,29 @@ fixed-center = false
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-line-size = 5
+line-size = 3
 line-color = #f00
 
 border-size = 0
 border-color = #00000000
 
 padding-left = 0
-padding-right = 1
+padding-right = 2
 
 module-margin-left = 0
 module-margin-right = 1
 
-font-0 = DejaVu Sans Mono:size=21;1
+font-0 = DejaVu Sans Mono:size=10.5;1
 ;font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
-font-1 = FontAwesome:size=21 
+font-1 = FontAwesome:size=10 
-font-2 = siji:pixelsize=21;1
+font-2 = siji:pixelsize=10;1
 
 modules-left = i3
 modules-center = xwindow
-modules-right = backlight-acpi pulseaudio memory cpu wlan eth battery temperature date powermenu tray
+modules-right = xbacklight pulseaudio memory cpu wlan eth battery temperature date powermenu
 
 tray-position = right
+tray-padding = 2
 ;tray-transparent = true
 ;tray-background = #0063ff
 
@@ -216,7 +217,7 @@ label = %percentage_used%%
 
 [module/wlan]
 type = internal/network
-interface = wlan0
+interface = wlp3s0
 interval = 3.0
 
 ;format-connected = <ramp-signal> <label-connected>
@@ -403,11 +404,4 @@ screenchange-reload = true
 margin-top = 5
 margin-bottom = 5
 
-[module/tray]
-type = internal/tray
-
-tray-size = 66%
-tray-padding = 0
-tray-spacing = 10
-
 ; vim:ft=dosini

.config/zsh/.before.zshrc.zsh

@@ -1,26 +0,0 @@
-#!/usr/bin/env zsh
-
-# Automatic connection
-mkdir -p "${HOME}/etc/ssh";
-function ssh-procure-launch-agent {
-  eval `ssh-agent -s -a ~/etc/ssh/ssh-agent-socket`;
-  ssh-add;
-}
-
-if [ ! $SSH_AGENT_PID ]; then
-  if [ -e ~/etc/ssh/ssh-agent-socket ] ; then
-    SSH_AGENT_PID=`ps -fC ssh-agent |grep 'etc/ssh/ssh-agent-socket' |sed -r 's/^\S+\s+(\S+).*$/\1/'`; 
-    if [[ $SSH_AGENT_PID =~ [0-9]+ ]]; then
-      # in this case the agent has already been launched and we are just attaching to it. 
-      ##++  It should check that this pid is actually active & belongs to an ssh instance
-      export SSH_AGENT_PID;
-      SSH_AUTH_SOCK=~/etc/ssh/ssh-agent-socket; export SSH_AUTH_SOCK;
-    else
-      # in this case there is no agent running, so the socket file is left over from a graceless agent termination.
-      rm ~/etc/ssh/ssh-agent-socket;
-      ssh-procure-launch-agent;
-    fi;
-  else
-    ssh-procure-launch-agent;
-  fi;
-fi;

.config/zsh/.zsh_plugins.txt

@@ -1,33 +0,0 @@
-#!/bin/zsh
-#
-# .zsh_plugins.txt - antidote plugins file
-#
-
-# Completions
-mattmc3/ez-compinit
-zsh-users/zsh-completions kind:fpath path:src
-aloxaf/fzf-tab  # Remove if you don't use fzf
-
-# Completion styles
-belak/zsh-utils path:completion/functions kind:autoload post:compstyle_zshzoo_setup
-
-# Keybindings
-belak/zsh-utils path:editor
-
-# History
-belak/zsh-utils path:history
-
-# Prompt
-romkatv/powerlevel10k
-
-# Utilities
-belak/zsh-utils path:utility
-romkatv/zsh-bench kind:path
-ohmyzsh/ohmyzsh path:plugins/extract
-# a kind of "cd" with shortcuts
-mfaerevaag/wd
-
-# Other Fish-like features
-zdharma-continuum/fast-syntax-highlighting  # Syntax highlighting
-zsh-users/zsh-autosuggestions               # Auto-suggestions
-zsh-users/zsh-history-substring-search      # Up/Down to search history

.config/zsh/.zshrc

@@ -1,40 +0,0 @@
-#!/usr/bin/env zsh
-
-# Scripts that should be loaded before instant prompt
-# because they ask something in prompt
-source ${ZDOTDIR:-$HOME}/.before.zshrc.zsh
-
-# Enable Powerlevel10k instant prompt. Should stay close to the top of .zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
-# Load fzf
-source /usr/share/fzf/completion.zsh
-source /usr/share/fzf/key-bindings.zsh
-
-# Clone antidote if necessary.
-if [[ ! -d ${ZDOTDIR:-$HOME}/.antidote ]]; then
-  git clone https://github.com/mattmc3/antidote ${ZDOTDIR:-$HOME}/.antidote
-fi
-
-# Create an amazing Zsh config using antidote plugins.
-source ${ZDOTDIR:-$HOME}/.antidote/antidote.zsh
-antidote load
-
-# Enlève le prompt de droite après avoir appuyé sur Entrée
-setopt transient_rprompt
-
-# Source anything in .zshrc.d.
-for _rc in ${ZDOTDIR:-$HOME}/.zshrc.d/*.zsh; do
-  # Ignore tilde files.
-  if [[ $_rc:t != '~'* ]]; then
-    source "$_rc"
-  fi
-done
-unset _rc
-
-# To customize prompt, run `p10k configure` or edit .p10k.zsh.
-[[ ! -f ${ZDOTDIR:-$HOME}/.p10k.zsh ]] || source ${ZDOTDIR:-$HOME}/.p10k.zsh

.config/zsh/.zshrc.d/aliases.zsh

@@ -1,237 +0,0 @@
-#!/usr/bin/env zsh
-
-# editor
-alias e="${EDITOR}"
-alias r="${EDITOR} -R"
-alias sm="sublime_merge"
-alias vi="${EDITOR}"
-
-# system
-alias mem='free -mt'
-alias df='df -hT'
-
-# navigation
-alias ls='eza'
-alias ll='eza -lah --group --smart-group --icons'
-alias l='eza -F'
-
-# web
-alias https='http --verify=no --default-scheme=https'
-
-# search
-alias rgrep='rg --no-ignore'
-
-# add colors to some commands
-alias diff='colordiff'
-export GREP_COLORS='ms=01;33:mc=01;33:s1=:cx=:fn=37;ln=32:bn=32:se=36'
-alias grep='grep --color'
-alias ip='ip -c'
-
-# dotfiles
-alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
-
-# be careful!
-alias rm='rm -i'
-alias cp='cp -i'
-alias mv='mv -i'
-
-# pytest
-alias pyt='poetry run pytest -vvs --no-cov --disable-warnings'
-alias pytc='poetry run pytest -vvs --disable-warnings --cov-report=xml:cov.xml'
-
-# k8s
-alias k='kubectl'
-
-# miscellaneous
-alias devu="${HOME}/devu/devu/devu"
-
-# git
-alias ga='git add'
-alias gaa='git add --all'
-alias gam='git am'
-alias gama='git am --abort'
-alias gamc='git am --continue'
-alias gams='git am --skip'
-alias gamscp='git am --show-current-patch'
-alias gap='git apply'
-alias gapa='git add --patch'
-alias gapt='git apply --3way'
-alias gau='git add --update'
-alias gav='git add --verbose'
-alias gb='git branch'
-alias gbD='git branch --delete --force'
-alias gba='git branch --all'
-alias gbd='git branch --delete'
-alias gbl='git blame -w'
-alias gbm='git branch --move'
-alias gbnm='git branch --no-merged'
-alias gbr='git branch --remote'
-alias gbs='git bisect'
-alias gbsb='git bisect bad'
-alias gbsg='git bisect good'
-alias gbsn='git bisect new'
-alias gbso='git bisect old'
-alias gbsr='git bisect reset'
-alias gbss='git bisect start'
-alias gc='git commit --verbose'
-alias 'gc!'='git commit --verbose --amend'
-alias gcB='git checkout -B'
-alias gca='git commit --verbose --all'
-alias 'gca!'='git commit --verbose --all --amend'
-alias gcam='git commit --all --message'
-alias 'gcan!'='git commit --verbose --all --no-edit --amend'
-alias 'gcann!'='git commit --verbose --all --date=now --no-edit --amend'
-alias 'gcans!'='git commit --verbose --all --signoff --no-edit --amend'
-alias gcas='git commit --all --signoff'
-alias gcasm='git commit --all --signoff --message'
-alias gcb='git checkout -b'
-alias gcd='git checkout $(git_develop_branch)'
-alias gcf='git config --list'
-alias gcl='git clone --recurse-submodules'
-alias gclean='git clean --interactive -d'
-alias gclf='git clone --recursive --shallow-submodules --filter=blob:none --also-filter-submodules'
-alias gcm='git checkout $(git_main_branch)'
-alias gcmsg='git commit --message'
-alias gcn='git commit --verbose --no-edit'
-alias 'gcn!'='git commit --verbose --no-edit --amend'
-alias gco='git checkout'
-alias gcor='git checkout --recurse-submodules'
-alias gcount='git shortlog --summary --numbered'
-alias gcp='git cherry-pick'
-alias gcpa='git cherry-pick --abort'
-alias gcpc='git cherry-pick --continue'
-alias gcs='git commit --gpg-sign'
-alias gcsm='git commit --signoff --message'
-alias gcss='git commit --gpg-sign --signoff'
-alias gcssm='git commit --gpg-sign --signoff --message'
-alias gd='git diff'
-alias gdca='git diff --cached'
-alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
-alias gdcw='git diff --cached --word-diff'
-alias gds='git diff --staged'
-alias gdt='git diff-tree --no-commit-id --name-only -r'
-alias gdup='git diff @{upstream}'
-alias gdw='git diff --word-diff'
-alias gf='git fetch'
-alias gfa='git fetch --all --tags --prune --jobs=10'
-alias gfg='git ls-files | grep'
-alias gfo='git fetch origin'
-alias gg='git gui citool'
-alias gga='git gui citool --amend'
-alias ggpull='git pull origin "$(git_current_branch)"'
-alias ggpush='git push origin "$(git_current_branch)"'
-alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
-alias ghh='git help'
-alias gignore='git update-index --assume-unchanged'
-alias gignored='git ls-files -v | grep "^[[:lower:]]"'
-alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
-alias gl='git pull'
-alias glg='git log --stat'
-alias glgg='git log --graph'
-alias glgga='git log --graph --decorate --all'
-alias glgm='git log --graph --max-count=10'
-alias glgp='git log --stat --patch'
-alias glo='git log --oneline --decorate'
-alias glod='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset"'
-alias glods='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset" --date=short'
-alias glog='git log --oneline --decorate --graph'
-alias gloga='git log --oneline --decorate --graph --all'
-alias glol='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset"'
-alias glola='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --all'
-alias glols='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --stat'
-alias gluc='git pull upstream $(git_current_branch)'
-alias glum='git pull upstream $(git_main_branch)'
-alias gm='git merge'
-alias gma='git merge --abort'
-alias gmc='git merge --continue'
-alias gmff='git merge --ff-only'
-alias gmom='git merge origin/$(git_main_branch)'
-alias gms='git merge --squash'
-alias gmtl='git mergetool --no-prompt'
-alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
-alias gmum='git merge upstream/$(git_main_branch)'
-alias gp='git push'
-alias gpd='git push --dry-run'
-alias gpf='git push --force-with-lease --force-if-includes'
-alias 'gpf!'='git push --force'
-alias gpoat='git push origin --all && git push origin --tags'
-alias gpod='git push origin --delete'
-alias gpr='git pull --rebase'
-alias gpra='git pull --rebase --autostash'
-alias gprav='git pull --rebase --autostash -v'
-alias gpristine='git reset --hard && git clean --force -dfx'
-alias gprom='git pull --rebase origin $(git_main_branch)'
-alias gpromi='git pull --rebase=interactive origin $(git_main_branch)'
-alias gprum='git pull --rebase upstream $(git_main_branch)'
-alias gprumi='git pull --rebase=interactive upstream $(git_main_branch)'
-alias gprv='git pull --rebase -v'
-alias gpsup='git push --set-upstream origin $(git_current_branch)'
-alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes'
-alias gpu='git push upstream'
-alias gpv='git push --verbose'
-alias gr='git remote'
-alias gra='git remote add'
-alias grb='git rebase'
-alias grba='git rebase --abort'
-alias grbc='git rebase --continue'
-alias grbd='git rebase $(git_develop_branch)'
-alias grbi='git rebase --interactive'
-alias grbm='git rebase $(git_main_branch)'
-alias grbo='git rebase --onto'
-alias grbom='git rebase origin/$(git_main_branch)'
-alias grbs='git rebase --skip'
-alias grbum='git rebase upstream/$(git_main_branch)'
-alias grev='git revert'
-alias greva='git revert --abort'
-alias grevc='git revert --continue'
-alias grf='git reflog'
-alias grh='git reset'
-alias grhh='git reset --hard'
-alias grhk='git reset --keep'
-alias grhs='git reset --soft'
-alias grm='git rm'
-alias grmc='git rm --cached'
-alias grmv='git remote rename'
-alias groh='git reset origin/$(git_current_branch) --hard'
-alias grrm='git remote remove'
-alias grs='git restore'
-alias grset='git remote set-url'
-alias grss='git restore --source'
-alias grst='git restore --staged'
-alias gru='git reset --'
-alias grup='git remote update'
-alias grv='git remote --verbose'
-alias gsb='git status --short --branch'
-alias gsd='git svn dcommit'
-alias gsh='git show'
-alias gsi='git submodule init'
-alias gsps='git show --pretty=short --show-signature'
-alias gsr='git svn rebase'
-alias gss='git status --short'
-alias gst='git status'
-alias gsta='git stash push'
-alias gstaa='git stash apply'
-alias gstall='git stash --all'
-alias gstc='git stash clear'
-alias gstd='git stash drop'
-alias gstl='git stash list'
-alias gstp='git stash pop'
-alias gsts='git stash show --patch'
-alias gsu='git submodule update'
-alias gsw='git switch'
-alias gswc='git switch --create'
-alias gswd='git switch $(git_develop_branch)'
-alias gswm='git switch $(git_main_branch)'
-alias gta='git tag --annotate'
-alias gts='git tag --sign'
-alias gtv='git tag | sort -V'
-alias gunignore='git update-index --no-assume-unchanged'
-alias gunwip='git rev-list --max-count=1 --format="%s" HEAD | grep -q "\--wip--" && git reset HEAD~1'
-alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"'
-alias gwipe='git reset --hard && git clean --force -df'
-alias gwt='git worktree'
-alias gwta='git worktree add'
-alias gwtls='git worktree list'
-alias gwtmv='git worktree move'
-alias gwtrm='git worktree remove'

.profile

@@ -15,29 +15,17 @@ for term in kitty termite qterminal urxvt rxvt-unicode sakura gnome-terminal; do
 done
 
 # Pour la batterie des ordinateurs portables (~/bin/battery)
-export BATPATH="/sys/class/power_supply/BAT0"
+#export BATPATH="/sys/class/power_supply/BAT0"
 
 # Permit DBUS to be launched
 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
     fuz | fuztest)
-      variables_file="${HOME}/.config/environment.d/envvars.conf"
-      if [[ -f "${variables_file}" ]]; then
-        # charge seulement les lignes sans "#" (non commentées)
-        for line in `cat "${variables_file}"|grep -Ev '^#'`; do
-          export "$line"
-        done
-      fi
       exec sway
       ;;
     *)
@@ -45,4 +33,3 @@ if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
       ;;
   esac
 fi
-# vim: ts=2 sw=2 et nu

.ssh/config

@@ -26,7 +26,7 @@ Port 22
 Host ovh
 Hostname 37.187.17.29
 User od
-Port 4555
+Port 22
 
 # ??
 Host pi
@@ -117,48 +117,3 @@ Host backup
 Hostname 37.187.17.29
 User root
 Port 22
-
-## Serveur du salon (Beelink) - SMB / miniDLNA
-Host suc
-Hostname 192.168.1.42
-User od
-Port 22
-
-## Labo K8s RPI
-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,9 +1,9 @@
 ans:/home/od/projets/buffet
-blog:~/projets/blog
 buf:/home/od/projets/buffet
-cal:~/projets/effeuillage
 cloud:~/freshmile/cloud
-graille:~/projets/graille
-ops:~/projets/ops
 patchwork:/home/od/projets/patchwork
-trognon:~/projets/trognon
+p:~/freshmile/pulp
+ps:~/freshmile/pulp/Seed
+s:~/freshmile/seed
+z:~/freshmile/zest
+zs:~/freshmile/zest/Seed

.zprofile

@@ -1,9 +1,5 @@
 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,39 +1,8 @@
-#!/usr/bin/env zsh
-#
-# ENVIRONMENT VARIABLES ONLY
-
-# Cf. https://wiki.archlinux.org/title/XDG_Base_Directory
-export XDG_CONFIG_HOME=$HOME/.config
-
-# Default editor
-export EDITOR='nvim'
-
-# ZSH
-export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-export HISTFILE="$ZDOTDIR/.zhistory"    # History filepath
-export HISTSIZE=10000                   # Maximum events for internal history
-export SAVEHIST=10000                   # Maximum events in history file
-
-# PATH
 typeset -U PATH path
-path=("$HOME/.local/bin" "$HOME/bin" "/opt/sublime_merge" "$path[@]", "$(go env GOPATH)/bin")
+path=("$HOME/.local/bin" "$HOME/bin" "/opt/sublime_merge" "$path[@]")
 export PATH
 
-# Language environment
+# Autocomplètement supplémentaire (Docker)
-export LANG=fr_FR.UTF-8
+if [ -d "$HOME/.zsh/completion" ] ; then
-
+  fpath=(~/.zsh/completion $fpath)
-# Reading / Browse (manpages, websites, etc.)
+fi
-export PAGER=most
-export BROWSER=elinks
-
-# SSH
-export SSH_ASKPASS=qt4-ssh-askpass
-
-# Python
-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
-
-# k8s
-export KUBECONFIG=$HOME/kubeconfig
-

.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 pyenv kubectl helm terraform)
+plugins=(git httpie ng npm nvm pass pip sudo wd)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -77,6 +77,30 @@ POWERLEVEL9K_SHORTEN_DIR_LENGTH=1
 POWERLEVEL9K_SHORTEN_DELIMITER=""
 POWERLEVEL9K_SHORTEN_STRATEGY="truncate_from_right"
 
+# User configuration
+export PAGER=most
+export BROWSER=elinks
+export SSH_ASKPASS=qt4-ssh-askpass
+export AUTEUR="Olivier DOSSMANN"
+export DEFAULT_USER="od"
+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
+
+# You may need to manually set your language environment
+export LANG=fr_FR.UTF-8
+
+# Preferred editor for local and remote sessions
+if [[ -n $SSH_CONNECTION ]]; then
+  export EDITOR='vim'
+else
+  export EDITOR='nvim'
+fi
+
+# Enlève le prompt de droite après avoir appuyé sur Entrée
+setopt transient_rprompt
+
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"
 
@@ -88,10 +112,59 @@ POWERLEVEL9K_SHORTEN_STRATEGY="truncate_from_right"
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
+alias e="${EDITOR}"
+alias r="${EDITOR} -R"
+alias sm="sublime_merge"
+alias vi="${EDITOR}"
+alias mem='free -mt'
+alias df='df -hT'
+alias ls='exa'
+alias ll='exa -l'
+alias l='exa -F'
+alias rgrep='rg --no-ignore'
+export GREP_COLORS='ms=01;33:mc=01;33:s1=:cx=:fn=37;ln=32:bn=32:se=36'
+alias diff='colordiff'
+alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
+# évite de faire des erreurs
+alias rm='rm -i'
+alias cp='cp -i'
+alias grep='grep --color'
+# requêtes
+alias https='http --verify=no --default-scheme=https'
+# pytest
+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"
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh
 
+# Connexion automatique
+mkdir -p "${HOME}/etc/ssh";
+function ssh-procure-launch-agent {
+  eval `ssh-agent -s -a ~/etc/ssh/ssh-agent-socket`;
+  ssh-add;
+}
+
+if [ ! $SSH_AGENT_PID ]; then
+  if [ -e ~/etc/ssh/ssh-agent-socket ] ; then
+    SSH_AGENT_PID=`ps -fC ssh-agent |grep 'etc/ssh/ssh-agent-socket' |sed -r 's/^\S+\s+(\S+).*$/\1/'`; 
+    if [[ $SSH_AGENT_PID =~ [0-9]+ ]]; then
+      # in this case the agent has already been launched and we are just attaching to it. 
+      ##++  It should check that this pid is actually active & belongs to an ssh instance
+      export SSH_AGENT_PID;
+      SSH_AUTH_SOCK=~/etc/ssh/ssh-agent-socket; export SSH_AUTH_SOCK;
+    else
+      # in this case there is no agent running, so the socket file is left over from a graceless agent termination.
+      rm ~/etc/ssh/ssh-agent-socket;
+      ssh-procure-launch-agent;
+    fi;
+  else
+    ssh-procure-launch-agent;
+  fi;
+fi;
+
 # Desktop specificities for development
 case $HOST in
   lueur | baloo | sam)
@@ -102,6 +175,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,16 +7,15 @@
 directory="$HOME/wallpapers"
 minutes=15
 PROGRAM=`which feh`
-is_wayland=false
 
 # Some tests
-if [[ "${XDG_SESSION_TYPE}" == "wayland" ]]; then
+if [[ "$XDG_SESSION_TYPE" -eq "wayland" ]]; then
   PROGRAM=`which swaymsg`
   if [ -z "${PROGRAM}" ]; then
     echo "This script needs the swaymsg program."
     exit 1
   fi
-  is_wayland=true
+  wayland=1
 elif [ -z "${PROGRAM}" ]; then
   echo "This script needs the feh program. Install it."
   exit 1
@@ -49,7 +48,7 @@ while true; do
 
   # Change background
   file="${array_files["$NUMBER"]}"
-  if "${is_wayland}"; then
+  if [[ -n wayland ]]; then
     $PROGRAM output "*" bg "$directory/$file" fill
   else
     feh --bg-fill "$directory/$file"