From d8dad0762ebf2175ef3aa21e8c1a03a27d7a4f81 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 14 May 2025 21:53:42 +0200 Subject: [PATCH 1/6] chore(gammastep): Get config. from tom (laptop) branch --- .config/gammastep/config.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/gammastep/config.ini b/.config/gammastep/config.ini index 88a87c3..77bdbd3 100644 --- a/.config/gammastep/config.ini +++ b/.config/gammastep/config.ini @@ -1,5 +1,10 @@ [general] location-provider=manual +# 5500-6500 +temp-day=5700 +# 3000-4000 +temp-night=3500 +adjustment-method=wayland # Lieu : Neudorf, chez Agnès [manual] From 18fdf1adc72f6c6cdddb515189a380a61af835d1 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 14 May 2025 22:06:58 +0200 Subject: [PATCH 2/6] refactor: Get Sway config from tom --- .config/sway/config | 1 + .config/sway/config.d/00-presse-papier.conf | 9 ++++++--- .config/sway/config.d/12-lanceur.conf | 11 +++++++++++ .config/sway/config.d/15-background.conf | 2 +- .config/sway/config.d/40-bureaux.conf | 6 +++--- .config/sway/config.d/60-raccourcis.conf | 3 +++ .config/sway/config.d/63-presse-papier.conf | 6 ++++++ .config/sway/config.d/90-programmes.conf | 2 +- 8 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 .config/sway/config.d/12-lanceur.conf diff --git a/.config/sway/config b/.config/sway/config index 1ebb672..9570a0c 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -226,6 +226,7 @@ bar 1 { } } +# Va lancer notamment session.sh pour les variables XDG_SESSION et touti quanti include /etc/sway/config.d/* # Ajout pour Olivier diff --git a/.config/sway/config.d/00-presse-papier.conf b/.config/sway/config.d/00-presse-papier.conf index 849dfd9..121cb00 100644 --- a/.config/sway/config.d/00-presse-papier.conf +++ b/.config/sway/config.d/00-presse-papier.conf @@ -1,6 +1,9 @@ # Presse-papiers -# La base -exec wl-paste -t text --watch clipman store -# Presse-papier primaire : avec sauvegarde de l'historique dans un fichier JSON +## CLIPMAN +exec wl-paste -t text --watch clipman store # Pour clipman +## Presse-papier primaire : avec sauvegarde de l'historique dans un fichier JSON exec wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json" + +# CLIPHIST (multimédia inclus) +#exec wl-paste --watch cliphist store diff --git a/.config/sway/config.d/12-lanceur.conf b/.config/sway/config.d/12-lanceur.conf new file mode 100644 index 0000000..a45ca1d --- /dev/null +++ b/.config/sway/config.d/12-lanceur.conf @@ -0,0 +1,11 @@ +# Configuration du lanceur d'application + +# Apparence d'une fenêtre nommée Launcher +for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 ppt 60 ppt, border pixel 10 + +# Choix d'un lanceur +set $menu exec alacritty --class launcher -T 'Programmes' -e env TERMINAL_COMMAND='swaymsg exec' /usr/bin/sway-launcher-desktop + +# On change le raccourci clavier en conséquence +unbindsym $mod+d +bindsym $mod+d exec $menu diff --git a/.config/sway/config.d/15-background.conf b/.config/sway/config.d/15-background.conf index 0295c82..56c8720 100644 --- a/.config/sway/config.d/15-background.conf +++ b/.config/sway/config.d/15-background.conf @@ -1,3 +1,3 @@ # Change background -output * bg /home/od/.config/sway/abstract-blue-background-1920x1200.jpg fill +output * bg /home/od/.config/i3/abstract-blue-background-1920x1200.jpg fill diff --git a/.config/sway/config.d/40-bureaux.conf b/.config/sway/config.d/40-bureaux.conf index 0436fbe..ab550f3 100644 --- a/.config/sway/config.d/40-bureaux.conf +++ b/.config/sway/config.d/40-bureaux.conf @@ -10,12 +10,12 @@ assign [app_id="jetbrains-idea|Code"] workspace 1 # Bureau 2 (navigation web) assign [class="Google-chrome|Vivaldi-stable|Opera|Firefox|Navigator|Nightly|Chromium"] workspace 2 -assign [app_id="Google-chrome|Vivaldi-stable|Opera|Firefox|Navigator|Nightly|Chromium"] workspace 2 +assign [app_id="Google-chrome|Vivaldi-stable|opera|firefox|navigator|nightly|chromium"] workspace 2 # Bureau 3 (Courriel, PHPStorm) assign [class="Thunderbird|Mail|jetbrains-phpstorm"] workspace 3 assign [app_id="Thunderbird|Mail|jetbrains-phpstorm"] workspace 3 # Bureau 4 -assign [class="Mattermost|mattermost-desktop|Rambox|Slack|Scudcloud|Gitter|Dino"] workspace 4 -assign [app_id="Mattermost|mattermost-desktop|Rambox|Slack|Scudcloud|Gitter|Dino|dino"] workspace 4 +assign [class="Mattermost|mattermost-desktop|Rambox|Slack|Scudcloud|Gitter|Dino|Signal"] workspace 4 +assign [app_id="Mattermost|mattermost-desktop|Rambox|Slack|Scudcloud|Gitter|dino|signal"] workspace 4 diff --git a/.config/sway/config.d/60-raccourcis.conf b/.config/sway/config.d/60-raccourcis.conf index aeea47a..118fe71 100644 --- a/.config/sway/config.d/60-raccourcis.conf +++ b/.config/sway/config.d/60-raccourcis.conf @@ -8,3 +8,6 @@ bindsym XF86AudioStop exec playerctl stop # arrêt musique/film/fichier # Bouton impression écran bindsym Print exec grim Images/$(date +'%Y-%m-%d-%s_screenshot.jpg') + +# Arrête l'enregistrement d'une vidéo avec wf-recorder +bindsym Ctrl+Shift+BackSpace exec killall -s SIGINT wf-recorder diff --git a/.config/sway/config.d/63-presse-papier.conf b/.config/sway/config.d/63-presse-papier.conf index 492c4a6..cf4b999 100644 --- a/.config/sway/config.d/63-presse-papier.conf +++ b/.config/sway/config.d/63-presse-papier.conf @@ -1,3 +1,9 @@ # Presse-papier unbindsym $mod+h + +## CLIPMAN bindsym $mod+h exec clipman pick -t wofi + +# CLIPHIST +#bindsym $mod+h exec cliphist list | fzf --no-sort | cliphist decode | wl-copy +#bindsym $mod+h exec cliphist list | wofi -S dmenu | cliphist decode | wl-copy diff --git a/.config/sway/config.d/90-programmes.conf b/.config/sway/config.d/90-programmes.conf index 806c3e2..481e773 100644 --- a/.config/sway/config.d/90-programmes.conf +++ b/.config/sway/config.d/90-programmes.conf @@ -1,5 +1,5 @@ # Économie des yeux (48.5680685:7.7709942 = Neudorf, rue de Fegersheim) -exec gammastep-indicator +exec_always "killall wlsunset ; wlsunset -t 3500 -T 5700 -l 48.5 -L 7.7 &" # Notifications de bureau exec dunst From 778362e85efaab9c88b07ff39c88a824eae42875 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 14 May 2025 22:11:28 +0200 Subject: [PATCH 3/6] refactor: Get waybar config from tom (laptop) branch --- .config/waybar/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/waybar/config b/.config/waybar/config index af6368e..c530024 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -23,7 +23,7 @@ "format": "{}" }, "tray": { - // "icon-size": 21, + "icon-size": 21, "spacing": 10 }, "clock": { From 9cb06b490f2b44445d5982c8762961e216c0ccb6 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 14 May 2025 22:17:23 +0200 Subject: [PATCH 4/6] chore(zsh): Update aliases --- .config/zsh/.zshrc.d/aliases.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/zsh/.zshrc.d/aliases.zsh b/.config/zsh/.zshrc.d/aliases.zsh index 0576282..6e0fe9f 100644 --- a/.config/zsh/.zshrc.d/aliases.zsh +++ b/.config/zsh/.zshrc.d/aliases.zsh @@ -6,6 +6,9 @@ alias r="${EDITOR} -R" alias sm="sublime_merge" alias vi="${EDITOR}" +# pagination +alias cat='bat' + # system alias mem='free -mt' alias df='df -hT' @@ -46,6 +49,7 @@ alias k='kubectl' alias devu="${HOME}/devu/devu/devu" # git +alias g='git' alias ga='git add' alias gaa='git add --all' alias gam='git am' From c13e8b3d9de7b65b3f1a59d3489f4613cddb491d Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 14 May 2025 22:18:54 +0200 Subject: [PATCH 5/6] chore(zsh): Change PAGER and MANPAGER --- .zshenv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.zshenv b/.zshenv index a79d810..289ddec 100644 --- a/.zshenv +++ b/.zshenv @@ -23,7 +23,8 @@ export PATH export LANG=fr_FR.UTF-8 # Reading / Browse (manpages, websites, etc.) -export PAGER=most +export PAGER="bat" +export MANPAGER="nvim +Man!" export BROWSER=elinks # SSH From 3de58bb297c22248c2ba9262d55286f0f76e68af Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Wed, 14 May 2025 22:22:17 +0200 Subject: [PATCH 6/6] feat(bin): More scripts for 'bin' directory --- bin/battery | 4 ++++ bin/launcher.sh | 15 +++++++++++++++ bin/netflix | 3 +++ bin/random_wallpaper | 4 +++- bin/rec1 | 6 ++++++ bin/webserver | 3 +++ 6 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 bin/launcher.sh create mode 100755 bin/netflix create mode 100755 bin/rec1 create mode 100755 bin/webserver diff --git a/bin/battery b/bin/battery index 060280c..8cf9c9a 100755 --- a/bin/battery +++ b/bin/battery @@ -1,4 +1,8 @@ #!/bin/sh +# +# battery +# +# Penser à modifier la variable dans ~/.profile HEART_FULL=♥ HEART_EMPTY=♡ diff --git a/bin/launcher.sh b/bin/launcher.sh new file mode 100644 index 0000000..cd11c51 --- /dev/null +++ b/bin/launcher.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# +# launcher +# +# TODO: toujours mettre des \n entre les résultats ! + +res=() + +# Find all programs in $PATH. +res+=$(echo -n "$PATH" | xargs -d: -I{} -r -- find -L {} -maxdepth 1 -mindepth 1 -type f -executable -printf '%P\n' 2>/dev/null) +res+=$(echo -e "\ncoucou") + +for resultat in "${res[@]}"; do + echo "$resultat" +done | fzf|sh diff --git a/bin/netflix b/bin/netflix new file mode 100755 index 0000000..5248dc6 --- /dev/null +++ b/bin/netflix @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +firefox --kiosk "https://netflix.com/" diff --git a/bin/random_wallpaper b/bin/random_wallpaper index 2220311..c4bb174 100755 --- a/bin/random_wallpaper +++ b/bin/random_wallpaper @@ -2,7 +2,8 @@ # random_wallpaper # -# Requirement: feh (apt install feh) +# Requirement: feh (apt install feh) - for Xorg +# Requirement: swaybg - for Wayland directory="$HOME/wallpapers" minutes=15 @@ -50,6 +51,7 @@ while true; do # Change background file="${array_files["$NUMBER"]}" if "${is_wayland}"; then + # Use of swaybg program (used with swaymsg) $PROGRAM output "*" bg "$directory/$file" fill else feh --bg-fill "$directory/$file" diff --git a/bin/rec1 b/bin/rec1 new file mode 100755 index 0000000..2e45689 --- /dev/null +++ b/bin/rec1 @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# change number by 2 for screen 2 +number=1 + +wf-recorder -o $(swaymsg -t get_outputs |grep "DP"|head -n ${number}|cut -d '"' -f 4) -f ~/screens/$(date +'%Y-%m-%d-%s')_screencast.mkv diff --git a/bin/webserver b/bin/webserver new file mode 100755 index 0000000..dd1a86d --- /dev/null +++ b/bin/webserver @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +python3 -m http.server "$@"