massive rxvt-unicode related changes (yes, I got tired of slow or feature incomplete vte terminals with no way to configure them from one place)
This commit is contained in:
parent
c7d4244d9f
commit
6622c84c0a
5 changed files with 37 additions and 33 deletions
3
rc.lua
3
rc.lua
|
@ -69,7 +69,7 @@ if ifexists(wallpaper) then
|
||||||
end
|
end
|
||||||
|
|
||||||
-- This is used later as the default terminal and editor to run.
|
-- This is used later as the default terminal and editor to run.
|
||||||
terminal = 'xfce4-terminal'
|
terminal = 'urxvt'
|
||||||
editor = os.getenv('EDITOR') or 'vim'
|
editor = os.getenv('EDITOR') or 'vim'
|
||||||
editor_cmd = terminal .. ' -e ' .. editor
|
editor_cmd = terminal .. ' -e ' .. editor
|
||||||
|
|
||||||
|
@ -521,6 +521,7 @@ awful.rules.rules = {
|
||||||
rule_any = {
|
rule_any = {
|
||||||
class = {
|
class = {
|
||||||
'Roxterm',
|
'Roxterm',
|
||||||
|
'URxvt',
|
||||||
'Xfce4-terminal'
|
'Xfce4-terminal'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
12
tmux.conf
12
tmux.conf
|
@ -42,12 +42,12 @@ set -g pane-border-fg brightgreen
|
||||||
set -g status-bg black
|
set -g status-bg black
|
||||||
set -g status-fg green
|
set -g status-fg green
|
||||||
set -g status-attr bright
|
set -g status-attr bright
|
||||||
set -g status-left '[ #[fg=white]#h#[default]:#[fg=brightblue]#S#[default] ]['
|
#set -g status-left '[ #[fg=white]#h#[default]:#[fg=brightblue]#S#[default] ]['
|
||||||
set -g status-right '][ #[fg=brightblue]#(cat /proc/loadavg|cut -d" " -f1,2,3)#[default] ][ #[fg=brightwhite]%a %e %k:%M#[default] ]'
|
#set -g status-right '][ #[fg=brightblue]#(cat /proc/loadavg|cut -d" " -f1,2,3)#[default] ][ #[fg=brightwhite]%a %e %k:%M#[default] ]'
|
||||||
set-window-option -g window-status-current-format ' #[fg=brightwhite]#I.#W#[default] '
|
#set-window-option -g window-status-current-format ' #[fg=brightwhite]#I.#W#[default] '
|
||||||
#set -g status-left '#[bg=brightcyan,fg=brightwhite] #H #[bg=brightyellow,fg=brightcyan]#[fg=brightwhite] #S #[bg=black,fg=brightyellow]#[default]'
|
set -g status-left '#[bg=brightcyan,fg=brightwhite] #H #[bg=brightyellow,fg=brightcyan]#[fg=brightwhite] #S #[bg=black,fg=brightyellow]#[default]'
|
||||||
#set -g status-right '#[fg=brightyellow]#[bg=brightyellow,fg=brightwhite] #(cat /proc/loadavg|cut -d" " -f1,2,3) #[fg=brightcyan]#[bg=brightcyan,fg=brightwhite] %a %e %k:%M #[default]'
|
set -g status-right '#[fg=brightyellow]#[bg=brightyellow,fg=brightwhite] #(cat /proc/loadavg|cut -d" " -f1,2,3) #[fg=brightcyan]#[bg=brightcyan,fg=brightwhite] %a %e %k:%M #[default]'
|
||||||
#set-window-option -g window-status-current-format '#[bg=brightblack,fg=brightcyan] #I.#W #[default]'
|
set-window-option -g window-status-current-format '#[bg=brightblack,fg=brightcyan] #I.#W #[default]'
|
||||||
set-window-option -g window-status-bell-bg black
|
set-window-option -g window-status-bell-bg black
|
||||||
set-window-option -g window-status-bell-fg white
|
set-window-option -g window-status-bell-fg white
|
||||||
set-window-option -g window-status-bell-attr bright
|
set-window-option -g window-status-bell-attr bright
|
||||||
|
|
39
vimrc
39
vimrc
|
@ -43,18 +43,9 @@ if has("gui_running")
|
||||||
set guifont=Terminus\ 11
|
set guifont=Terminus\ 11
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" svndiff plugin
|
|
||||||
if filereadable(expand("$HOME/.vim/plugins/svndiff.vim"))
|
|
||||||
source $HOME/.vim/plugins/svndiff.vim
|
|
||||||
noremap <F3> :call Svndiff("prev")<CR>
|
|
||||||
noremap <F4> :call Svndiff("next")<CR>
|
|
||||||
noremap <F5> :call Svndiff("clear")<CR>
|
|
||||||
endif
|
|
||||||
|
|
||||||
" set color scheme depending on the terminal capabilities
|
" set color scheme depending on the terminal capabilities
|
||||||
if &t_Co > 88 || has("gui_running")
|
if &t_Co > 88 || has("gui_running")
|
||||||
colorscheme solarized
|
colorscheme solarized
|
||||||
let g:solarized_termtrans=1
|
|
||||||
let g:solarized_italic=0
|
let g:solarized_italic=0
|
||||||
else
|
else
|
||||||
colorscheme elflord
|
colorscheme elflord
|
||||||
|
@ -70,23 +61,31 @@ if v:version >= 703
|
||||||
filetype off
|
filetype off
|
||||||
set rtp+=~/.vim/bundle/Vundle.vim/
|
set rtp+=~/.vim/bundle/Vundle.vim/
|
||||||
call vundle#begin()
|
call vundle#begin()
|
||||||
Plugin 'gmarik/Vundle.vim'
|
Plugin 'gmarik/Vundle.vim' "plugin manager
|
||||||
|
|
||||||
" general plugins
|
" general plugins
|
||||||
Plugin 'scrooloose/nerdtree'
|
Plugin 'scrooloose/nerdtree' "file manager
|
||||||
Plugin 'scrooloose/syntastic'
|
Plugin 'scrooloose/syntastic' "syntax checker
|
||||||
Plugin 'msanders/snipmate.vim'
|
Plugin 'msanders/snipmate.vim' "snippets support
|
||||||
Plugin 'bling/vim-airline'
|
Plugin 'bling/vim-airline' "stylish info display
|
||||||
Plugin 'bling/vim-bufferline'
|
Plugin 'bling/vim-bufferline' "stylish buffer display
|
||||||
Plugin 'tpope/vim-surround'
|
Plugin 'tpope/vim-surround' "quotes replacement made easy
|
||||||
Plugin 'mbbill/undotree'
|
Plugin 'mbbill/undotree' "undo buffer manager
|
||||||
Plugin 'jiangmiao/auto-pairs'
|
Plugin 'jiangmiao/auto-pairs' "auto add closing brackets and quotes
|
||||||
|
Plugin 'mhinz/vim-signify' "version control system gutter info
|
||||||
|
|
||||||
" syntax highlight plugins
|
" syntax highlight plugins
|
||||||
Plugin 'puppetlabs/puppet-syntax-vim'
|
Plugin 'puppetlabs/puppet-syntax-vim' "puppet
|
||||||
Plugin 'vim-scripts/nagios-syntax'
|
Plugin 'nagios-syntax' "nagios / icinga
|
||||||
call vundle#end()
|
call vundle#end()
|
||||||
|
|
||||||
|
" airline options
|
||||||
let g:airline_powerline_fonts = 1
|
let g:airline_powerline_fonts = 1
|
||||||
|
|
||||||
|
" signify options
|
||||||
|
let g:signify_vcs_list = [ 'svn', 'git' ]
|
||||||
|
let g:signify_sign_change = '~'
|
||||||
|
|
||||||
elseif filereadable(expand("$HOME/.vim/autoload/pathogen.vim"))
|
elseif filereadable(expand("$HOME/.vim/autoload/pathogen.vim"))
|
||||||
execute pathogen#infect()
|
execute pathogen#infect()
|
||||||
endif
|
endif
|
||||||
|
|
12
xresources
12
xresources
|
@ -6,12 +6,12 @@ Xft.hinting: true
|
||||||
Xft.hintstyle: hintslight
|
Xft.hintstyle: hintslight
|
||||||
Xft.dpi: 96
|
Xft.dpi: 96
|
||||||
|
|
||||||
! urxvt config, but I barely use it
|
! urxvt
|
||||||
URxvt.scrollBar: false
|
URxvt.scrollBar: false
|
||||||
URxvt.font: -*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
|
URxvt.font: xft:Terminus:size=11
|
||||||
URxvt.boldFont: -*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
|
URxvt.boldFont: xft:Terminus:size=11
|
||||||
URxvt.boldItalicFont: -*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
|
URxvt.boldItalicFont: xft:Terminus:size=11
|
||||||
URxvt.italicFont: -*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
|
URxvt.italicFont: xft:Terminus:size=11
|
||||||
URxvt.saveLines: 1000
|
URxvt.saveLines: 1000
|
||||||
URxvt.iso14755: false
|
URxvt.iso14755: false
|
||||||
URxvt.visualBell: true
|
URxvt.visualBell: true
|
||||||
|
@ -82,7 +82,7 @@ URxvt.keysym.S-V: perl:clipboard:paste
|
||||||
*fading: 40
|
*fading: 40
|
||||||
*colorBD: S_base3
|
*colorBD: S_base3
|
||||||
*fadeColor: S_base03
|
*fadeColor: S_base03
|
||||||
*cursorColor: S_base1
|
*cursorColor: S_base3
|
||||||
*pointerColorBackground:S_base01
|
*pointerColorBackground:S_base01
|
||||||
*pointerColorForeground:S_base1
|
*pointerColorForeground:S_base1
|
||||||
|
|
||||||
|
|
4
zshrc
4
zshrc
|
@ -51,10 +51,12 @@ bindkey -e
|
||||||
bindkey "^[OH" beginning-of-line # xfce4-terminal
|
bindkey "^[OH" beginning-of-line # xfce4-terminal
|
||||||
bindkey "^[[H" beginning-of-line # generic
|
bindkey "^[[H" beginning-of-line # generic
|
||||||
bindkey "^[[1~" beginning-of-line # screen
|
bindkey "^[[1~" beginning-of-line # screen
|
||||||
|
bindkey "^[[7~" beginning-of-line # rxvt
|
||||||
# end
|
# end
|
||||||
bindkey "^[OF" end-of-line # xfce4-terminal
|
bindkey "^[OF" end-of-line # xfce4-terminal
|
||||||
bindkey "^[[F" end-of-line # generic
|
bindkey "^[[F" end-of-line # generic
|
||||||
bindkey "^[[4~" end-of-line # screen
|
bindkey "^[[4~" end-of-line # screen
|
||||||
|
bindkey "^[[8~" end-of-line # rxvt
|
||||||
# pgup / pgdown
|
# pgup / pgdown
|
||||||
bindkey "^[[5~" backward-word
|
bindkey "^[[5~" backward-word
|
||||||
bindkey "^[[6~" forward-word
|
bindkey "^[[6~" forward-word
|
||||||
|
@ -185,6 +187,8 @@ hl_script="/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlightin
|
||||||
if [[ -r $hl_script ]]; then
|
if [[ -r $hl_script ]]; then
|
||||||
source $hl_script
|
source $hl_script
|
||||||
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
|
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
|
||||||
|
ZSH_HIGHLIGHT_STYLES[path]='fg=white,bold'
|
||||||
|
ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=white,bold'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# history substring search à la fish from https://github.com/zsh-users/zsh-history-substring-search
|
# history substring search à la fish from https://github.com/zsh-users/zsh-history-substring-search
|
||||||
|
|
Loading…
Reference in a new issue