dot

packages and services management
Log | Files | Refs | README

commit f92585fc23ca8a3abf844e6f78df6e7fb2f8dd9f
parent 1984cd35ac2dfcb57c05759ba9f64f01fb7a273f
Author: josuah <mail@josuah.net>
Date:   Fri, 23 Sep 2016 21:46:12 -0400

Visual changes

Diffstat:
Afzy/config.h | 10++++++++++
Mshell/.profile | 14+++++---------
Mtmux/.tmux.conf | 6+++---
Mvim/.vimrc | 68+++++++++++++++++++++++++++++++++++++++++---------------------------
Mvim/build.sh | 6+++---
5 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/fzy/config.h b/fzy/config.h @@ -0,0 +1,10 @@ +#define TTY_COLOR_HIGHLIGHT TTY_COLOR_GREEN + +#define SCORE_GAP_LEADING -0.005 +#define SCORE_GAP_TRAILING -0.005 +#define SCORE_GAP_INNER -0.01 +#define SCORE_MATCH_CONSECUTIVE 1.0 +#define SCORE_MATCH_SLASH 0.9 +#define SCORE_MATCH_WORD 0.8 +#define SCORE_MATCH_CAPITAL 0.7 +#define SCORE_MATCH_DOT 0.6 diff --git a/shell/.profile b/shell/.profile @@ -41,7 +41,7 @@ ps1() printf '\n' # Line separator - local p='________________________________________' + local p='────────────────────────────────────────' printf '\033[30;1m%s\033[0m\r' "$p$p" # Date @@ -49,31 +49,27 @@ ps1() # PWD with $HOME replaced by ~ [ "${pwd##$HOME**}" ] && local pwd="$PWD" || local pwd="~${PWD#$HOME}" - printf '\033[1m%s\033[0m \033[3C' "$pwd" + printf '\033[1m%s\033[0m ' "$pwd" # Git branch and status if git rev-parse &> /dev/null then local color branch="$(git branch | sed -n 's/^\* // p')" [ "$(git status --porcelain)" ] && color=31 || color=32 - printf ' \033[%sm%s\033[0m ' "$color" "$branch" + printf '\033[2C \033[%sm%s\033[0m ' "$color" "$branch" fi printf '\r' # Error code - [ "$code" -eq 0 ] || printf '\033[38C\033[31;1m %s \033[0m\r' "$code" + [ "$code" -eq 0 ] || printf '\033[62C\033[31;1m %s \033[0m\r' "$code" # Mails local mail_count="$(find "$MAIL/new" -mindepth 1 2>/dev/null | wc -l)" if [ "$mail_count" -gt 0 ] - then printf '\033[45C\033[36;1m %s \033[0m\r' "$mail_count" + then printf '\033[69C\033[32;1m %s \033[0m\r' "$mail_count" fi - # Tmux sessions - local tmux="$(tmux list-sessions 2>/dev/null | wc -l)" - [ $tmux != 0 ] && printf '\033[50C\033[33;1m %s \033[0m\r' "$tmux" - # Non printable: terminal status, bell, empty line at the bottom. printf '\a\033]0;shell\007\033[s\n\n\033[2A' diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf @@ -63,7 +63,7 @@ set -g display-panes-colour red set -g status-position bottom set -g status-keys vi -set -g status-justify left +set -g status-justify centre set -g status-left " #S " set -g status-right " %y-%m-%d #[bold] %R " @@ -93,5 +93,5 @@ set -g window-status-activity-bg white # BORDERS 2016-09-21 #------------------------------------------------------------------------------- -set -g pane-border-style fg=white -set -g pane-active-border-style fg=red +set -g pane-border-fg white +set -g pane-active-border-fg green diff --git a/vim/.vimrc b/vim/.vimrc @@ -2,38 +2,36 @@ " __ /\ \/ ________ _____ ____ " / / / / /\ / __ __ \ / ____\/ ___\ " \ \/ / / // / / / / // / / /__ -" \_,' \/ \/ \/ \/ \/ \____\ 2016-09-20 +" \_,' \/ \/ \/ \/ \/ \____\ 2016-09-23 "=============================================================================== " Config for vim using vim's features rather than a lot of plugins -" OPTIONS 2016-09-18 +" OPTIONS 2016-09-23 "------------------------------------------------------------------------------- set autoindent copyindent " Indentation -set laststatus=2 ruler statusline= " Status -set smartcase ignorecase " Case -set showmatch " Highlight +set laststatus=2 ruler statusline= " Status +set smartcase ignorecase showmatch " Searching set list listchars=tab::\ ,trail:.,nbsp:.,extends:>,precedes:< " Listchars -set fillchars=stl:_,stlnc:_,vert:\| -set number numberwidth=5 cursorline nowrap " Interface +set fillchars=stl:_,stlnc:_,vert:: " Fillchars +set number numberwidth=1 cursorline nowrap " Interface set scrolloff=3 " Scroll -set backupdir=~/.cache/vim// directory=~/.cache/vim// " Backup, cache +set backupdir=~/.cache/vim// directory=~/.cache/vim// " Backup set virtualedit=block formatprg=fmt " Editing set wildmenu wildmode=longest:full,full " Completion -" MAPPINGS 2016-09-20 +" MAPPINGS 2016-09-23 "------------------------------------------------------------------------------- let mapleader = ' ' " <leader> menu nmap <leader><leader> : -\ ec '_______________________________________________________________________'\| -\ ec ' <w> write <b> buffers <c> clist <s> set </> search ' \| -\ ec ' <e> edit <T> tabs <t> tags <h> help <"> registers' \| -\ ec ' <m> make '"<'>"'marks' \| +\ ec ' <w> write <b> buffers <s> set <c> clist </> search ' \| +\ ec ' <e> edit <T> tabs <h> help <t> tags <"> registers' \| +\ ec ' <m> make '"<'>"'marks' \| \ <cr>: nmap <leader>w :w<cr> nmap <leader>s :set <c-d> @@ -52,11 +50,12 @@ nmap <leader>e :pwd \| echo ''<cr>:exe 'e' \ \| redraw!<cr> " <c>hange <o>ption <...> -nmap col :set list ! \| set list ?<cr> -nmap con :set number ! \| set number ?<cr> -nmap cor :set relativenumber ! \| set number ?<cr> -nmap cop :set paste ! \| set paste ?<cr> -nmap coh :set hlsearch ! \| set hlsearch ?<cr> +nmap col :set list ! \| set list ?<cr> +nmap con :set number ! \| set number ?<cr> +nmap cor :set relativenumber ! \| set number ?<cr> +nmap cop :set paste ! \| set paste ?<cr> +nmap coh :set hlsearch ! \| set hlsearch ?<cr> +nmap coc :set cursorcolumn ! \| set cursorcolumn ?<cr> nmap cov :set ve=<c-r>=(&ve =~# "all") ? 'block' : 'all'<cr><cr>:set ve ?<cr> nmap cos :if exists("g:syntax_on") \| sy off \| else \| sy enable \| end<cr> nmap cot :set tw=<c-r>=(&tw != "0" ) ? '0' : '75' <cr> <cr>:set tw ?<cr> @@ -80,18 +79,33 @@ iabbrev -_ <Esc>a-<Esc>:set ve=all<CR>v080lhr-:set ve=block<CR>A iabbrev =_ <Esc>a=<Esc>:set ve=all<CR>v080lhr=:set ve=block<CR>A -" HIGHLIGHTS 2016-09-10 +" HIGHLIGHTS 2016-09-23 "------------------------------------------------------------------------------- -highlight NonText cterm=bold ctermfg=1 -highlight SpecialKey cterm=bold ctermfg=1 -highlight CursorLine cterm=bold -highlight CursorColumn cterm=bold ctermbg=none -highlight CursorLineNr cterm=bold ctermfg=7 +" Interface +highlight NonText cterm=bold ctermfg=2 +highlight SpecialKey cterm=bold ctermfg=2 +highlight CursorLine cterm=none ctermbg=none +highlight CursorColumn cterm=bold ctermfg=2 ctermbg=none +highlight CursorLineNr cterm=bold ctermfg=2 highlight LineNr cterm=bold ctermfg=0 -highlight StatusLine cterm=bold ctermfg=3 -highlight StatusLineNC cterm=bold ctermfg=7 -highlight VertSplit cterm=none ctermfg=7 ctermbg=0 +highlight StatusLine cterm=bold ctermfg=7 +highlight StatusLineNC cterm=bold ctermfg=0 +highlight ModeMsg cterm=bold ctermfg=0 ctermbg=2 +highlight WildMenu cterm=none ctermfg=0 ctermbg=2 +highlight VertSplit cterm=none ctermfg=7 ctermbg=none + +" Code +highlight Comment cterm=bold ctermfg=0 +highlight Statement cterm=bold ctermfg=none +highlight Constant cterm=none ctermfg=grey +highlight Type cterm=none ctermfg=7 +highlight Preproc cterm=none ctermfg=7 +highlight Special cterm=bold ctermfg=0 +highlight Identifier cterm=none ctermfg=7 +highlight Number cterm=bold ctermfg=7 + +syntax enable " syntax on dilable custom highlights " AUTOCOMMANDS 2016-09-10 diff --git a/vim/build.sh b/vim/build.sh @@ -4,12 +4,12 @@ tar=https://github.com/vim/vim/archive/master.tar.gz build() { - ./configure \ + ./configure --prefix="$PREFIX" \ --with-features=normal \ + --enable-multibyte \ --disable-gui \ --without-x \ - --without-gnome \ - --prefix="$PREFIX" + --without-gnome make install }