Update i3 configuration

4 files changed, 54 insertions, 43 deletions

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 58df58b..e1b66c7 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -36,7 +36,9 @@ set_from_resource $color7  i3wm.COLOR7  #e6e6e6
 set_from_resource $color15 i3wm.COLOR15 #eeeeee
 
 # The workspaces are just the number, without label.
-# Icon will be associated with polybar
+# This allow to set only an icon, without any other texte (if the workspace has a
+# name, polybar will always display it, it is not possible to replace the label
+# with the icon)
 set  $workspace_1 1:
 set  $workspace_2 2:
 set  $workspace_3 3:
@@ -49,7 +51,7 @@ set  $workspace_9 9:
 set  $workspace_10 10:
 set  $workspace_11 11:
 set  $workspace_12 12:
-set  $Teams     98:
+set  $Messages  98:
 set  $Inkscape  99:
 set  $Mail      100:
 set  $Web       101:
@@ -170,18 +172,18 @@ bindsym $mod+a focus parent
 
 
 # switch to workspace
-bindsym $modAltkey+F1 workspace $workspace_1
-bindsym $modAltkey+F2 workspace $workspace_2
-bindsym $modAltkey+F3 workspace $workspace_3
-bindsym $modAltkey+F4 workspace $workspace_4
-bindsym $modAltkey+F5 workspace $workspace_5
-bindsym $modAltkey+F6 workspace $workspace_6
-bindsym $modAltkey+F7 workspace $workspace_7
-bindsym $modAltkey+F8 workspace $workspace_8
-bindsym $modAltkey+F9 workspace $workspace_9
-bindsym $modAltkey+F10 workspace $workspace_10
-bindsym $modAltkey+F11 workspace $workspace_11
-bindsym $modAltkey+F12 workspace $workspace_12
+bindsym $modAltkey+F1 workspace number $workspace_1
+bindsym $modAltkey+F2 workspace number $workspace_2
+bindsym $modAltkey+F3 workspace number $workspace_3
+bindsym $modAltkey+F4 workspace number $workspace_4
+bindsym $modAltkey+F5 workspace number $workspace_5
+bindsym $modAltkey+F6 workspace number $workspace_6
+bindsym $modAltkey+F7 workspace number $workspace_7
+bindsym $modAltkey+F8 workspace number $workspace_8
+bindsym $modAltkey+F9 workspace number $workspace_9
+bindsym $modAltkey+F10 workspace number $workspace_10
+bindsym $modAltkey+F11 workspace number $workspace_11
+bindsym $modAltkey+F12 workspace number $workspace_12
 
 bindsym XF86Mail        workspace $Mail
 bindsym XF86Calculator  workspace $Musique
@@ -243,10 +245,9 @@ bindsym $modAltkey+Escape workspace back_and_forth
 bindsym shift+$modAltkey+Escape move container to workspace back_and_forth
 bindsym shift+XF86HomePage    exec pcmanfm-qt
 
-assign [class="Microsoft Teams"]    $Teams
-assign [class="Inkscape"]    $Inkscape
-
-for_window [class="crimson"] floating enable
+assign [class="Microsoft Teams"]    $Messages
+assign [class="Signal"]             $Messages
+assign [class="Inkscape"]           $Inkscape
 
 # Add background, with a gradient on top
 exec --no-startup-id ~/scripts/i3/wallpaper.sh ~/wallpaper/current.jpg
@@ -255,5 +256,6 @@ exec --no-startup-id xrdb .Xdefaults
 exec --no-startup-id "xrdb .Xdefaults; polybar i3"
 #exec --no-startup-id "unclutter"
 exec_always --no-startup-id /home/sebastien/Projets/ocaml/i3_workspaces/i3_workspaces
+exec_always --no-startup-id /home/sebastien/scripts/i3/gaps.sh
 
 # for_window [class="URxvt"] layout tabbed
diff --git a/i3/scripts/i3/gaps.sh b/i3/scripts/i3/gaps.sh
new file mode 100755
index 0000000..4e09c01
--- /dev/null
+++ b/i3/scripts/i3/gaps.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+i3-msg gaps inner all set 5
+i3-msg gaps outer all set 0
+
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 6eb86f0..9c5f683 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -100,7 +100,7 @@ label-empty-padding = 2
 label-active-font = 0
 type = internal/i3
 format = [<label-state>] <label-mode>
-index-sort = true
+index-sort = false
 wrapping-scroll = false
 
 label-mode = %mode%
@@ -112,50 +112,53 @@ label-mode-padding = 2
 #border-colol = #000
 
 #label-focused = %name%
-label-focused = %name%%icon%
+label-focused = %icon%%name%
 label-focused-background = ${colors.foreground-alt}
 label-focused-padding = ${module/bspwm.label-focused-padding}
 label-focused-foreground = ${colors.foreground}
 
-label-unfocused = %name%%icon%
+label-unfocused = %icon%%name%
 label-unfocused-padding = ${module/bspwm.label-occupied-padding}
 label-unfocused-background = ${colors.background-alt}
 label-unfocused-foreground = ${colors.foreground-alt}
 
-label-urgent = %name%%icon%
+label-urgent = %icon%%name%
 label-urgent-background = ${colors.background}
 label-urgent-foreground = ${module/bspwm.label-urgent-background}
 label-urgent-underline = ${module/bspwm.label-urgent-background}
 label-urgent-padding = ${module/bspwm.label-urgent-padding}
 
-label-visible = %name%%icon%
+label-visible = %icon%%name%
 label-visible-background = ${self.label-focused-background}
 #label-visible-underline = ${self.label-focused-underline}
 label-visible-padding = ${self.label-focused-padding}
 
 strip-wsnumbers = true
 
+fuzzy-match = true
+
 # All the characters comes from materialdesignicons.
-ws-icon-0  = 0;0
-ws-icon-1  = 1:;
-ws-icon-2  = 2:;
-ws-icon-3  = 3:;
-ws-icon-4  = 4:;
-ws-icon-5  = 5:;
-ws-icon-6  = 6:;
-ws-icon-7  = 7:;
-ws-icon-8  = 8:;
-ws-icon-9  = 9:;
-ws-icon-10 = 10:;
-ws-icon-11 = 11:;
-ws-icon-12 = 12:;
-ws-icon-13 = 50:;︹
-ws-icon-14 = 51:;
-ws-icon-15 = 98:;
-ws-icon-16 = 99:;
-ws-icon-17 = 100:;
-ws-icon-18 = 101:;
-ws-icon-19 = 102:;
+ws-icon-0  = 1:;
+ws-icon-1  = 2:;
+ws-icon-2  = 3:;
+ws-icon-3  = 4:;
+ws-icon-4  = 5:;
+ws-icon-5  = 6:;
+ws-icon-6  = 7:;
+ws-icon-7  = 8:;
+ws-icon-8  = 9:;
+ws-icon-9  = 10:;
+ws-icon-10 = 11:;
+ws-icon-11 = 12:;
+ws-icon-12 = 50:;︹
+ws-icon-13 = 51:;
+ws-icon-14 = 98:;𣏕
+ws-icon-15 = 99:;
+ws-icon-16 = 100:;
+ws-icon-17 = 101:;
+ws-icon-18 = 102:;
+ws-icon-19 = Musique;䀘
+ws-icon-20 = Edit;
 ;ws-icon-default = 
 
 ; Separator in between workspaces
diff --git a/rofi/rename.sh b/rofi/rename.sh
index dcdbcd8..30dde16 100755
--- a/rofi/rename.sh
+++ b/rofi/rename.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 if [ -z $1 ]; then
+    echo "Edit:"
+    echo "Musique:"
   exit 0
 else
   i3-msg "rename workspace to ${1}" > /dev/null