reorganized tint2, i3->volumeicon vol control

changed default font from XFT for compatibility with old applications
recolored luakit tabs
added volumeicon config
moved i3 volume controls to volumeicon, so changes are shown visually
changed zsh title style

diff --git a/base/.Xresources b/base/.Xresources
index 5cd2410b4994b6ca5bb87dc5eb6cf4a0c86840b1..6c2b039b390bf0a7eac17b251451c42db31d392b 100644 (file)
--- a/base/.Xresources
+++ b/base/.Xresources
@@ -1,5 +1,6 @@
 ! generic settings
 ! generic settings

-*font:                   xft:Dina:size=8
+!xft:Dina:size=8
+*font:                   -*-dina-medium-r-*-*-10-*-*-*-*-*-*-*

 
 ! Solarized colors, http://ethanschoonover.com/solarized
 !#define S_base03         #002b36
 
 ! Solarized colors, http://ethanschoonover.com/solarized
 !#define S_base03         #002b36

diff --git a/base/.zshrc b/base/.zshrc
index 51f3a34c618bce353f58410c23f080194b473e2d..9f13b6da6d828b732702267d3dd015fdb700747b 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -5,7 +5,7 @@ zstyle ':vcs_info:*' get-revision true
 zstyle ':vcs_info:git*' formats "(%F{green}%r/%b%f) %m%u%c "
 
 function precmd {
 zstyle ':vcs_info:git*' formats "(%F{green}%r/%b%f) %m%u%c "
 
 function precmd {

-    print -Pn "\e]0;${SSH_CLIENT+$USER@$HOST}%#zsh%(1j,:%j,):%~\a"
+    print -Pn "\e]0;${SSH_CLIENT+$USER@$HOST}%#%(1j,:%j,):%~\a"

     vcs_info
     if ((SECONDS - _exectime >= 5)) {
         # bell after long exec
     vcs_info
     if ((SECONDS - _exectime >= 5)) {
         # bell after long exec

diff --git a/xdg/i3/config b/xdg/i3/config
index 32327ebe135eb73b859baa7a6d60c438badbc173..8e78bfc894e11a53a66f91e8b925487ee99c528b 100644 (file)
--- a/xdg/i3/config
+++ b/xdg/i3/config
@@ -121,9 +121,6 @@ bindsym $mod+Shift+8 move container to workspace 8
 bindsym $mod+Shift+9 move container to workspace 9
 Bindsym $mod+Shift+0 move container to workspace 10
 
 bindsym $mod+Shift+9 move container to workspace 9
 Bindsym $mod+Shift+0 move container to workspace 10
 

-# rename current window
-bindsym $mod+t --no-startup-id xrename
-

 # reload the configuration file
 bindsym $mod+Shift+c reload
 # restart i3 inplace
 # reload the configuration file
 bindsym $mod+Shift+c reload
 # restart i3 inplace


@@ -135,11 +132,6 @@ bindsym $mod+Shift+e exec --no-startup-id i3-nagbar -t warning -m Exit? -b Yes '
 bindcode 198 exec --no-startup-id rotate set normal
 bindcode 204 exec --no-startup-id rotate right
 
 bindcode 198 exec --no-startup-id rotate set normal
 bindcode 204 exec --no-startup-id rotate right
 

-# volume buttons
-bindsym XF86AudioMute exec --no-startup-id mixer vol 0
-bindsym XF86AudioLowerVolume exec --no-startup-id mixer vol -5
-bindsym XF86AudioRaiseVolume exec --no-startup-id mixer vol +5
-

 # move and resize [floating] windows
 mode "translate" {
        bindsym $left   resize shrink width  20 px
 # move and resize [floating] windows
 mode "translate" {
        bindsym $left   resize shrink width  20 px


@@ -198,12 +190,15 @@ mode "translate" {
 }
 bindsym $mod+r mode "translate"
 
 }
 bindsym $mod+r mode "translate"
 

+# windows
+for_window [class="Gsimplecal"] floating enable
+for_window [class="XMixer"] floating enable
+

 # borders
 hide_edge_borders smart
 new_window pixel 1
 gaps inner 6
 smart_gaps on
 # borders
 hide_edge_borders smart
 new_window pixel 1
 gaps inner 6
 smart_gaps on

-for_window [class="Gsimplecal"] floating enable

 
 # misc
 workspace_auto_back_and_forth yes
 
 # misc
 workspace_auto_back_and_forth yes

diff --git a/xdg/i3status/tint2_cpu b/xdg/i3status/tint2-cpu-net
similarity index 100%
rename from xdg/i3status/tint2_cpu
rename to xdg/i3status/tint2-cpu-net

diff --git a/xdg/luakit/theme.lua b/xdg/luakit/theme.lua
index 7678414efdafb159794a469c3babcfd1a8343a02..d74b3175d8e48c7118d80808d144a70209e05574 100644 (file)
--- a/xdg/luakit/theme.lua
+++ b/xdg/luakit/theme.lua
@@ -85,14 +85,14 @@ theme.ibar_bg = S_base03
 
 -- Tab label
 theme.tab_fg          = S_base1
 
 -- Tab label
 theme.tab_fg          = S_base1

-theme.tab_bg          = "#884400"
-theme.tab_hover_bg    = "#4466ff"
-theme.tab_ntheme      = S_red --?
+theme.tab_bg          = "#221100"
+theme.tab_hover_bg    = theme.tab_bg
+theme.tab_ntheme      = S_red

 theme.selected_fg     = S_base2
 theme.selected_bg     = "#aa5500"
 theme.selected_fg     = S_base2
 theme.selected_bg     = "#aa5500"

-theme.selected_ntheme = S_magenta --?
-theme.loading_fg      = S_green
-theme.loading_bg      = S_base02
+theme.selected_ntheme = theme.selected_fg
+theme.loading_fg      = S_yellow
+theme.loading_bg      = S_base02 --unused

 
 theme.selected_private_tab_bg = S_violet
 theme.private_tab_bg          = S_magenta
 
 theme.selected_private_tab_bg = S_violet
 theme.private_tab_bg          = S_magenta

diff --git a/xdg/tint2/tint2rc b/xdg/tint2/tint2rc
index 7641f25098e209a7f5e3b39040be71a3c905648c..3c60a85c87783b2aee1a587d8e5c55769e4d50a2 100644 (file)
--- a/xdg/tint2/tint2rc
+++ b/xdg/tint2/tint2rc
@@ -1,4 +1,4 @@
-#---- Generated by tint2conf e587 ----
+#---- Generated by tint2conf 30a7 ----

 # See https://gitlab.com/o9000/tint2/wikis/Configure for 
 # full documentation of the configuration options.
 #-------------------------------------
 # See https://gitlab.com/o9000/tint2/wikis/Configure for 
 # full documentation of the configuration options.
 #-------------------------------------


@@ -51,7 +51,7 @@ border_color_pressed = #000000 0
 
 #-------------------------------------
 # Panel
 
 #-------------------------------------
 # Panel

-panel_items = T:SECB
+panel_items = T:SEECB

 panel_size = 100% 28
 panel_margin = 0 0
 panel_padding = 0 1 0
 panel_size = 100% 28
 panel_margin = 0 0
 panel_padding = 0 1 0


@@ -152,7 +152,7 @@ time1_timezone =
 time2_timezone = 
 time2_font = Dina 6
 clock_font_color = #93a1a1 100
 time2_timezone = 
 time2_font = Dina 6
 clock_font_color = #93a1a1 100

-clock_padding = 2 0
+clock_padding = 4 0

 clock_background_id = 0
 clock_tooltip = 
 clock_tooltip_timezone = 
 clock_background_id = 0
 clock_tooltip = 
 clock_tooltip_timezone = 


@@ -170,7 +170,7 @@ battery_low_cmd = notify-send -u critical "Battery low"
 bat1_font = Dina 8
 bat2_font = Dina 6
 battery_font_color = #93a1a1 100
 bat1_font = Dina 8
 bat2_font = Dina 6
 battery_font_color = #93a1a1 100

-battery_padding = 2 0
+battery_padding = 0 0

 battery_background_id = 0
 battery_hide = 101
 battery_lclick_command = 
 battery_background_id = 0
 battery_hide = 101
 battery_lclick_command = 


@@ -193,21 +193,43 @@ separator_padding = 5 0
 #-------------------------------------
 # Executor 1
 execp = new
 #-------------------------------------
 # Executor 1
 execp = new

-execp_command = ~/bin/i3status-tint2 cpu
+execp_command = ~/bin/tint2-wifi

 execp_interval = 0
 execp_interval = 0

-execp_has_icon = 0
+execp_has_icon = 1

 execp_cache_icon = 1
 execp_cache_icon = 1

+execp_continuous = 1
+execp_markup = 0
+execp_tooltip = 
+execp_lclick_command = wifimgr
+execp_rclick_command = 
+execp_mclick_command = 
+execp_uwheel_command = 
+execp_dwheel_command = 
+execp_font_color = #93a1a1 100
+execp_padding = 0 0
+execp_background_id = 0
+execp_centered = 0
+execp_icon_w = 0
+execp_icon_h = 0
+
+#-------------------------------------
+# Executor 2
+execp = new
+execp_command = ~/bin/tint2-i3status cpu-net
+execp_interval = 0
+execp_has_icon = 0
+execp_cache_icon = 0

 execp_continuous = 2
 execp_markup = 1
 execp_tooltip = 
 execp_continuous = 2
 execp_markup = 1
 execp_tooltip = 

-execp_lclick_command = 
+execp_lclick_command = wifimgr

 execp_rclick_command = 
 execp_mclick_command = 
 execp_uwheel_command = 
 execp_dwheel_command = 
 execp_font = Dina 8
 execp_font_color = #93a1a1 100
 execp_rclick_command = 
 execp_mclick_command = 
 execp_uwheel_command = 
 execp_dwheel_command = 
 execp_font = Dina 8
 execp_font_color = #93a1a1 100

-execp_padding = 2 0
+execp_padding = 0 0

 execp_background_id = 0
 execp_centered = 1
 execp_icon_w = 0
 execp_background_id = 0
 execp_centered = 1
 execp_icon_w = 0

diff --git a/xdg/volumeicon/volumeicon b/xdg/volumeicon/volumeicon
new file mode 100644 (file)
index 0000000..f3bf5b1
--- /dev/null
+++ b/xdg/volumeicon/volumeicon
@@ -0,0 +1,20 @@
+[StatusIcon]
+stepsize=5
+lmb_slider=true
+mmb_mute=true
+use_horizontal_slider=false
+show_sound_level=true
+use_transparent_background=false
+onclick=~/bin/xmixer
+theme=Default
+
+[Hotkeys]
+up_enabled=true
+down_enabled=true
+mute_enabled=false
+up=XF86AudioRaiseVolume
+down=XF86AudioLowerVolume
+mute=XF86AudioMute
+
+[Alsa]
+card=default