From c12494cdb41bde3058a99fd0a299863cc559d54f Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Sun, 20 May 2018 19:38:00 +0200 Subject: [PATCH] i3 color from .Xresources, firefox default browser, border for terminal window, fix for new i3lock-color version --- config/.config/i3/config | 78 ++++++++++++----------------------- config/.config/polybar/config | 4 +- config/.scripts/i3lock.py | 9 ++-- emacs/.emacs.d/config.org | 2 +- 4 files changed, 34 insertions(+), 59 deletions(-) diff --git a/config/.config/i3/config b/config/.config/i3/config index a200ee6..1a3408a 100644 --- a/config/.config/i3/config +++ b/config/.config/i3/config @@ -90,7 +90,7 @@ for_window [class="Thus"] floating enable border normal for_window [class="Timeset-gui"] floating enable border normal for_window [class="(?i)virtualbox"] floating enable border normal for_window [title="KeePassX$"] floating enable border normal - +for_window [title="(?i)termite"] border pixel 3 # switch to workspace with urgent window automatically for_window [urgent=latest] focus @@ -153,7 +153,7 @@ bindsym XF86AudioPlay exec "if [ `cat /home/$USER/.scripts/playstate` = 0 ]; the bindsym XF86AudioStop exec "playerctl stop && echo '0'>/home/$USER/.scripts/playstate" # Application Shortcuts -bindsym $mod+b exec env GTK_THEME=Materia:light waterfox +bindsym $mod+b exec firefox bindsym $mod+e exec source ~/.zshrc && termite -e 'ranger' bindsym $mod+m exec thunderbird @@ -236,58 +236,34 @@ bindsym $mod+0 exec --no-startup-id "python ~/.scripts/i3lock.py" # to: # background $term_background # Same logic applied to everything else. -# set_from_resource $term_background background -# set_from_resource $term_foreground foreground -# set_from_resource $term_color0 color0 -# set_from_resource $term_color1 color1 -# set_from_resource $term_color2 color2 -# set_from_resource $term_color3 color3 -# set_from_resource $term_color4 color4 -# set_from_resource $term_color5 color5 -# set_from_resource $term_color6 color6 -# set_from_resource $term_color7 color7 -# set_from_resource $term_color8 color8 -# set_from_resource $term_color9 color9 -# set_from_resource $term_color10 color10 -# set_from_resource $term_color11 color11 -# set_from_resource $term_color12 color12 -# set_from_resource $term_color13 color13 -# set_from_resource $term_color14 color14 -# set_from_resource $term_color15 color15 - -# Color palette used for i3 -# Variables are set based on the documentation: -# https://i3wm.org/dovs/userguide.html#variables -# Changing the value of one of the variables will -# effect all the areas with the same color. -set $i3_color1 #f9faf9 -set $i3_color2 #595b5b -set $i3_color3 #353836 -set $i3_color4 #16a085 -set $i3_color5 #fdf6e3 -set $i3_color6 #eee8d5 -set $i3_color7 #e5201d -set $i3_color8 #808380 -set $i3_color9 #434745 -set $i3_color10 #454948 -set $i3_color11 #80fff9 -set $i3_color12 #fdf6e3 -set $i3_color13 #cb4b16 -set $i3_color14 #268bd2 -set $i3_color15 #000000 -set $i3_color16 #ffffff -set $i3_color17 #0c0c0c - + set_from_resource $term_background background + set_from_resource $term_foreground foreground + set_from_resource $term_color0 color0 + set_from_resource $term_color1 color1 + set_from_resource $term_color2 color2 + set_from_resource $term_color3 color3 + set_from_resource $term_color4 color4 + set_from_resource $term_color5 color5 + set_from_resource $term_color6 color6 + set_from_resource $term_color7 color7 + set_from_resource $term_color8 color8 + set_from_resource $term_color9 color9 + set_from_resource $term_color10 color10 + set_from_resource $term_color11 color11 + set_from_resource $term_color12 color12 + set_from_resource $term_color13 color13 + set_from_resource $term_color14 color14 + set_from_resource $term_color15 color15 # Theme colors -# class border backgr. text indic. child_border -client.focused $i3_color4 $i3_color8 $i3_color11 $i3_color12 -client.focused_inactive $i3_color9 $i3_color9 $i3_color4 $i3_color10 -client.unfocused $i3_color9 $i3_color9 $i3_color4 $i3_color10 -client.urgent $i3_color13 $i3_color12 $i3_color4 $i3_color14 -client.placeholder $i3_color15 $i3_color17 $i3_color16 $i3_color15 $i3_color17 +# class backgr. border text indic. child_border +client.focused $term_color4 $term_color4 $term_color15 $term_color12 +client.focused_inactive $term_color8 $term_color8 $term_color15 $term_color10 +client.unfocused $term_color8 $term_color8 $term_color15 $term_color10 +client.urgent $term_color13 $term_color12 $term_color15 $term_color14 +client.placeholder $term_color15 $term_color15 $term_color15 $term_color15 -client.background $i3_color10 +client.background $term_color10 ############################# ### settings for i3-gaps: ### diff --git a/config/.config/polybar/config b/config/.config/polybar/config index d82191b..49899cd 100644 --- a/config/.config/polybar/config +++ b/config/.config/polybar/config @@ -1,6 +1,6 @@ [colors] -background = ${xrdb:color0:#223} -background-alt = ${xrdb:color8:#fa4} +background = ${xrdb:color0:#22300} +background-alt = ${xrdb:color8:#fa400} foreground = ${xrdb:color7:#cdd} foreground-alt = ${xrdb:color15:#eef} black = ${xrdb:color0:#233} diff --git a/config/.scripts/i3lock.py b/config/.scripts/i3lock.py index d534bc5..f5614d2 100755 --- a/config/.scripts/i3lock.py +++ b/config/.scripts/i3lock.py @@ -49,7 +49,7 @@ def lock_config(): # clock pos clock_x = left_margin - clock_y = int(res_y * (83 / 100)) + clock_y = int(res_y * (90 / 100)) date_x = left_margin date_y = clock_y + default_fontsize @@ -98,11 +98,10 @@ def lock_config(): # Wrong Text lock_wrong_text = '--wrongtext="Noope"' # Text Size - lock_text_size = '--textsize=20' + # lock_text_size = '--textsize=20' # Ring Position - lock_texts = '{} {} {}'.format(lock_right_text, lock_wrong_text, - lock_text_size) - lock_pos = '--indpos={}:{}'.format(int(clock_x)+380, int(clock_y+90)) + lock_texts = '{} {}'.format(lock_right_text, lock_wrong_text) + lock_pos = '--indpos={}:{}'.format(int(clock_x)+370, int(clock_y)) # Ring size ring_size = 40 lock_radius = '--radius {}'.format(ring_size) diff --git a/emacs/.emacs.d/config.org b/emacs/.emacs.d/config.org index 3f736c0..4d5ea3f 100644 --- a/emacs/.emacs.d/config.org +++ b/emacs/.emacs.d/config.org @@ -88,7 +88,7 @@ Powerline for Emacs '((".*" . "~/.emacs-saves/"))) (setq auto-save-file-name-transforms '((".*" "~/.emacs-saves/" t))) - +(setq custom-file "~/.emacs.d/config.el") #+END_SRC * Functions