From 3bc0b51a1c4d1cee4e4c8a2c08a56fb64169a175 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 4 Aug 2021 22:24:25 +0200
Subject: [PATCH] Adapt configurations for new Rick (MNT REFORM)

---
 bin/launch_mail_worksplace.sh             | 6 +++---
 config/gtk-2.0/gtkfilechooser.ini         | 6 +++---
 config/gtk-3.0/settings.ini               | 4 ++--
 config/sway/conf.d/rick/keybinding.config | 9 +++++++--
 config/sway/conf.d/rick/output.config     | 1 -
 config/sway/conf.d/rick/startup.config    | 1 +
 config/sway/conf.d/rick/variables.config  | 4 ++--
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/bin/launch_mail_worksplace.sh b/bin/launch_mail_worksplace.sh
index 121eba9..2ff7b6d 100755
--- a/bin/launch_mail_worksplace.sh
+++ b/bin/launch_mail_worksplace.sh
@@ -2,11 +2,11 @@
 # script for launching my mail workspace
 
 swaymsg 'workspace $ws2; layout splitv'
-swaymsg 'exec $term --class=mail neomutt'
-swaymsg 'exec $term --class=cal ikhal'
+swaymsg 'exec $term --app-id=mail TERM=screen-256color neomutt'
+swaymsg 'exec $term --app-id=cal ikhal'
 
 while :; do
-    sleep .2
+    sleep .2 
     swaymsg '[app_id="cal"] focus' 2>/dev/null && break
 done
 swaymsg 'splith; exec $term'
diff --git a/config/gtk-2.0/gtkfilechooser.ini b/config/gtk-2.0/gtkfilechooser.ini
index bc10ee2..333db1c 100644
--- a/config/gtk-2.0/gtkfilechooser.ini
+++ b/config/gtk-2.0/gtkfilechooser.ini
@@ -2,10 +2,10 @@
 LocationMode=filename-entry
 ShowHidden=false
 ShowSizeColumn=true
-GeometryX=362
-GeometryY=184
+GeometryX=2122
+GeometryY=270
 GeometryWidth=876
-GeometryHeight=558
+GeometryHeight=566
 SortColumn=name
 SortOrder=ascending
 StartupMode=recent
diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini
index fd6de8b..1d0c242 100644
--- a/config/gtk-3.0/settings.ini
+++ b/config/gtk-3.0/settings.ini
@@ -1,6 +1,6 @@
 [Settings]
-gtk-theme-name=Arc-Darker-solid
-gtk-font-name=DejaVu Sans 10
+gtk-theme-name=Arc-Darker
+gtk-font-name=DejaVu Sans 12
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=0
 gtk-button-images=0
diff --git a/config/sway/conf.d/rick/keybinding.config b/config/sway/conf.d/rick/keybinding.config
index 1468855..70b9923 100644
--- a/config/sway/conf.d/rick/keybinding.config
+++ b/config/sway/conf.d/rick/keybinding.config
@@ -1,3 +1,8 @@
 # Brightness
-bindsym XF86MonBrightnessDown exec brightnessctl set 2%-
-bindsym XF86MonBrightnessUp exec brightnessctl set 2%+
+
+bindsym $mod+F1 exec brightnessctl s 1-
+bindsym $mod+F2 exec brightnessctl s +1
+
+bindsym $mod+F3 exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindsym $mod+F4 exec pactl set-sink-volume @DEFAULT_SINK@ +5%
+bindsym $mod+F5 exec pactl set-sink-mute @DEFAULT_SINK@ toggle
diff --git a/config/sway/conf.d/rick/output.config b/config/sway/conf.d/rick/output.config
index 14f3c95..96361d4 100644
--- a/config/sway/conf.d/rick/output.config
+++ b/config/sway/conf.d/rick/output.config
@@ -1,2 +1 @@
 output * bg ~/documents/ressources/wallpapers/building_cyberpunk.jpg fill
-output eDP-1 scale 2
diff --git a/config/sway/conf.d/rick/startup.config b/config/sway/conf.d/rick/startup.config
index 5a7cbbd..191b5fa 100644
--- a/config/sway/conf.d/rick/startup.config
+++ b/config/sway/conf.d/rick/startup.config
@@ -1,3 +1,4 @@
 exec swaymsg 'workspace $ws3; exec firefox'
 # launch mail workspace
 exec ~/.local/bin/launch_mail_worksplace.sh
+exec dbus-update-activation-environment --systemd DISPLAY
diff --git a/config/sway/conf.d/rick/variables.config b/config/sway/conf.d/rick/variables.config
index bdae338..bb66499 100644
--- a/config/sway/conf.d/rick/variables.config
+++ b/config/sway/conf.d/rick/variables.config
@@ -1,3 +1,3 @@
-set $term kitty
-set $menu exec $term --class=launcher ~/.local/bin/launcher.sh
+set $term foot
+set $menu exec $term --app-id=launcher --title=launcher ~/.local/bin/launcher.sh
 set $lock_bg ~/documents/ressources/wallpapers/morty.jpg