Merge branch 'main' of gitea.tforgione.fr:tforgione/hypr

hyprland.conf

@@ -28,7 +28,8 @@ $terminal = new-terminal
 $fileManager = dolphin
 $menu = rofi -show drun -theme ~/.config/rofi/theme.rasi
 $hyprscript = ~/.config/hypr/hyprscript
-$social = firefox "http://jdb.localhost/" "https://web.telegram.org" "https://web.whatsapp.com/" "https://discord.com/app" "https://nuage.polymny.studio/index.php/apps/calendar/"
+$social = firefox "http://jdb.localhost/" "https://ksuite.infomaniak.com/1220491/mail/0" "https://ksuite.infomaniak.com/1085038/mail" "https://web.telegram.org" "https://web.whatsapp.com/" "https://discord.com/app" "https://nuage.tforgione.fr/index.php/apps/calendar/" "https://gotify.tforgione.fr"
+$yuzzit = chromium "https://mail.google.com/" "https://app.gather.town/app/bZRkf3gh7MIximOa/ytopenspace" "https://app.slack.com/client/T03UFFGJK/D07KS0S1LDT" "https://yip.atlassian.net/wiki/spaces/Y/overview" "https://yip.atlassian.net/"
 
 
 #################
@@ -44,9 +45,10 @@ exec-once = XDG_CURRENT_DESKTOP=sway XDG_SESSION_DESKTOP=sway QT_QPA_PLATFORM=wa
 exec-once = hypridle
 exec-once = nm-applet
 exec-once = blueberry-tray
-# exec-once = nextcloud --background
+exec-once = nextcloud --background
+exec-once = [workspace special:e_music silent] feishin
 exec-once = [workspace special:a_social silent] $social
-exec-once = [workspace special:b_mail silent] thunderbird
+# exec-once = [workspace special:b_mail silent] thunderbird
 
 source = ~/.config/hypr/exec-once.conf
 
@@ -157,7 +159,7 @@ windowrule = border_size 0, match:class negative:Alacritty
 
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    # pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = true # You probably want this
     force_split = 2 # split to the right / bottom
 }
@@ -240,11 +242,12 @@ bind = $mainMod CTRL, R, exec, $hyprscript reload
 bind = $mainMod SHIFT, Q, exec, hyprctl dispatch exit
 
 bind = $mainMod, Z, exec, $social
-bind = $mainMod, E, exec, chromium  "https://app.gather.town/app/bZRkf3gh7MIximOa/ytopenspace" "https://app.slack.com/client/T03UFFGJK/D07KS0S1LDT" "https://yip.atlassian.net/wiki/spaces/Y/overview" "https://yip.atlassian.net/"
+bind = $mainMod, E, exec, $yuzzit
 
 bind = $mainMod, C, exec, alacritty -e numbat
 bind = $mainMod, P, exec, pavucontrol
 bind = $mainMod, B, exec, blueberry
+bind = $mainMod, D, exec, makoctl mode -t do-not-disturb
 
 bind = $mainMod, L, exec, sleep 0.5s && hyprctl dispatch dpms off
 bind = $mainMod SHIFT, L, exec, loginctl lock-session && sleep 0.5s && (pidof hyprlock || hyprlock) && hyprctl dispatch dpms off
@@ -293,11 +296,12 @@ bind = $mainMod, M, exec, ~/.config/dotfiles/bin-extra/youtube
 bind = , Print, exec, XDG_CURRENT_DESKTOP=sway XDG_SESSION_DESKTOP=sway QT_QPA_PLATFORM=wayland flameshot gui
 # bind =, Print, exec, grim -g "$(slurp)" - | wl-copy
 
-# Example special workspace (scratchpad)
-bind = $mainMod, Q, togglespecialworkspace, a_social
-bind = $mainMod, S, togglespecialworkspace, b_mail
-bind = $mainMod, D, togglespecialworkspace, c_yuzzit
-bind = $mainMod, F, togglespecialworkspace, d_ai
+# Special workspaces
+bind = $mainMod, F1, togglespecialworkspace, a_social
+# bind = $mainMod, F2, togglespecialworkspace, b_mail
+bind = $mainMod, F2, togglespecialworkspace, c_yuzzit
+bind = $mainMod, F3, togglespecialworkspace, d_ai
+bind = $mainMod, F4, togglespecialworkspace, e_music
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
@@ -316,10 +320,10 @@ bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 2%+
 bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 2%-
 
 # Requires playerctl
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPrev, exec, playerctl previous
+bindl = , XF86AudioNext, exec, playerctl next -p Feishin
+bindl = , XF86AudioPause, exec, playerctl play-pause -p Feishin
+bindl = , XF86AudioPlay, exec, playerctl play-pause -p Feishin
+bindl = , XF86AudioPrev, exec, playerctl previous -p Feishin
 
 ##############################
 ### WINDOWS AND WORKSPACES ###

hyprscript

@@ -247,13 +247,17 @@ def monitor_stats():
             else:
                 battery_class = None
 
+            battery_text = "% 4.0f" % battery.percent if battery.percent <= 99.95 else "  100"
             battery_json = f', "class": "{battery_class}"' if battery_class else ''
-            battery_json = '{"text": "' + battery_icon + ' ' + "% 4.0f" % battery.percent + '%"' + battery_json + '}'
+            battery_json = '{"text": "' + battery_icon + ' ' + battery_text + '%"' + battery_json + '}'
+
+        cpu_percent_text = "% 5.1f" % cpu_percent if cpu_percent <= 99.95 else "  100"
+        mem_percent_text = "% 5.1f" % mem_percent if mem_percent <= 99.95 else "  100"
 
         with open('.stat.txt', 'w') as f:
             f.write(
-                '  ' + ''.join([to_bar(x) for x in cpu_values]) + ' ' + "% 5.1f" % cpu_percent + '%\n' +
-                '  ' + ''.join([to_bar(x) for x in mem_values]) + ' ' + "% 5.1f" % mem_percent + '%\n' +
+                '  ' + ''.join([to_bar(x) for x in cpu_values]) + ' ' + cpu_percent_text + '%\n' +
+                '  ' + ''.join([to_bar(x) for x in mem_values]) + ' ' + mem_percent_text + '%\n' +
                 '  ' + ''.join([to_bar(x) for x in temp_values]) + ' ' + "% 5.1f" % temp + '°\n' +
                 battery_json
             )

waybar/config

@@ -20,6 +20,7 @@
          "custom/temp",
          "custom/cpu",
          "custom/mem",
+         "custom/notification",
          "custom/battery",
          "tray",
          "clock"
@@ -39,6 +40,7 @@
              "b_mail": " ",
              "c_yuzzit": "Y",
              "d_ai": "AI",
+             "e_music": "󰎇",
              "11": "1",
              "12": "2",
              "13": "3",
@@ -168,5 +170,10 @@
         "exec": "sed '4q;d' ~/.config/hypr/.stat.txt",
         "return-type": "json",
         "restart-interval": 2
+     },
+     "custom/notification": {
+        "exec": "makoctl mode | grep '^do-not-disturb$' > /dev/null 2>&1 && echo '󱙍 ' || echo '󰍡 '",
+        "on-click": "makoctl mode -t do-not-disturb",
+        "restart-interval": 2
      }
 }