From 71342bd9b863e5832e40184443ed3309a778340e Mon Sep 17 00:00:00 2001 From: Alex Janka Date: Mon, 28 Dec 2015 05:02:11 +1100 Subject: [PATCH] another scheme change --- bspwm/.config/bspwm/bspwmrc | 2 +- neovim/.config/nvim/init.vim | 2 +- panel/bspwm/panel/panel_bar | 99 +++++++++++++++++++++--------------- sxhkd/.config/sxhkd/sxhkdrc | 9 +++- x/.Xresources | 88 +++++++++++++++++++++----------- 5 files changed, 124 insertions(+), 76 deletions(-) diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index 1a4bf37..6bbddbc 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -3,7 +3,7 @@ wmname LG3D bspc config border_width 0 -bspc config window_gap 12 +bspc config window_gap 8 bspc config split_ratio 0.5 bspc config borderless_monocle true diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim index 57fae3e..26ab721 100644 --- a/neovim/.config/nvim/init.vim +++ b/neovim/.config/nvim/init.vim @@ -25,7 +25,7 @@ Plugin 'airblade/vim-gitgutter' call vundle#end() filetype plugin indent on -colorscheme gotham +colorscheme base16-atelierlakeside set laststatus=2 let g:airline#extensions#tabline#enabled = 1 diff --git a/panel/bspwm/panel/panel_bar b/panel/bspwm/panel/panel_bar index 10d5995..190e6c0 100755 --- a/panel/bspwm/panel/panel_bar +++ b/panel/bspwm/panel/panel_bar @@ -1,6 +1,6 @@ #! /bin/sh # -# Example panel for LemonBoy's bar +# Example panel for lemonbar . panel_colors @@ -10,65 +10,80 @@ while read -r line ; do case $line in S*) # clock output - sys_infos="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${line#?} %{B-}%{F-}" + sys="%{F$COLOR_SYS_FG}%{B$COLOR_SYS_BG} ${line#?} %{B-}%{F-}" ;; T*) # xtitle output title="%{F$COLOR_TITLE_FG}%{B$COLOR_TITLE_BG} ${line#?} %{B-}%{F-}" ;; W*) - # bspwm internal state - wm_infos="" + # bspwm's state + wm="" IFS=':' set -- ${line#?} while [ $# -gt 0 ] ; do item=$1 name=${item#?} case $item in - #M*) - # active monitor - # if [ $num_mon -gt 1 ] ; then - # wm_infos="$wm_infos %{F$COLOR_ACTIVE_MONITOR_FG}%{B$COLOR_ACTIVE_MONITOR_BG} ${name} %{B-}%{F-} " - # fi - # ;; - #m*) - # inactive monitor - # if [ $num_mon -gt 1 ] ; then - # wm_infos="$wm_infos %{F$COLOR_INACTIVE_MONITOR_FG}%{B$COLOR_INACTIVE_MONITOR_BG} ${name} %{B-}%{F-} " - # fi - # ;; - O*) - # focused occupied desktop - wm_infos="${wm_infos}%{F$COLOR_FOCUSED_OCCUPIED_FG}%{B$COLOR_FOCUSED_OCCUPIED_BG}%{U$COLOR_FOREGROUND}%{+u} ${name} %{-u}%{B-}%{F-}" + [mM]*) + [ $num_mon -lt 2 ] && shift && continue + case $item in + m*) + # monitor + FG=$COLOR_MONITOR_FG + BG=$COLOR_MONITOR_BG + ;; + M*) + # focused monitor + FG=$COLOR_FOCUSED_MONITOR_FG + BG=$COLOR_FOCUSED_MONITOR_BG + ;; + esac + wm="${wm}%{F${FG}}%{B${BG}}%{A:bspc monitor -f ${name}:} ${name} %{A}%{B-}%{F-}" ;; - F*) - # focused free desktop - wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FREE_FG}%{B$COLOR_FOCUSED_FREE_BG}%{U$COLOR_FOREGROUND}%{+u} ${name} %{-u}%{B-}%{F-}" + [fFoOuU]*) + case $item in + f*) + # free desktop + FG=$COLOR_FREE_FG + BG=$COLOR_FREE_BG + ;; + F*) + # focused free desktop + FG=$COLOR_FOCUSED_FREE_FG + BG=$COLOR_FOCUSED_FREE_BG + ;; + o*) + # occupied desktop + FG=$COLOR_OCCUPIED_FG + BG=$COLOR_OCCUPIED_BG + ;; + O*) + # focused occupied desktop + FG=$COLOR_FOCUSED_OCCUPIED_FG + BG=$COLOR_FOCUSED_OCCUPIED_BG + ;; + u*) + # urgent desktop + FG=$COLOR_URGENT_FG + BG=$COLOR_URGENT_BG + ;; + U*) + # focused urgent desktop + FG=$COLOR_FOCUSED_URGENT_FG + BG=$COLOR_FOCUSED_URGENT_BG + ;; + esac + wm="${wm}%{F${FG}}%{B${BG}}%{A:bspc desktop -f ${name}:} ${name} %{A}%{B-}%{F-}" ;; - U*) - # focused urgent desktop - wm_infos="${wm_infos}%{F$COLOR_FOCUSED_URGENT_FG}%{B$COLOR_FOCUSED_URGENT_BG}%{U$COLOR_FOREGROUND}%{+u} ${name} %{-u}%{B-}%{F-}" + [LTG]*) + # layout, state and flags + wm="${wm}%{F$COLOR_STATE_FG}%{B$COLOR_STATE_BG} ${name} %{B-}%{F-}" ;; - o*) - # occupied desktop - wm_infos="${wm_infos}%{F$COLOR_OCCUPIED_FG}%{B$COLOR_OCCUPIED_BG} ${name} %{B-}%{F-}" - ;; - f*) - # free desktop - wm_infos="${wm_infos}%{F$COLOR_FREE_FG}%{B$COLOR_FREE_BG} ${name} %{B-}%{F-}" - ;; - u*) - # urgent desktop - wm_infos="${wm_infos}%{F$COLOR_URGENT_FG}%{B$COLOR_URGENT_BG} ${name} %{B-}%{F-}" - ;; - #L*) - # layout - # wm_infos="$wm_infos %{F$COLOR_LAYOUT_FG}%{B$COLOR_LAYOUT_BG} ${name} %{B-}%{F-}" - # ;; esac shift done ;; esac - printf "%s\n" "%{l}${wm_infos}%{c}${title}%{r}${sys_infos}" + printf "%s\n" "%{l}${wm}%{c}${title}%{r}${sys}" done diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index c0b91c2..5e4c6d8 100644 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -46,13 +46,18 @@ super + g # # set the window state -super + {t,shift + t,s,f} - bspc node -t {tiled,pseudo_tiled,floating,fullscreen} +super + {s,f} + state={floating,fullscreen}; \ + bspc query -N --node "focused.$\{state\}" && state=tiled; \ + bspc node -t "$state" # set the node flags super + ctrl + {x,y,z} bspc node -g {locked,sticky,private} +super + apostrophe + bspc node focused -s last + # # focus/swap # diff --git a/x/.Xresources b/x/.Xresources index 0ee8a8c..93362bd 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -12,39 +12,67 @@ URxvt*font: xft:Inconsolata:size=10:antialias=true:hin URxvt*letterSpace: -1 URxvt*perl-ext-common: tabbedex -URxvt*background: #eeeeee -URxvt*foreground: #444444 -URxvt*cursorColor: #5f87af -URxvt*color0: #444444 -URxvt*color8: #444444 -URxvt*color1: #af0000 -URxvt*color9: #af0000 -URxvt*color2: #008700 -URxvt*color10: #008700 -URxvt*color3: #af5f00 -URxvt*color11: #af5f00 -URxvt*color4: #005faf -URxvt*color12: #005faf -URxvt*color5: #870087 -URxvt*color13: #870087 -URxvt*color6: #008787 -URxvt*color14: #008787 -URxvt*color7: #eeeeee -URxvt*color15: #eeeeee +#define base00 #161b1d +#define base01 #1f292e +#define base02 #516d7b +#define base03 #5a7b8c +#define base04 #7195a8 +#define base05 #7ea2b4 +#define base06 #c1e4f6 +#define base07 #ebf8ff +#define base08 #d22d72 +#define base09 #935c25 +#define base0A #8a8a0f +#define base0B #568c3b +#define base0C #2d8f6f +#define base0D #257fad +#define base0E #5d5db1 +#define base0F #b72dd2 -rofi.fg: #444444 -rofi.bg: #eeeeee +URxvt*.foreground: base02 +URxvt*.background: base07 +URxvt*.cursorColor: base02 -rofi.fg-active: #008787 -rofi.fg-urgent: #af0000 +URxvt*.color0: base00 +URxvt*.color1: base08 +URxvt*.color2: base0B +URxvt*.color3: base0A +URxvt*.color4: base0D +URxvt*.color5: base0E +URxvt*.color6: base0C +URxvt*.color7: base05 -rofi.hlfg-active: #008700 -rofi.hlfg-urgent: #af0000 +URxvt*.color8: base03 +URxvt*.color9: base08 +URxvt*.color10: base0B +URxvt*.color11: base0A +URxvt*.color12: base0D +URxvt*.color13: base0E +URxvt*.color14: base0C +URxvt*.color15: base07 -rofi.bg-active: #444444 -rofi.bg-urgent: #008700 +! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), +! use 'shell' template to set these if necessary +URxvt*.color16: base09 +URxvt*.color17: base0F +URxvt*.color18: base01 +URxvt*.color19: base02 +URxvt*.color20: base04 +URxvt*.color21: base06 -rofi.hlbg-active: #005faf -rofi.hlbg-urgent: #005faf +rofi.fg: base02 +rofi.bg: base07 -rofi.bc: #870087 +rofi.fg-active: base0C +rofi.fg-urgent: base08 + +rofi.hlfg-active: base0B +rofi.hlfg-urgent: base08 + +rofi.bg-active: base03 +rofi.bg-urgent: base0B + +rofi.hlbg-active: base0D +rofi.hlbg-urgent: base0D + +rofi.bc: base0E