Compare commits

...

16 Commits

Author SHA1 Message Date
c25d1b5bb9 feat(wd): Add Trognon as shortcut 2024-10-20 14:43:08 +02:00
6a1be39425 feat(SSH): Nouvelles machines
* suc : serveur de la maison
* deux : RPI3
* trois : RPI3
* quatre : RPI4
2024-10-20 14:43:02 +02:00
9065709cf9 feat(warprc): Nouveaux raccourcis pour la commande wd
* projet effeuillage : calendrier de l'Avent
* projet graille : repas aléatoires
2024-10-20 14:39:01 +02:00
7f08c542e1 fix(Polybar): Changement du module de contraste/luminosité 2024-10-20 14:37:41 +02:00
e35450a0f0 fix(Contraste): Correction des commandes pour la luminosité 2024-10-20 14:37:41 +02:00
c350333669 feat(Rotation): Démon pour la rotation automatique de l'écran 2024-10-20 14:37:41 +02:00
33b03dd7e3 feat(HiDPI): Nouvel écran = adaptation de la config. 2024-10-20 14:37:41 +02:00
2c9eeaa99a fix(Polybar): utilisation de la bonne carte wifi 2024-10-20 14:37:41 +02:00
6ed2280b8e fix(i3): Configuration différente
* utilisation d'une autre méthode pour le fond d'écran aléatoire
* désactivation de hamster-indicator
* ajout d'une résolution par défaut
2024-10-20 14:37:41 +02:00
a25bf962ff BIN: correction de random_wallpaper pour Xorg 2024-10-17 16:35:04 +02:00
fd6b431d51 WARPRC: Nouveaux raccourcis pour les projets ! 2024-10-17 11:48:57 +02:00
718dc045db Config. SSH: Ajout de plusieurs serveurs 2024-10-17 11:48:57 +02:00
9b0160cc0a i3: Amélioration de l'environnement de bureau avec:
* ajout d'Hamsket au bon bureau
* Arrêt de l'utilisation de hamster-indicator
* corrections mineures dans .tmux pour incompatibilité
2024-10-17 11:48:54 +02:00
03a2f6cafd ZSH: Ajout de la configuration de Kubernetes 2024-10-17 11:47:42 +02:00
59586947d9 ZSH: nouvel alias pour la commande ip 2024-10-17 11:47:39 +02:00
b04dfb860a PYENV: ajouté à ZSH 2024-10-17 11:46:55 +02:00
13 changed files with 127 additions and 29 deletions

View File

@ -65,3 +65,25 @@ rofi.color-window: #002b37, #002b37, #003642
rofi.color-normal: #002b37, #819396, #002b37, #003642, #819396 rofi.color-normal: #002b37, #819396, #002b37, #003642, #819396
rofi.color-active: #002b37, #008ed4, #002b37, #003642, #008ed4 rofi.color-active: #002b37, #008ed4, #002b37, #003642, #008ed4
rofi.color-urgent: #002b37, #da4281, #002b37, #003642, #da4281 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

View File

@ -1,3 +1,7 @@
# Permet à Chromium de se lancer dans Wayland # Permet à Chromium de se lancer dans Wayland
--enable-features=UseOzonePlatform #--enable-features=UseOzonePlatform
--ozone-platform=wayland #--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

View File

@ -2,3 +2,8 @@
MOZ_ENABLE_WAYLAND=1 MOZ_ENABLE_WAYLAND=1
# Modifie le comportement JAVA pour PHPStorm # Modifie le comportement JAVA pour PHPStorm
_JAVA_AWT_WM_NONREPARENTING=1 _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

View File

@ -22,7 +22,7 @@ set $mod Mod4
# This font is widely installed, provides lots of unicode glyphs, right-to-left # This font is widely installed, provides lots of unicode glyphs, right-to-left
# text rendering and scalability on retina/hidpi displays (thanks to pango). # text rendering and scalability on retina/hidpi displays (thanks to pango).
font pango:DejaVu Sans Mono 10 font pango:DejaVu Sans Mono 18
# Before i3 v4.8, we used to recommend this one as the default: # 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 # 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) # start dmenu (a program launcher)
#bindsym $mod+d exec dmenu_run #bindsym $mod+d exec dmenu_run
bindsym $mod+d exec rofi -show combi bindsym $mod+d exec rofi -show combi -font "DejaVu Sans Mono 20"
# There also is the (new) i3-dmenu-desktop which only displays applications # 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 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
# installed. # installed.
@ -165,7 +165,7 @@ bindsym $mod+r mode "resize"
assign [class="jetbrains-idea|Code"] 1 assign [class="jetbrains-idea|Code"] 1
assign [class="Google-chrome|Vivaldi-stable|Opera|Firefox|Navigator|Nightly|Chromium"] 2 assign [class="Google-chrome|Vivaldi-stable|Opera|Firefox|Navigator|Nightly|Chromium"] 2
assign [class="Thunderbird|Mail|jetbrains-phpstorm"] 3 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 ##### 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 bindsym XF86AudioMute exec pactl set-sink-mute $sink toggle # mute sound
# Brightness controls # Brightness controls
bindsym XF86MonBrightnessUp exec xbacklight -inc 5 # increase screen brightness bindsym XF86MonBrightnessUp exec brightnessctl s +20 # increase screen brightness
bindsym XF86MonBrightnessDown exec xbacklight -dec 5 # decrease screen brightness bindsym XF86MonBrightnessDown exec brightnessctl s 20- # decrease screen brightness
# Player controls (via MPRIS, in example mpv-mpris) # Player controls (via MPRIS, in example mpv-mpris)
# play/pause # play/pause
@ -213,6 +213,12 @@ bindsym XF86Sleep exec systemctl suspend
## STARTUP PROGRAMS ## 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) # Transparency (need picom)
exec_always --no-startup-id "killall picom; picom -b" exec_always --no-startup-id "killall picom; picom -b"
@ -237,10 +243,10 @@ smart_gaps on
# Random wallpaper (need ~/bin/random_wallpaper from # Random wallpaper (need ~/bin/random_wallpaper from
# https://github.com/blankoworld/dotfiles/blob/master/bin/random_wallpaper) # 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}'`; 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/* &"
# Hasmter indicator # Hasmter indicator
exec --no-startup-id hamster #exec --no-startup-id hamster
# Clipit : Presse-papiers pour le bureau # Clipit : Presse-papiers pour le bureau
exec --no-startup-id clipit exec --no-startup-id clipit

View File

@ -18,7 +18,7 @@ bold_font Fira Code Bold
bold_italic_font Fira Code Retina bold_italic_font Fira Code Retina
# Font size (in pts) # Font size (in pts)
font_size 14.0 font_size 13.0
# The amount the font size is changed by (in pts) when increasing/decreasing # The amount the font size is changed by (in pts) when increasing/decreasing
# the font size in a running terminal. # the font size in a running terminal.

View File

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

View File

@ -22,6 +22,11 @@ if [ "$0" = "/usr/sbin/lightdm-session" -a "$DESKTOP_SESSION" = "i3" ]; then
export $(gnome-keyring-daemon -s) export $(gnome-keyring-daemon -s)
fi 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é # Démarrage de l'environnement préféré
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
case $HOST in case $HOST in

View File

@ -117,3 +117,48 @@ Host backup
Hostname 37.187.17.29 Hostname 37.187.17.29
User root User root
Port 22 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

View File

@ -85,6 +85,6 @@ set -g status-left-length 30
# Activer mon layout par defaut # 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

View File

@ -1,10 +1,9 @@
ans:/home/od/projets/buffet ans:/home/od/projets/buffet
blog:~/projets/blog blog:~/projets/blog
buf:/home/od/projets/buffet buf:/home/od/projets/buffet
cal:~/projets/effeuillage
cloud:~/freshmile/cloud cloud:~/freshmile/cloud
graille:~/projets/graille
ops:~/projets/ops
patchwork:/home/od/projets/patchwork patchwork:/home/od/projets/patchwork
p:~/freshmile/pulp trognon:~/projets/trognon
ps:~/freshmile/pulp/Seed
s:~/freshmile/seed
z:~/freshmile/zest
zs:~/freshmile/zest/Seed

View File

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

5
.zshrc
View File

@ -68,7 +68,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # 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 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 FLASK_SKIP_DOTENV=1 ## make problems with poetry and flask applications
export PIPENV_QUIET=1 # enlève les courtesy notice export PIPENV_QUIET=1 # enlève les courtesy notice
export ENABLE_WARNINGS=false # enlève les warnings dans le setup RERO-ils 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 # You may need to manually set your language environment
export LANG=fr_FR.UTF-8 export LANG=fr_FR.UTF-8
@ -136,7 +137,7 @@ alias pyt='poetry run pytest -vvs --no-cov --disable-warnings'
alias pytc='poetry run pytest -vvs --disable-warnings --cov-report=xml:cov.xml' alias pytc='poetry run pytest -vvs --disable-warnings --cov-report=xml:cov.xml'
# projet rero # projet rero
alias rero="ALIAS=rero /home/od/projets/rerologik/agnes" alias rero="ALIAS=rero /home/od/projets/rerologik/agnes"
# colration de la commande IP # coloration de la commande IP
alias ip='ip -c' alias ip='ip -c'
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.

View File

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