Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
jond
2018-07-28 11:37:42 -05:00
7 changed files with 14 additions and 40 deletions

View File

@@ -41,3 +41,6 @@ bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
#fix clear screen in vi mode
bind -m vi-insert "\C-l":clear-screen
#add date/time to history
export HISTTIMEFORMAT="%F %T: "

View File

@@ -1,33 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel=stylesheet type="text/css" href="../style.css">
<title>Directory Index: dots</title>
</head>
<body>
<table class="toptable dirtop"><tr><td>
<p class="toptitle"><a href="../dirindex.html">(root)</a>
/
<a href="dirindex.html">dots</a></p>
<p class="topsubtitle">Directory Index</p>
</td></tr></table>
<div class="mininav">
<a href="../dirindex.html">Root</a> |
<a href="../allindex.html">Global</a> |
<a href="../sortindex.html">Sorted</a>
</div>
<h3>Sub-directories:</h3>
<ul>
<li><a href="vim/dirindex.html">vim</a></li>
</ul><p>
</body>
</html>

View File

@@ -1 +0,0 @@
dirindex.html

View File

@@ -33,11 +33,11 @@ set -g mode-keys vi
# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
# copy/paste: shift+left click to highlight, then shift+middle to past
if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
'set -g mouse on' \
'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on'
#if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
# 'set -g mouse on' \
# 'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on'
#set -g mouse on
set -g mouse on
#'set -g mouse on; set -g mouse-utf8 on' \
bind-key Tab last-window

Submodule vim/.vim/bundle/vim-airline updated: 396cc92261...e03afa1733

Submodule vim/.vim/bundle/vim-airline-themes updated: 26f67b9265...5d75d76ca2

View File

@@ -10,6 +10,9 @@ set showtabline=2
set hidden
set incsearch
" share system clipboard
set clipboard=^unnamed,unnamedplus
" hide showmode because its in statusline
set noshowmode
@@ -25,6 +28,8 @@ set fileformat=unix
"highlight cursorline cterm=none ctermbg=darkred ctermfg=white guibg=darkred guifg=white
hi cursorline cterm=none term=none ctermbg=236
set cursorline
" vertical column at 79 so you know when to wrap
set colorcolumn=79
"enable relative line numbers
"set number relativenumber