Update config

3 files changed, 69 insertions, 58 deletions

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index bea1e04..34fb1a2 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -7,56 +7,60 @@
 # See .Xdefaults for the color list
 
 # Red
-set  $color1  #b32c59
-set  $color9  #e6175c
+set_from_resource $color1  i3wm.COLOR1  #b32c59
+set_from_resource $color9  i3wm.COLOR9  #e6175c
 
 # Green
-set  $color2  #86b359
-set  $color10 #a1e65c
+set_from_resource $color2  i3wm.COLOR2  #86b359
+set_from_resource $color10 i3wm.COLOR10 #a1e65c
 
-set  $color3  #b38659
-set  $color11 #e6a15c
+set_from_resource $color3  i3wm.COLOR3  #b38659
+set_from_resource $color11 i3wm.COLOR11 #e6a15c
 
 # Blue
-set  $color4  #5986b3
-set  $color12 #5ca1e6
+set_from_resource $color4  i3wm.COLOR4  #5986b3
+set_from_resource $color12 i3wm.COLOR12 #5ca1e6
 
-set  $color5  #8659b3
-set  $color13 #a15ce6
+set_from_resource $color5  i3wm.COLOR5  #8659b3
+set_from_resource $color13 i3wm.COLOR13 #a15ce6
 
-set  $color6  #59b386
-set  $color14 #5ce6a1
+# Cyan
+set_from_resource $color6  i3wm.COLOR6  #59b386
+set_from_resource $color14 i3wm.COLOR14 #5ce6a1
 
-set  $color0  #444444
-set  $color8  #0a0a0a
+# Black
+set_from_resource $color0  i3wm.COLOR0  #444444
+set_from_resource $color8  i3wm.COLOR8  #0a0a0a
 
-set  $color7  #e6e6e6
-set  $color15 #eeeeee
+set_from_resource $color7  i3wm.COLOR7  #e6e6e6
+set_from_resource $color15 i3wm.COLOR15 #eeeeee
 
 set  $Mail    100:Mail
 set  $Web     101:Web
 set  $Musique 102:Musique
 
-set $black #000000
+set_from_resource $black  i3wm.COLOR0  #444444
 
 # class                 border  backgr. text    indicator child_border
-client.focused          $color4 $color0 #ffffff #2e9ef4   $black
+client.focused          $color2 $color0 #ffffff $color0   $color2
 client.focused_inactive #333333 #5f676a #ffffff #484e50   $black
-client.unfocused        #333333 #222222 #888888 #292d2e   #ffffff
+client.unfocused        #333333 #222222 #888888 #292d2e   $color0
 client.urgent           #2f343a #900000 #ffffff #900000   $color1
 client.placeholder      $black  #0c0c0c #ffffff $black    $black
 
 # Remove title bar
-new_window pixel 1
-hide_edge_borders smart
+default_border pixel 2
+#hide_edge_borders smart
 #for_window [class="^.*"] border pixel 0
 
 # i3 gaps
 #smart_gaps on
-#gaps inner 10
-#gaps outer 0
+#smart_borders on
+gaps inner 15
+gaps outer 0
 
 #hide_edge_borders smart
+
 set $mod Mod4
 # The Alt Gr Key
 set $modAltkey Mod5
@@ -77,6 +81,7 @@ floating_modifier $mod
 
 # start a terminal
 bindsym $mod+Return exec urxvtcd
+#bindsym $mod+Return exec python3 /home/sebastien/Projets/kitty/__main__.py -1
 #bindsym $mod+Return exec /usr/local/bin/tabbed -c -r 2 st -w ''
 #bindsym $mod+Return exec /usr/local/bin/tabbed -c urxvtcd -embed
 
@@ -119,7 +124,7 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+c split h
+bindsym $mod+h split h
 
 # split in vertical orientation
 bindsym $mod+v split v
@@ -159,9 +164,9 @@ bindsym $modAltkey+F10 workspace 10
 bindsym $modAltkey+F11 workspace 11
 bindsym $modAltkey+F12 workspace 12
 
-bindsym XF86Mail        exec "~/scripts/i3/launch.sh $Mail thunderbird"
-bindsym XF86Calculator  exec "~/scripts/i3/launch.sh $Musique gmpc"
-bindsym XF86HomePage    exec "~/scripts/i3/launch.sh $Web firefox"
+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
@@ -196,16 +201,16 @@ mode "resize" {
         # Pressing right will grow the window’s width.
         # Pressing up will shrink the window’s height.
         # Pressing down will grow the window’s height.
-        bindsym t resize shrink width 10 px or 10 ppt
-        bindsym s resize grow height 10 px or 10 ppt
-        bindsym r resize shrink height 10 px or 10 ppt
-        bindsym n resize grow width 10 px or 10 ppt
+        bindsym t resize shrink width  5 px or 5 ppt
+        bindsym s resize grow height   5 px or 5 ppt
+        bindsym r resize shrink height 5 px or 5 ppt
+        bindsym n resize grow width    5 px or 5 ppt
 
         # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
+        bindsym Left resize shrink width 5 px or 5 ppt
+        bindsym Down resize grow height  5 px or 5 ppt
+        bindsym Up resize shrink height  5 px or 5 ppt
+        bindsym Right resize grow width  5 px or 5 ppt
 
         # back to normal: Enter or Escape
         bindsym Return mode "default"
@@ -226,11 +231,11 @@ for_window [class="crimson"] floating enable
 
 #exec_always --no-startup-id find ~/wallpaper/wallpaper/wallpapers -type f \( -name '*.jpg' -o -name '*.png' \) -print0 | shuf -n1 -z | xargs -0 feh --bg-scale
 
-#exec_always --no-startup-id feh --bg-scale ~/wallpaper/current.jpg
-#exec_always --no-startup-id hsetroot -fill ~/wallpaper/current.jpg  -add "#00770077" -add "#00000000" -addd "#00000000" 15  -gradient 0
-exec_always --no-startup-id /home/sebastien/scripts/i3/wallpaper_root.py
-exec_always compton -cCz --inactive-dim 0.4 --mark-ovredir-focused
-exec_always polybar i3
-exec_always xrdb .Xdefaults
+#exec_always --no-startup-id /home/sebastien/scripts/i3/wallpaper_root.py
+
+# Add background, with a gradient on top
+exec_always --no-startup-id hsetroot -fill ~/wallpaper/current.jpg -add "#ffffffff" -add "#ffffff00" -add "#00000000" -gradient 0
+exec_always --no-startup-id polybar i3
+exec_always --no-startup-id xrdb .Xdefaults
 
 # for_window [class="URxvt"] layout tabbed
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 4ae15b6..255d80d 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -8,16 +8,14 @@
 ;=====================================================
 
 [colors]
-background = #fff
-background-alt = #444
+background = ${xrdb:color4}
+background-alt = ${xrdb:color15}
 #foreground = #dfdfdf
-foreground = #000
-foreground-alt = #55
+foreground = ${xrdb:color7}
+foreground-alt = ${xrdb:color4}
 primary = #ffb52a
 secondary = #e60053
-alert = #b32c59
-
-color2 =  #86b359
+alert = ${xrdb:color1}
 
 [global/wm]
 margin-top = 0
@@ -28,7 +26,7 @@ margin-bottom = 0
 ;monitor = ${env:MONITOR:HDMI-1}
 width = 100%
 height = 30
-offset-x = 0
+#offset-x = 0
 offset-y = 0
 
 ; Prefer fixed center position for the `modules-center` block
@@ -55,7 +53,7 @@ module-margin-right = 2
 font-0 = Dejavu Sans Mono:size=12
 font-1 = materialdesignicons:size=16
 
-modules-left = xwindow
+#modules-left = i3
 modules-center = i3
 modules-right = date
 
@@ -84,7 +82,6 @@ type = internal/bspwm
 ws-icon-default = x
 
 label-focused = %index%
-label-focused-background = ${colors.background-alt}
 label-focused-underline= ${colors.primary}
 label-focused-padding = 2
 
@@ -111,17 +108,20 @@ label-mode-foreground = #000
 label-mode-background = ${colors.primary}
 
 border-size = 1
+border-colol = #000
+pseudo-transparency = true
 
 #label-focused = %name%
 label-focused = %icon%
 #label-focused-background = ${module/bspwm.label-focused-background}
-label-focused-background = #ffff
-label-focused-underline = #000
+label-focused-background = ${colors.background-alt}
+#label-focused-underline = ${colors.foreground}
 label-focused-padding = ${module/bspwm.label-focused-padding}
-#label-focused-foreground = #fff
+label-focused-foreground = ${colors.foreground-alt}
 
 label-unfocused = %icon%
 label-unfocused-padding = ${module/bspwm.label-occupied-padding}
+label-unfocused-background = ${colors.background}
 
 label-urgent = %icon%
 label-urgent-background = ${colors.background}
@@ -131,7 +131,7 @@ label-urgent-padding = ${module/bspwm.label-urgent-padding}
 
 label-visible = %icon%
 label-visible-background = ${self.label-focused-background}
-label-visible-underline = ${self.label-focused-underline}
+#label-visible-underline = ${self.label-focused-underline}
 label-visible-padding = ${self.label-focused-padding}
 
 strip-wsnumbers = true
@@ -152,7 +152,12 @@ ws-icon-11 = 9;
 ws-icon-12 = 10;
 ws-icon-13 = 11;
 ws-icon-14 = 12;
+ws-icon-default = ○
 
+; Separator in between workspaces
+#label-separator = " "
+#label-separator-padding = 0
+#label-separator-foreground = #ffb52a
 
 [module/date]
 type = internal/date
@@ -166,7 +171,7 @@ time-alt =  %d %b %H:%M
 
 format-prefix =
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #0a6cf5
+#format-underline = #0a6cf5
 
 #label = %date% %time%
 label = %time%
diff --git a/rofi/firefoxhistory.sh b/rofi/firefoxhistory.sh
index 6836fd2..b108e57 100755
--- a/rofi/firefoxhistory.sh
+++ b/rofi/firefoxhistory.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
+DB_FILE=~/.mozilla/firefox/qoh6qw4f.default/places.sqlite
 
 if [ -z $1 ]; then
-  sqlite3 ~/.mozilla/firefox/3n77lp68.default/places.sqlite 'SELECT url from moz_places order by frecency desc' | grep -vE "google.com/search|google.com/url|duckduckgo"
+  sqlite3 "${DB_FILE}" 'SELECT url from moz_places order by frecency desc' | grep -vE "q=|place:|moz-extension"
   exit 0
 else
-  i3-msg "exec firejail firefox --new-tab \"$*\"" > /dev/null
+  i3-msg "exec firefox --new-tab \"$*\"" > /dev/null
   exit 1
 fi