Correction : bindings Sway et Hyprland

fenêtres

Suppression des règles pour WhatsApp. Ajout de règles pour Bitwarden.

bin/qemush

@@ -7,7 +7,7 @@ exec_as() {
     if [ "$(whoami)" != "$user" ]; then
         exec sudo -u "$user" "$0" "$@"
     else
-        cd
+        cd || return
     fi
 }
 

bin/updateall

@@ -42,6 +42,8 @@ case "$script" in
         main "$@"
         ;;
     *)
+        # Oui, ShellCheck, c'est bel et bien ce que j'essaie de faire
+        # shellcheck disable=SC2211
         "${scripts_d}/"??"-${script}" "$@"
         ;;
 esac

bin/vncsconnect

@@ -37,7 +37,7 @@ if [ -n "$separator" ]; then
 fi
 
 # Exécution
-if ! ssh_bridge_already_exists; then
+if ! ssh_bridge_already_exists "${ssh_args[1]}"; then
     ssh-fwd "${ssh_args[@]}" -- "$@" || exit
 else
     echo "Le pont SSH existe déjà !"

bin/xdg-session-start

@@ -1,7 +1,10 @@
 #!/bin/sh
-/usr/lib/xdg-desktop-portal-wlr &
+mkdir -p "${XDG_RUNTIME_DIR}/ssh" &
 dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+/usr/lib/xdg-desktop-portal-wlr &
+
 sleep 1
 artix-pipewire-launcher &
 waybar
 
+wait

config/electron24-flags.conf

@@ -0,0 +1 @@
+electron-flags.conf

config/hypr/hyprland.conf

@@ -92,6 +92,10 @@ device:epic mouse V1 {
 # Variables
 $browser = librewolf
 $terminal = alacritty
+$discord = webcord
+$deezer = deezer
+$bitwarden = bitwarden-desktop
+$joplin = joplin-desktop
 
 # Modular sourcing
 $confDir = ~/.config/hypr/hyprland.conf.d

config/hypr/hyprland.conf.d/bindings.conf

@@ -98,7 +98,9 @@ bind = $mainMod, D, exec, rofi -show drun
 bind = $mainMod, 36, exec, $terminal
 bind = $mainMod, F1, exec, $browser
 bind = $mainMod, F2, exec, joplin-desktop
-bind = $mainMod, F3, exec, webcord
+bind = $mainMod, F3, exec, $bitwarden
+bind = $mainMod, F4, exec, $discord
+bind = $mainMod, F5, exec, $deezer
 bind = $mainMod ALT, L, exec, swaylock
 
 # Resize mode

config/hypr/hyprland.conf.d/startup.conf

@@ -1,11 +1,8 @@
 # Startup
 exec-once = swaync
-exec-once = waybar
 exec-once = hyprpaper
-exec-once = artix-pipewire-launcher
-exec-once = /usr/lib/xdg-desktop-portal-hyprland
 exec-once = swayosd-server
 exec-once = $terminal & $terminal -e sudo -i
 exec-once = webcord
 exec-once = joplin-desktop
-
+exec-once = xdg-session-start

config/hypr/hyprland.conf.d/windowrules.conf

@@ -3,7 +3,7 @@
 # Workspace 4
 windowrule = workspace 4 silent, ^(WebCord)$
 windowrule = workspace 4 silent, ^(@joplin/app-desktop)$
-windowrule = workspace 4 silent, ^(whatsapp-nativefier-.*)$
+windowrule = workspace 4 silent, ^(Bitwarden)$
 windowrule = workspace 4 silent, ^(Deezer)$
 
 # Floating windows

config/sway/config

@@ -9,6 +9,8 @@ set $browser librewolf
 set $discord webcord
 set $joplin joplin-desktop
 set $wallpaper ~/.local/share/backgrounds/artix-tube-text-green.jpg
+set $deezer deezer
+set $bitwarden bitwarden-desktop
 
 input type:keyboard {
 	xkb_layout fr

config/sway/config.d/70-bindings.conf

@@ -9,7 +9,9 @@ bindsym $mod+Return exec $term
 bindsym $mod+d exec $menu
 bindsym $mod+F1 exec $browser
 bindsym $mod+F2 exec $joplin
-bindsym $mod+F3 exec $discord
+bindsym $mod+F3 exec $bitwarden
+bindsym $mod+F4 exec $discord
+bindsym $mod+F5 exec $deezer
 
 # Windows
 bindsym $mod+$left focus left

config/sway/config.d/80-windows_rules.conf

@@ -2,7 +2,7 @@
 assign [app_id="^@joplin/app-desktop$"] 4
 assign [app_id="^WebCord$"] 4
 assign [class="^Deezer$"] 4
-assign [app_id="^com.ktechpit.whatsie$"] 4
+assign [app_id="^Bitwarden$"] 4
 assign [app_id="^org.prismlauncher.PrismLauncher$"] 5
 
 # Windows rules

config/updateall/scripts/10-paru

@@ -0,0 +1,6 @@
+#!/bin/sh
+paru -Scc
+paru -Fy
+paru
+paru -Qdtq | paru -Rns -
+

etc/bash/bashrc.d/70-globstar.bashrc

@@ -0,0 +1 @@
+shopt -s globstar

home/bash_profile

@@ -1,18 +1,16 @@
+fastfetch &
+
 # Source my profile
-profile="${HOME}/.profile"
-[[ -f $profile ]] && . "$profile"
-unset profile
+sourceif() {
+    [ -f "$1" ] && . "$1"
+}
 
-# Source my bashrc
-bashrc="${HOME}/.bashrc"
-[[ -f $bashrc ]] && . "$bashrc"
-unset bashrc
+sourceif ~/.profile
+sourceif ~/.bashrc
 
-# Fastfetch
-fastfetch
+wait
 
 # Start Sway if on tty1
 if [ "$(tty)" = /dev/tty1 ]; then
 	exec sway
 fi
-

home/shrc.d/arch_aliases

@@ -0,0 +1 @@
+alias pm=paru

ssh/config

@@ -0,0 +1,5 @@
+# Control master
+ControlPath ${XDG_RUNTIME_DIR}/ssh/control-%C
+
+# SSH agent
+AddKeysToAgent yes

vnc/xstartup

@@ -1,10 +1,10 @@
 #!/bin/sh
-cd
-eval "$(ssh-agent)"
-dbus-launch --exit-with-session xfwm4 &
-artix-pipewire-launcher &
-disown %2
-st
-wait
-ssh-agent -k
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    exec dbus-launch --exit-with-session ssh-agent "$0" "$@"
+fi
 
+cd
+xfwm4 &
+artix-pipewire-launcher &
+alacritty
+wait