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
This commit is contained in:
jomido
2018-07-22 14:04:57 -05:00
parent 712e769bf1 4009da9484
commit 3e31362714
26 changed files with 450 additions and 65 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;

28
bash/.bashrc
View File

@@ -6,16 +6,36 @@ 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 -R'
# 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'
alias dmesg='dmesg -H'
alias ip='ip -c'
#golang stuff #golang stuff
export GOPATH=$HOME/gopath export GOPATH=$HOME/gopath
export PATH=$GOPATH:$GOPATH/bin:$PATH export PATH=$GOPATH:$GOPATH/bin:$PATH
export EDITOR=/usr/bin/vim export EDITOR=/usr/bin/vim
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
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

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

76
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
@@ -28,7 +33,70 @@ set -g mode-keys vi
# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1 # 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 # 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 ]' \ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
# 'set -g mouse on; set -g mouse-utf8 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 on
#'set -g mouse on; set -g mouse-utf8 on' \
bind-key Tab last-window
bind-key BTab previous-window
# prefix-r to reload tmux config
bind-key r source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
# 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
# use F12 to move to inner/outer tmux sessions when nested
# https://medium.freecodecamp.org/tmux-in-practice-local-and-nested-remote-tmux-sessions-4f7ba5db8795
bind -T root F12 \
set prefix None \;\
set key-table off \;\
set window-status-format "#[fg=colour18,bg=brightblack] #I #[fg=white,bg=black] #W " \;\
set window-status-current-format "#[fg=colour18,bg=brightblac] #I #[fg=white,bg=blac] #W " \;\
set status-bg black \;\
set status-left "#[fg=white,bg=blac] #S #[fg=default,bg=default] " \;\
set status-right " #[fg=brightwhite,bg=black] %a, %d %b %H:%M #[fg=white,bg=blac] #(whoami)@#h " \;\
if -F '#{pane_in_mode}' 'send-keys -X cancel' \;\
display-message "ENTER inner tmux ..."
bind -T off F12 \
set -u prefix \;\
set -u key-table \;\
set -u window-status-format \;\
set -u window-status-current-format \;\
set -u status-left \;\
set -u status-right \;\
set -u status-bg \;\
display-message "EXIT inner tmux ..."
>>>>>>> 4009da94841e784ad85e3e9fde7f6146d8627c23

7
vim/.vim/.netrwhist Normal file
View File

@@ -0,0 +1,7 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =5
let g:netrw_dirhist_1='/home/jon'
let g:netrw_dirhist_2='/home/jon/.gnome'
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'

2
vim/.vim/bundle/calendar.vim

Submodule vim/.vim/bundle/calendar.vim updated: 6d6be26b2a...f27fcf52c8

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

2
vim/.vim/bundle/jedi-vim

Submodule vim/.vim/bundle/jedi-vim updated: 0c6a2b7737...9a4a4f4074

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

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

1
vim/.vim/bundle/lightline.vim Submodule

Submodule vim/.vim/bundle/lightline.vim added at 0532dff598

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

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 7054da8cae

1
vim/.vim/bundle/vim-surround Submodule

Submodule vim/.vim/bundle/vim-surround added at aa1f120ad3

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

88
vim/.vimrc
View File

@@ -6,10 +6,14 @@ 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
" Indent settings - this is for PEP8 compatibility " hide showmode because its in statusline
set noshowmode
" Indent settings - PEP8 compatibility
set expandtab set expandtab
set autoindent set autoindent
set tabstop=4 set tabstop=4
@@ -22,10 +26,16 @@ set fileformat=unix
hi cursorline cterm=none term=none ctermbg=236 hi cursorline cterm=none term=none ctermbg=236
set cursorline set cursorline
"enable relative line numbers
"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>
"highlight matching brace when closing brace, flash for 2 tenths
set showmatch set showmatch
set matchtime=2
let pythong_highlight_all = 1 let pythong_highlight_all = 1
syntax on syntax on
@@ -41,9 +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>
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>
@@ -52,19 +75,17 @@ nnoremap <S-Tab> :bprev<CR>
nnoremap <leader>p :CtrlPBuffer<CR> nnoremap <leader>p :CtrlPBuffer<CR>
nnoremap <space> za nnoremap <space> za
" NERDTree, open/close toggle
" NERDTree
map <C-n> :NERDTreeToggle<CR> map <C-n> :NERDTreeToggle<CR>
"airline - show buffers in the tabline if theres only one tab (always) "lightline colorscheme
let g:airline#extensions#tabline#enabled = 1 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
call vundle#begin() call vundle#begin()
" " let Vundle manage Vundle, required " " let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim' Plugin 'VundleVim/Vundle.vim'
"
Plugin 'tpope/vim-fugitive' Plugin 'tpope/vim-fugitive'
Plugin 'kien/ctrlp.vim' Plugin 'kien/ctrlp.vim'
Plugin 'scrooloose/nerdtree' Plugin 'scrooloose/nerdtree'
@@ -73,34 +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 'vim-airline/vim-airline' Plugin 'taohex/lightline-buffer'
Plugin 'vim-airline/vim-airline-themes'
"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 '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
" " Brief help let g:lightline = {
" " :PluginList - lists configured plugins \ 'tabline': {
" " :PluginInstall - installs plugins; append `!` to update or just \ 'left': [ [ 'bufferinfo' ],
" :PluginUpdate \ [ 'separator' ],
" " :PluginSearch foo - searches for foo; append `!` to refresh local cache \ [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
" " :PluginClean - confirms removal of unused plugins; append `!` to \ 'right': [ [ 'close' ], ],
" auto-approve removal \ },
" " \ 'component_expand': {
" " see :h vundle for more details or wiki for FAQ \ 'buffercurrent': 'lightline#buffer#buffercurrent',
" " Put your non-Plugin stuff after this line \ 'bufferbefore': 'lightline#buffer#bufferbefore',
\ 'bufferafter': 'lightline#buffer#bufferafter',
\ },
\ 'component_type': {
\ 'buffercurrent': 'tabsel',
\ 'bufferbefore': 'raw',
\ 'bufferafter': 'raw',
\ },
\ 'component_function': {
\ 'bufferinfo': 'lightline#buffer#bufferinfo',
\ },
\ 'component': {
\ 'separator': '',
\ },
\ }
"python with virtualenv support
"py << EOF
"import os
"import sys
"if 'VIRTUAL_ENV' in os.environ:
" project_base_dir = os.environ['VIRTUAL_ENV']
" activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
" execfile(activate_this, dict(__file__=activate_this))
"EOF

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

73
x/.Xresources
View File

@@ -1,33 +1,56 @@
*background: #151B1A
*foreground: #8FA388
! Alternate foreground
! !*foreground: #7E9982
*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:Terminus:size=14:antialias=true URxvt.font: xft:Terminus:size=14:antialias=true
<<<<<<< HEAD
URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
=======
!URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
>>>>>>> 4009da94841e784ad85e3e9fde7f6146d8627c23
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: /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

76
xorg.conf Normal file
View File

@@ -0,0 +1,76 @@
# nvidia-settings: X configuration file generated by nvidia-settings
# nvidia-settings: version 384.59 (mockbuild@) Wed Jul 26 13:26:18 CEST 2017
Section "ServerLayout"
Identifier "Layout0"
Screen 0 "Screen0" 0 0
InputDevice "Keyboard0" "CoreKeyboard"
InputDevice "Mouse0" "CorePointer"
Option "Xinerama" "0"
EndSection
Section "Files"
FontPath "/usr/share/fonts/default/Type1"
EndSection
Section "Module"
Load "dbe"
Load "extmod"
Load "type1"
Load "freetype"
Load "glx"
EndSection
Section "InputDevice"
# generated from default
Identifier "Mouse0"
Driver "mouse"
Option "Protocol" "auto"
Option "Device" "/dev/input/mice"
Option "Emulate3Buttons" "no"
Option "ZAxisMapping" "4 5"
EndSection
Section "InputDevice"
# generated from default
Identifier "Keyboard0"
Driver "keyboard"
EndSection
Section "Monitor"
# HorizSync source: edid, VertRefresh source: edid
Identifier "Monitor0"
VendorName "Unknown"
ModelName "DELL U2415"
HorizSync 30.0 - 83.0
VertRefresh 49.0 - 61.0
Option "DPMS"
EndSection
Section "Device"
Identifier "Device0"
Driver "nvidia"
VendorName "NVIDIA Corporation"
BoardName "GeForce GTX 1070"
EndSection
Section "Screen"
Identifier "Screen0"
Device "Device0"
Monitor "Monitor0"
DefaultDepth 24
Option "Stereo" "0"
Option "nvidiaXineramaInfoOrder" "DFP-6"
Option "metamodes" "DP-4: nvidia-auto-select +1920+0, DP-0: nvidia-auto-select +0+0, DP-2: nvidia-auto-select +3840+0"
Option "SLI" "Off"
Option "MultiGPU" "Off"
Option "BaseMosaic" "off"
SubSectionSub "Display"
Depth 24
EndSubSection
EndSection