Update configuration

2 files changed, 47 insertions, 31 deletions

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index cbed167..9611aa0 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -35,10 +35,24 @@ set_from_resource $color8  i3wm.COLOR8  #0a0a0a
 set_from_resource $color7  i3wm.COLOR7  #e6e6e6
 set_from_resource $color15 i3wm.COLOR15 #eeeeee
 
-set  $Inkscape  99:Inkscape
-set  $Mail      100:Mail
-set  $Web       101:Web
-set  $Musique   102:Musique
+# The workspaces are just the number, without label.
+# Icon will be associated with polybar
+set  $workspace_1 1:
+set  $workspace_2 2:
+set  $workspace_3 3:
+set  $workspace_4 4:
+set  $workspace_5 5:
+set  $workspace_6 6:
+set  $workspace_7 7:
+set  $workspace_8 8:
+set  $workspace_9 9:
+set  $workspace_10 10:
+set  $workspace_11 11:
+set  $workspace_12 12:
+set  $Inkscape  99:
+set  $Mail      100:
+set  $Web       101:
+set  $Musique   102:
 
 set_from_resource $black  i3wm.COLOR0  #444444
 
@@ -152,37 +166,38 @@ bindsym $mod+a focus parent
 # focus the child container
 #bindsym $mod+d focus child
 
+
 # switch to workspace
-bindsym $modAltkey+F1 workspace 1
-bindsym $modAltkey+F2 workspace 2
-bindsym $modAltkey+F3 workspace 3
-bindsym $modAltkey+F4 workspace 4
-bindsym $modAltkey+F5 workspace 5
-bindsym $modAltkey+F6 workspace 6
-bindsym $modAltkey+F7 workspace 7
-bindsym $modAltkey+F8 workspace 8
-bindsym $modAltkey+F9 workspace 9
-bindsym $modAltkey+F10 workspace 10
-bindsym $modAltkey+F11 workspace 11
-bindsym $modAltkey+F12 workspace 12
+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 XF86Mail        exec --no-startup-id "~/scripts/i3/launch.sh $Mail thunderbird"
 bindsym XF86Calculator  exec --no-startup-id "~/scripts/i3/launch.sh $Musique gmpc"
 bindsym XF86HomePage    exec --no-startup-id "~/scripts/i3/launch.sh $Web firefox"
 
 # move focused container to workspace
-bindsym $modAltkey+Shift+F1  move container to workspace 1
-bindsym $modAltkey+Shift+F2  move container to workspace 2
-bindsym $modAltkey+Shift+F3  move container to workspace 3
-bindsym $modAltkey+Shift+F4  move container to workspace 4
-bindsym $modAltkey+Shift+F5  move container to workspace 5
-bindsym $modAltkey+Shift+F6  move container to workspace 6
-bindsym $modAltkey+Shift+F7  move container to workspace 7
-bindsym $modAltkey+Shift+F8  move container to workspace 8
-bindsym $modAltkey+Shift+F9  move container to workspace 9
-bindsym $modAltkey+Shift+F10 move container to workspace 10
-bindsym $modAltkey+Shift+F11 move container to workspace 11
-bindsym $modAltkey+Shift+F12 move container to workspace 12
+bindsym $modAltkey+Shift+F1  move container to workspace $workspace_1
+bindsym $modAltkey+Shift+F2  move container to workspace $workspace_2
+bindsym $modAltkey+Shift+F3  move container to workspace $workspace_3
+bindsym $modAltkey+Shift+F4  move container to workspace $workspace_4
+bindsym $modAltkey+Shift+F5  move container to workspace $workspace_5
+bindsym $modAltkey+Shift+F6  move container to workspace $workspace_6
+bindsym $modAltkey+Shift+F7  move container to workspace $workspace_7
+bindsym $modAltkey+Shift+F8  move container to workspace $workspace_8
+bindsym $modAltkey+Shift+F9  move container to workspace $workspace_9
+bindsym $modAltkey+Shift+F10 move container to workspace $workspace_10
+bindsym $modAltkey+Shift+F11 move container to workspace $workspace_11
+bindsym $modAltkey+Shift+F12 move container to workspace $workspace_12
 
 bindsym $mod+Shift+XF86HomePage   move container to workspace $Web
 bindsym $mod+Shift+XF86Mail       move container to workspace $Mail
@@ -238,7 +253,7 @@ for_window [class="crimson"] floating enable
 #exec_always --no-startup-id /home/sebastien/scripts/i3/wallpaper_root.py
 
 # Add background, with a gradient on top
-exec_always --no-startup-id ~/scripts/i3/wallpaper.sh
+exec_always --no-startup-id ~/scripts/i3/wallpaper.sh ~/wallpaper/current.jpg
 exec_always --no-startup-id xrdb .Xdefaults
 exec_always --no-startup-id compton -i .8 --focus-exclude '_NET_WM_NAME@:s = "rofi"' --blur-background --blur-kern '3,3,0.1,1,1,1,1,1,1,1'
 exec --no-startup-id "xrdb .Xdefaults; polybar i3"
diff --git a/i3/scripts/i3/wallpaper.sh b/i3/scripts/i3/wallpaper.sh
index cb76cef..5bc0d2b 100755
--- a/i3/scripts/i3/wallpaper.sh
+++ b/i3/scripts/i3/wallpaper.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 #image=$(find ~/wallpaper/wallpaper/wallpapers -type f \( -name '*.jpg' -o -name '*.png' \) -print0 | shuf -n1 -z | xargs -0)
-image=~/wallpaper/current.jpg
+image=$1
+#.virtualenvs/pywal/bin/wal -n -i "${image}" --saturate .8 -a 90
 hsetroot \
     -fill "${image}" \
     -add "#ffffffff" \
     -addd "#ffffff00" 5 \
     -addd "#ffffff00" 5 \
-    -add "#ffffffff" \
+    -add "#000000ff" \
     -gradient 0