.Xresources changes, fixed cursors, tint2 i3 mode

diff --git a/base/.Xresources b/base/.Xresources
index 7bccb528acc43e0993f94f7d2edc2dfe4d34273e..2297915f8506aba842df1060c9c6d635f8f9e159 100644 (file)
--- a/base/.Xresources
+++ b/base/.Xresources
@@ -1,6 +1,6 @@
 ! fonts
 ! fonts

-!xft:Dina:size=8
-*font:                    -*-dina-medium-r-*-*-10-*-*-*-*-*-*-*
+*font:                    -windows-dina-medium-r-normal--10-80-96-96-c-70-\
+microsoft-cp1252

 *faceName:                Dina
 *faceSize:                8
 Xft.antialias:            true
 *faceName:                Dina
 *faceSize:                8
 Xft.antialias:            true


@@ -9,7 +9,11 @@ Xft.hinting:              true
 Xft.hintstyle:            hintslight
 Xft.rgba:                 none
 
 Xft.hintstyle:            hintslight
 Xft.rgba:                 none
 

-! Solarized colors, http://ethanschoonover.com/solarized
+! theming
+Xcursor.theme:            Paper
+
+! colors
+! http://ethanschoonover.com/solarized

 !#define S_base03          #002b36
 #define S_base03          #000a0d
 #define S_base02          #073642
 !#define S_base03          #002b36
 #define S_base03          #000a0d
 #define S_base02          #073642


@@ -88,6 +92,11 @@ URxvt.matcher.rend.0:     Uline Bold fg6
 URxvt.matcher.launcher.1: urxvtc -e vim +$2 $1
 URxvt.keysym.M-o:         matcher:last
 URxvt.keysym.M-u:         matcher:list
 URxvt.matcher.launcher.1: urxvtc -e vim +$2 $1
 URxvt.keysym.M-o:         matcher:last
 URxvt.keysym.M-u:         matcher:list

+!URxvt.keysym.M-S-equal:   font-size:increase
+URxvt.keysym.M-plus:      font-size:increase
+URxvt.keysym.M-minus:     font-size:decrease
+URxvt.keysym.M-equal:     font-size:reset
+URxvt.keysym.M-slash:     font-size:show

 
 URxvt.print-pipe:         cat > "$HOME/urxvt-$(date +'%Y-%m-%d-%H%M%S')"
 
 
 URxvt.print-pipe:         cat > "$HOME/urxvt-$(date +'%Y-%m-%d-%H%M%S')"
 

diff --git a/base/.zshrc b/base/.zshrc
index 33035b522d36cf8df1ebf6fe543a0fbe7e2f9fee..0424a8125c4254f8770b24b434b966285ca14fe0 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -77,9 +77,10 @@ zstyle ':vcs_info:*' enable git
 zstyle ':vcs_info:git*' formats       "%c%u%%F{green}%r/%b%%f/%%F{yellow}%S%%f"
 zstyle ':vcs_info:git*' actionformats "%%F{red}(%a)%%f %c%u%%F{green}%r/%b%%f/\
 %%F{yellow}%S%%f"
 zstyle ':vcs_info:git*' formats       "%c%u%%F{green}%r/%b%%f/%%F{yellow}%S%%f"
 zstyle ':vcs_info:git*' actionformats "%%F{red}(%a)%%f %c%u%%F{green}%r/%b%%f/\
 %%F{yellow}%S%%f"

-zstyle ':vcs_info:git*' check-for-changes true
-zstyle ':vcs_info:git*' stagedstr      "%F{blue}+"
-zstyle ':vcs_info:git*' unstagedstr    "%F{red}*"
+#zstyle ':vcs_info:git*' check-for-changes true #too slow
+zstyle ':vcs_info:git*' check-for-staged-changes true
+zstyle ':vcs_info:git*' stagedstr   "%F{blue}+"
+zstyle ':vcs_info:git*' unstagedstr "%F{red}*"

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

diff --git a/xdg/gtk-3.0/settings.ini b/xdg/gtk-3.0/settings.ini
index 444e1c25e2fdb305bf0ed8fba5d0f3eddf377c53..ac357d9aa78225f64d50383ea8f243398192fe80 100644 (file)
--- a/xdg/gtk-3.0/settings.ini
+++ b/xdg/gtk-3.0/settings.ini
@@ -2,4 +2,15 @@
 gtk-theme-name=Blackbird
 gtk-icon-theme-name=Paper-Mono-Dark
 gtk-font-name=Dina 10
 gtk-theme-name=Blackbird
 gtk-icon-theme-name=Paper-Mono-Dark
 gtk-font-name=Dina 10

-gtk-cursor-theme-name=Adwaita
+gtk-cursor-theme-name=Paper
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
+gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR
+gtk-button-images=1
+gtk-menu-images=1
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintslight
+gtk-xft-rgba=none

diff --git a/xdg/tint2/tint2rc b/xdg/tint2/tint2rc
index 30491397f92142cbe75756261df4df9046f7f27f..8625e9e49e824ced6d9238508f5894de7e7ad0e0 100644 (file)
--- a/xdg/tint2/tint2rc
+++ b/xdg/tint2/tint2rc
@@ -1,4 +1,4 @@
-#---- Generated by tint2conf 573e ----
+#---- Generated by tint2conf 6694 ----

 # 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.
 #-------------------------------------


@@ -49,9 +49,20 @@ border_color_hover = #000000 0
 background_color_pressed = #000000 0
 border_color_pressed = #000000 0
 
 background_color_pressed = #000000 0
 border_color_pressed = #000000 0
 

+# Background 5: 
+rounded = 0
+border_width = 1
+border_sides = TBLR
+background_color = #268bd2 100
+border_color = #4466ff 100
+background_color_hover = #000000 0
+border_color_hover = #000000 0
+background_color_pressed = #000000 0
+border_color_pressed = #000000 0
+

 #-------------------------------------
 # Panel
 #-------------------------------------
 # Panel

-panel_items = T:SEECB
+panel_items = ET: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


@@ -196,6 +207,29 @@ separator_padding = 5 0
 #-------------------------------------
 # Executor 1
 execp = new
 #-------------------------------------
 # Executor 1
 execp = new

+execp_command = ~/bin/tint2-i3mode
+execp_interval = 0
+execp_has_icon = 0
+execp_cache_icon = 0
+execp_continuous = 1
+execp_markup = 1
+execp_tooltip = 
+execp_lclick_command = i3-msg mode default
+execp_rclick_command = 
+execp_mclick_command = 
+execp_uwheel_command = 
+execp_dwheel_command = 
+execp_font = Dina 10
+execp_font_color = #fdf6e3 100
+execp_padding = 10 0
+execp_background_id = 5
+execp_centered = 0
+execp_icon_w = 0
+execp_icon_h = 0
+
+#-------------------------------------
+# Executor 2
+execp = new

 execp_command = ~/bin/tint2-wifi
 execp_interval = 0
 execp_has_icon = 1
 execp_command = ~/bin/tint2-wifi
 execp_interval = 0
 execp_has_icon = 1


@@ -216,7 +250,7 @@ execp_icon_w = 0
 execp_icon_h = 0
 
 #-------------------------------------
 execp_icon_h = 0
 
 #-------------------------------------

-# Executor 2
+# Executor 3

 execp = new
 execp_command = ~/bin/tint2-i3status cpu-net
 execp_interval = 0
 execp = new
 execp_command = ~/bin/tint2-i3status cpu-net
 execp_interval = 0

diff --git a/xdg/user-dirs.dirs b/xdg/user-dirs.dirs
new file mode 100644 (file)
index 0000000..b561e0a
--- /dev/null
+++ b/xdg/user-dirs.dirs
@@ -0,0 +1,8 @@
+XDG_DESKTOP_DIR="$HOME"
+XDG_DOWNLOAD_DIR="$HOME/dls"
+XDG_TEMPLATES_DIR="$HOME"
+XDG_PUBLICSHARE_DIR="$HOME"
+XDG_DOCUMENTS_DIR="$HOME/docs"
+XDG_MUSIC_DIR="$HOME/music"
+XDG_PICTURES_DIR="$HOME/pics"
+XDG_VIDEOS_DIR="$HOME/vids"