jon/dots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://jonfu.com/home/jon/dots

Browse Source 
Conflicts:
	bash/.bashrc
	vim/.vim/bundle/calendar.vim
	vim/.vim/bundle/jedi-vim
	vim/.vim/bundle/lightline.vim
	vim/.vim/bundle/nerdtree
	vim/.vim/bundle/syntastic
	vim/.vim/bundle/vim-fugitive
This commit is contained in:
jon
2018-06-24 15:15:36 -05:00
parent cb8d5ead68 8f3230921e
commit 4f3771f4ce
23 changed files with 322 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.tools/get_public_ip.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/bash
dig +short myip.opendns.com @resolver1.opendns.com;

31
bash/.bashrc
View File

@@ -6,13 +6,27 @@ if [ -f /etc/bashrc ]; then
fi fi
# Uncomment the following line if you don't like systemctl's auto-paging feature: # Uncomment the following line if you don't like systemctl's auto-paging feature:
# export SYSTEMD_PAGER= #export SYSTEMD_PAGER=
#pager setup
#-C faster reprints
#-M more status
#-I case insensitive
#-j 5 show X lines above search for context
## 4 - right/left four chars
export LESS='-C -M -I -j 5 -# 4'
# User specific aliases and functions # User specific aliases and functions
alias l.='ls -lh --color=auto' 2>/dev/null alias l.='ls -lh --color=auto' 2>/dev/null
alias l='ls -lh' alias l='ls -lh --color=auto'
alias ll='ls -lh' alias ll='ls -lh --color=auto'
#set -o vi alias p='ping'
alias s='sudo'
<<<<<<< HEAD
alias dmesg='dmesg -H'
=======
alias ip='ip -c'
>>>>>>> 36ce64ada64d0d9adc019885f6013b8b016e46e3
#golang stuff #golang stuff
export GOPATH=$HOME/gopath export GOPATH=$HOME/gopath
@@ -21,4 +35,13 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
export EDITOR=/usr/bin/vim export EDITOR=/usr/bin/vim
[ -f ~/.fzf.bash ] && source ~/.fzf.bash [ -f ~/.fzf.bash ] && source ~/.fzf.bash
<<<<<<< HEAD
alias p='ping' alias p='ping'
=======
#ctrl-x, ctrl-e to launch $EDITOR (vim)
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
>>>>>>> 8f3230921e0db7fc1f6198ef62604af9b1e6b833

2
conky/.config/conky/conky.conf
View File

@@ -57,5 +57,5 @@ conky.config = {
} }
conky.text = [[ conky.text = [[
L $loadavg | M $mem | $battery_short | N ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %m/%d} ${time %H:%M} $loadavg | $mem | ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %m/%d} ${time %H:%M} | $battery_short
]] ]]

33
dirindex.html Normal file
View File

@@ -0,0 +1,33 @@
<!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>

1
index.html Symbolic link
View File

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

40
tmux/.tmux.conf
View File

@@ -1,3 +1,8 @@
set -g default-terminal screen-256color
#remove escape delay
set -s escape-time 0
#change C-b to Ca #change C-b to Ca
unbind C-b unbind C-b
set-option -g prefix C-a set-option -g prefix C-a
@@ -31,8 +36,41 @@ set -g mode-keys vi
if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
'set -g mouse on' \ '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 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-utf8 on' \
#set -g mouse on
#'set -g mouse on; set -g mouse-utf8 on' \
bind-key Tab last-window bind-key Tab last-window
bind-key BTab previous-window bind-key BTab previous-window
# Basic status bar colors
set-option -g status-bg default
set-option -g status-fg white
# Left side of status bar
set-option -g status-left-length 40
set-option -g status-left "#[fg=colour18,bg=colour12] #S #[fg=default,bg=default] "
# Window status
set-option -g window-status-format "#[fg=colour18,bg=brightblack] #I #[fg=white,bg=black] #W "
set-option -g window-status-current-format "#[fg=colour18,bg=colour7] #I #[fg=colour18,bg=colour4] #W "
set-option -g window-status-separator " "
set-option -g status-justify left
# Right side of status bar
set-option -g status-right-length 40
set-option -g status-right " #[fg=brightwhite,bg=black] %a, %d %b %H:%M #[fg=colour18,bg=colour4] #(whoami)@#h "
# Pane border
set-option -g pane-border-bg default
set-option -g pane-border-fg brightblack
set-option -g pane-active-border-bg default
set-option -g pane-active-border-fg white
# Pane number indicator
set-option -g display-panes-colour brightblack
set-option -g display-panes-active-colour brightwhite
# Clock mode
set-option -g clock-mode-colour white
set-option -g clock-mode-style 24

4
vim/.vim/.netrwhist
View File

@@ -1,5 +1,7 @@
let g:netrw_dirhistmax =10 let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =3 let g:netrw_dirhist_cnt =5
let g:netrw_dirhist_1='/home/jon' let g:netrw_dirhist_1='/home/jon'
let g:netrw_dirhist_2='/home/jon/.gnome' let g:netrw_dirhist_2='/home/jon/.gnome'
let g:netrw_dirhist_3='/home/jon' let g:netrw_dirhist_3='/home/jon'
let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'

41
vim/.vim/bundle/dirindex.html Normal file
View File

@@ -0,0 +1,41 @@
<!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/vim/.vim/bundle</title>
</head>
<body>
<table class="toptable dirtop"><tr><td>
<p class="toptitle"><a href="../../../../dirindex.html">(root)</a>
/
<a href="../../../dirindex.html">dots</a>
/
<a href="../../dirindex.html">vim</a>
/
<a href="../dirindex.html">.vim</a>
/
<a href="dirindex.html">bundle</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="jedi-vim/dirindex.html">jedi-vim</a></li>
<li><a href="nerdtree/dirindex.html">nerdtree</a></li>
<li><a href="syntastic/dirindex.html">syntastic</a></li>
</ul><p>
</body>
</html>

1
vim/.vim/bundle/goyo.vim Submodule

Submodule vim/.vim/bundle/goyo.vim added at 5b8bd03787

1
vim/.vim/bundle/index.html Symbolic link
View File

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

1
vim/.vim/bundle/lightline-buffer Submodule

Submodule vim/.vim/bundle/lightline-buffer added at 128ddaad4a

1
vim/.vim/bundle/minibufexpl.vim Submodule

Submodule vim/.vim/bundle/minibufexpl.vim added at ad72976ca3

1
vim/.vim/bundle/targets.vim Submodule

Submodule vim/.vim/bundle/targets.vim added at c3042dc18a

2
vim/.vim/bundle/vim-airline

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

2
vim/.vim/bundle/vim-airline-themes

Submodule vim/.vim/bundle/vim-airline-themes updated: 08c76e4cd0...26f67b9265

1
vim/.vim/bundle/vim-buftabline Submodule

Submodule vim/.vim/bundle/vim-buftabline added at 14d208b1fa

1
vim/.vim/bundle/vim-easyescape Submodule

Submodule vim/.vim/bundle/vim-easyescape added at 710f59bc13

37
vim/.vim/dirindex.html Normal file
View File

@@ -0,0 +1,37 @@
<!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/vim/.vim</title>
</head>
<body>
<table class="toptable dirtop"><tr><td>
<p class="toptitle"><a href="../../../dirindex.html">(root)</a>
/
<a href="../../dirindex.html">dots</a>
/
<a href="../dirindex.html">vim</a>
/
<a href="dirindex.html">.vim</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="bundle/dirindex.html">bundle</a></li>
</ul><p>
</body>
</html>

1
vim/.vim/index.html Symbolic link
View File

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

50
vim/.vimrc
View File

@@ -6,6 +6,7 @@ set encoding=utf-8
let mapleader="," let mapleader=","
set nu set nu
set laststatus=2 set laststatus=2
set showtabline=2
set hidden set hidden
set incsearch set incsearch
@@ -26,7 +27,7 @@ hi cursorline cterm=none term=none ctermbg=236
set cursorline set cursorline
"enable relative line numbers "enable relative line numbers
set number relativenumber "set number relativenumber
"set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
nnoremap <Leader>c :set cursorline! cursorcolumn!<CR> nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>
@@ -50,10 +51,22 @@ nnoremap <C-j> <C-W><C-J>
nnoremap <C-k> <C-W><C-K> nnoremap <C-k> <C-W><C-K>
nnoremap <C-l> <C-W><C-L> nnoremap <C-l> <C-W><C-L>
nnoremap <C-h> <C-W><C-H> nnoremap <C-h> <C-W><C-H>
" use jj to escape insert mode " use jj to escape insert mode
inoremap jj <Esc> inoremap jj <Esc>
inoremap jk <Esc> inoremap jk <Esc>
inoremap kj <Esc> inoremap kj <Esc>
nnoremap <CR> o<Esc>
" use jk to escape insert mode - using easyescape plugin
let g:easyescape_chars = { "j": 1, "k": 1 }
"let g:easyescape_timeout = 100
cnoremap jk <ESC>
cnoremap kj <ESC>
" blank lines
nnoremap <Enter> o<ESC>
nnoremap <S-Enter> O<ESC>
nnoremap <leader>l :ls<CR>:b<Space> nnoremap <leader>l :ls<CR>:b<Space>
nnoremap <Tab> :bnext<CR> nnoremap <Tab> :bnext<CR>
@@ -66,7 +79,7 @@ nnoremap <space> za
map <C-n> :NERDTreeToggle<CR> map <C-n> :NERDTreeToggle<CR>
"lightline colorscheme "lightline colorscheme
let g:lightline = {'colorscheme': 'powerline',} let g:lightline = {'colorscheme': 'jellybeans',}
" set the runtime path to include Vundle and initialize " set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim set rtp+=~/.vim/bundle/Vundle.vim
@@ -81,12 +94,43 @@ Plugin 'vim-scripts/indentpython.vim'
Plugin 'scrooloose/syntastic' Plugin 'scrooloose/syntastic'
" PEP8 checking plugin " PEP8 checking plugin
Plugin 'nvie/vim-flake8' Plugin 'nvie/vim-flake8'
"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
Plugin 'itchyny/lightline.vim' Plugin 'itchyny/lightline.vim'
Plugin 'taohex/lightline-buffer'
"Plugin 'klen/python-mode' "Plugin 'klen/python-mode'
Plugin 'itchyny/calendar.vim' Plugin 'itchyny/calendar.vim'
Plugin 'davidhalter/jedi-vim' Plugin 'davidhalter/jedi-vim'
Plugin 'tpope/vim-surround' Plugin 'tpope/vim-surround'
Plugin 'ap/vim-buftabline'
Plugin 'wellle/targets.vim'
Plugin 'junegunn/goyo.vim'
Plugin 'zhou13/vim-easyescape'
call vundle#end() " required call vundle#end() " required
filetype plugin indent on " required filetype plugin indent on " required
" use lightline-buffer in lightline
let g:lightline = {
\ 'tabline': {
\ 'left': [ [ 'bufferinfo' ],
\ [ 'separator' ],
\ [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
\ 'right': [ [ 'close' ], ],
\ },
\ 'component_expand': {
\ 'buffercurrent': 'lightline#buffer#buffercurrent',
\ 'bufferbefore': 'lightline#buffer#bufferbefore',
\ 'bufferafter': 'lightline#buffer#bufferafter',
\ },
\ 'component_type': {
\ 'buffercurrent': 'tabsel',
\ 'bufferbefore': 'raw',
\ 'bufferafter': 'raw',
\ },
\ 'component_function': {
\ 'bufferinfo': 'lightline#buffer#bufferinfo',
\ },
\ 'component': {
\ 'separator': '',
\ },
\ }

35
vim/dirindex.html Normal file
View File

@@ -0,0 +1,35 @@
<!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/vim</title>
</head>
<body>
<table class="toptable dirtop"><tr><td>
<p class="toptitle"><a href="../../dirindex.html">(root)</a>
/
<a href="../dirindex.html">dots</a>
/
<a href="dirindex.html">vim</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>

1
vim/index.html Symbolic link
View File

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

68
x/.Xresources
View File

@@ -1,32 +1,52 @@
*background: #151B1A
*foreground: #8FA388
*cursorColor: #9E6438
*color0: #2E2B38
*color1: #984E66
*color2: #7A8C54
*color3: #9E6438
*color4: #395667
*color5: #9D916B
*color6: #536556
*color7: #828181
*color8: #474159
*color9: #A86D56
*color10: #9FB274
*color11: #B29F5E
*color12: #507A91
*color13: #B89855
*color14: #7E9982
*color15: #BDBDA4
URxvt*scrollBar: false URxvt*scrollBar: false
URxvt.font: xft:xos4 Terminus:size=14:antialias=true URxvt.font: xft:Terminus:size=14:antialias=true
URxvt.boldFont: xft:xos4 Terminus:bold:size=14:antialias=true !URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
URxvt*transparent: true URxvt*transparent: true
URxvt*shading: 10 URxvt*shading: 10
URxvt*perl-ext-common: default,matcher URxvt*perl-ext-common: default,matcher
URxvt*matcher.button: 1 URxvt*matcher.button: 1
! URxvt*url-launcher: /usr/bin/google-chrome ! URxvt*url-launcher: /usr/bin/google-chrome
URxvt*url-launcher: /home/jon/apps/firefox/firefox ! URxvt*url-launcher: /home/jon/apps/firefox/firefox
URxvt*url-launcher: /usr/bin/firefox
! URxvt.blurRadius: 25
URxvt*.termName: rxvt-unicode-256color
! special
*.foreground: #c5c8c6
*.background: #1d1f21
*.cursorColor: #c5c8c6
! black
*.color0: #282a2e
*.color8: #373b41
! red
*.color1: #a54242
*.color9: #cc6666
! green
*.color2: #8c9440
*.color10: #b5bd68
! yellow
*.color3: #de935f
*.color11: #f0c674
! blue
*.color4: #5f819d
*.color12: #81a2be
! magenta
*.color5: #85678f
*.color13: #b294bb
! cyan
*.color6: #5e8d87
*.color14: #8abeb7
! white
*.color7: #707880
*.color15: #c5c8c6