From 136b4dcffb81175cf7cd1f3b53351ee1313b7907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Sat, 12 Apr 2014 00:30:24 +0200 Subject: [PATCH 1/2] Replace terminator by newly configured urxvt. --- i3/i3/config | 3 +- vim/vimrc | 8 ++-- x/Xresources | 115 +++++++++++++++++++++++++++++++++++++++++---------- x/xinitrc | 4 +- 4 files changed, 103 insertions(+), 27 deletions(-) diff --git a/i3/i3/config b/i3/i3/config index 26f6ca8..8c7375c 100644 --- a/i3/i3/config +++ b/i3/i3/config @@ -19,7 +19,7 @@ set $mod Mod4 # The default terminal - set $terminal terminator + set $terminal urxvt # Path to the exit script set $path_i3exit ~/.i3/scripts/i3exit.bash @@ -291,6 +291,7 @@ for_window [class="^Terminator$"] border 1pixel for_window [class="^Firefox$"] border 1pixel for_window [class="^Truecrypt$"] floating enable + for_window [class="^URxvt$"] border 1pixel ################################################################################ ### APPLICATION AUTOSTART ###################################################### diff --git a/vim/vimrc b/vim/vimrc index 5900301..e4eeaac 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -59,9 +59,7 @@ Bundle 'bling/vim-airline' " date/time support for CTRL-x and CTRL-a Bundle 'tpope/vim-speeddating' -filetype plugin indent on - -set t_Co=256 +set t_Co=16 " setup for the solarized color theme set background=dark @@ -72,6 +70,8 @@ let g:solarized_visibility="normal" syntax enable colorscheme solarized +filetype plugin indent on + " setup for vim-airline let g:airline_left_sep = '▶' let g:airline_right_sep = '◀' @@ -240,3 +240,5 @@ autocmd BufWritePre * :call TrimWhiteSpace() "autocmd vimenter * NERDTree " close NERDTree when it's the only window left autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif + +call togglebg#map("") diff --git a/x/Xresources b/x/Xresources index 19d1b41..abedea7 100644 --- a/x/Xresources +++ b/x/Xresources @@ -1,27 +1,98 @@ ! mouse cursor setup Xcursor.theme: Vanilla-DMZ -!! urxvt setup -!! colored man pages -!URxvt.colorIT: #87af5f -!URxvt.colorBD: #d7d7d7 -!URxvt.colorUL: #87afd7 -! -!URxvt*.transparent: false -!! URxvt*.shading: 0 to 99 darkens, 101 to 200 lightens -!URxvt*.shading: 110 -! -!URxvt.scrollBar: false -! -!URxvt.font: xft:DejaVu Sans Mono:size=10 -! -!! clickable links opened in firefox -!!URxvt.perl-ext-common: default,matcher -!URxvt.url-launcher: /usr/bin/firefox -!URxvt.matcher.button: 1 -! -!! enable tabs -!! enable scrollwheel support -!URxvt.perl-ext-common: default,tabbed,vtwheeel +URxvt.scrollBar: false +URxvt.font: xft:DejaVu Sans Mono:size=10 +! clickable URLs +!URxvt.perl-ext-common: default,matcher +!URxvt.urlLauncher: firefox +!URxvt.matcher.button: 1 +URxvt.intensityStyles: false + +!URxvt.scrollTtyKeypress: true + +URxvt.saveLines: 10000 + +URxvt.fading: 20 + +URxvt.termName: urxvt + +URxvt.cursorBlink: true + +!! drop in Solarized colorscheme for Xresources/Xdefaults + +!!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB +!!--------- ------- ---- ------- ----------- ---------- ----------- ----------- +!!base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 +!!base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 +!!base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 +!!base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 +!!base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 +!!base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 +!!base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 +!!base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 +!!yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 +!!orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 +!!red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 +!!magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 +!!violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 +!!blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 +!!cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 +!!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 + +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 + +*background: S_base03 +*foreground: S_base00 +*cursorColor: S_base1 +*pointerColorBackground:S_base01 +*pointerColorForeground:S_base1 + +!! black dark/light +*color0: S_base02 +*color8: S_base03 + +!! red dark/light +*color1: S_red +*color9: S_orange + +!! green dark/light +*color2: S_green +*color10: S_base01 + +!! yellow dark/light +*color3: S_yellow +*color11: S_base00 + +!! blue dark/light +*color4: S_blue +*color12: S_base0 + +!! magenta dark/light +*color5: S_magenta +*color13: S_violet + +!! cyan dark/light +*color6: S_cyan +*color14: S_base1 + +!! white dark/light +*color7: S_base2 +*color15: S_base3 diff --git a/x/xinitrc b/x/xinitrc index 06585da..1138a61 100755 --- a/x/xinitrc +++ b/x/xinitrc @@ -10,6 +10,8 @@ fi [ -f /etc/xprofile ] && source /etc/xprofile [ -f ~/.xprofile ] && source ~/.xprofile +export LANG=en_US.UTF-8 + # keyboard options keyboard_layout=de @@ -27,7 +29,7 @@ setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant" # set key repeat delay xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed" -[[ -f ~/.Xresources ]] && xrdb ~/.Xresources +[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources SESSION_CONF=$(bash "$HOME/.i3/scripts/genconfig.bash") exec i3 -c "$SESSION_CONF" >> ~/.i3/logs/i3.log From c7a88c31792fb2ec65b446c6562e36aca00c0618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Sat, 12 Apr 2014 00:32:13 +0200 Subject: [PATCH 2/2] Enable fallback wallpaper mode. Works only with the new version of wallchanger. Does not do any resolution checks, so you will get a random image which might not really fit your resolution. It's fallback after all :) --- i3/i3/config | 3 ++- i3/i3/data/{ => lockscreen}/lockscreen_1024x600.png | Bin .../data/{ => lockscreen}/lockscreen_1920x1080.png | Bin i3/i3/data/wallpaper | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) rename i3/i3/data/{ => lockscreen}/lockscreen_1024x600.png (100%) rename i3/i3/data/{ => lockscreen}/lockscreen_1920x1080.png (100%) create mode 120000 i3/i3/data/wallpaper diff --git a/i3/i3/config b/i3/i3/config index 8c7375c..6ac24bb 100644 --- a/i3/i3/config +++ b/i3/i3/config @@ -43,6 +43,7 @@ set $path_wallchanger ~/.i3/scripts/wallchanger.bash set $wallpaper_directory "$HOME/Bilder/wallpaper/misc" set $wallpaper_logfile "$HOME/.i3/logs/wallpaper.log" + set $wallpaper_fallback "$HOME/.i3/data/wallpaper/" set $wallpaper_interval 900 set $workspace1 1:www @@ -300,7 +301,7 @@ set $redshift_lat_long 49.5:11 set $redshift_colortemp 5500:3700 - exec --no-startup-id $path_wallchanger $wallpaper_directory $wallpaper_interval > $wallpaper_logfile & + exec --no-startup-id $path_wallchanger $wallpaper_directory $wallpaper_interval $wallpaper_fallback > $wallpaper_logfile & exec --no-startup-id wicd-gtk --tray & exec --no-startup-id gtk-redshift -l $redshift_lat_long -t $redshift_colortemp & #exec --no-startup-id conky diff --git a/i3/i3/data/lockscreen_1024x600.png b/i3/i3/data/lockscreen/lockscreen_1024x600.png similarity index 100% rename from i3/i3/data/lockscreen_1024x600.png rename to i3/i3/data/lockscreen/lockscreen_1024x600.png diff --git a/i3/i3/data/lockscreen_1920x1080.png b/i3/i3/data/lockscreen/lockscreen_1920x1080.png similarity index 100% rename from i3/i3/data/lockscreen_1920x1080.png rename to i3/i3/data/lockscreen/lockscreen_1920x1080.png diff --git a/i3/i3/data/wallpaper b/i3/i3/data/wallpaper new file mode 120000 index 0000000..0c46340 --- /dev/null +++ b/i3/i3/data/wallpaper @@ -0,0 +1 @@ +lockscreen \ No newline at end of file