diff --git a/.tools/get_public_ip.sh b/.tools/get_public_ip.sh new file mode 100755 index 0000000..4d3ba92 --- /dev/null +++ b/.tools/get_public_ip.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +dig +short myip.opendns.com @resolver1.opendns.com; diff --git a/bash/.bashrc b/bash/.bashrc index bc9e815..50128b0 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -6,13 +6,27 @@ if [ -f /etc/bashrc ]; then fi # 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 alias l.='ls -lh --color=auto' 2>/dev/null -alias l='ls -lh' -alias ll='ls -lh' -#set -o vi +alias l='ls -lh --color=auto' +alias ll='ls -lh --color=auto' +alias p='ping' +alias s='sudo' +<<<<<<< HEAD +alias dmesg='dmesg -H' +======= +alias ip='ip -c' +>>>>>>> 36ce64ada64d0d9adc019885f6013b8b016e46e3 #golang stuff export GOPATH=$HOME/gopath @@ -21,4 +35,13 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH export EDITOR=/usr/bin/vim [ -f ~/.fzf.bash ] && source ~/.fzf.bash +<<<<<<< HEAD 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 diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky.conf index 6e8ae9a..3a5b248 100644 --- a/conky/.config/conky/conky.conf +++ b/conky/.config/conky/conky.conf @@ -57,5 +57,5 @@ conky.config = { } 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 ]] diff --git a/dirindex.html b/dirindex.html new file mode 100644 index 0000000..e34400c --- /dev/null +++ b/dirindex.html @@ -0,0 +1,33 @@ + + + + + + Directory Index: dots + + + +
+

(root) + / +dots

+

Directory Index

+
+ +
+Root | +Global | +Sorted +
+ +

Sub-directories:

+

+ + + + + + + diff --git a/index.html b/index.html new file mode 120000 index 0000000..0fc8e54 --- /dev/null +++ b/index.html @@ -0,0 +1 @@ +dirindex.html \ No newline at end of file diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 9cf6ff1..e905e7f 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,3 +1,8 @@ +set -g default-terminal screen-256color + +#remove escape delay +set -s escape-time 0 + #change C-b to Ca unbind C-b 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 ]' \ '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-utf8 on' \ + +#set -g mouse on +#'set -g mouse on; set -g mouse-utf8 on' \ bind-key Tab last-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 diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist index 66efdea..5d389e8 100644 --- a/vim/.vim/.netrwhist +++ b/vim/.vim/.netrwhist @@ -1,5 +1,7 @@ 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_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' diff --git a/vim/.vim/bundle/dirindex.html b/vim/.vim/bundle/dirindex.html new file mode 100644 index 0000000..e0d05d4 --- /dev/null +++ b/vim/.vim/bundle/dirindex.html @@ -0,0 +1,41 @@ + + + + + + Directory Index: dots/vim/.vim/bundle + + + +
+

(root) + / +dots + / +vim + / +.vim + / +bundle

+

Directory Index

+
+ +

+Root | +Global | +Sorted +
+ +

Sub-directories:

+

+ + + + + + + diff --git a/vim/.vim/bundle/goyo.vim b/vim/.vim/bundle/goyo.vim new file mode 160000 index 0000000..5b8bd03 --- /dev/null +++ b/vim/.vim/bundle/goyo.vim @@ -0,0 +1 @@ +Subproject commit 5b8bd0378758c1d9550d8429bef24b3d6d78b592 diff --git a/vim/.vim/bundle/index.html b/vim/.vim/bundle/index.html new file mode 120000 index 0000000..0fc8e54 --- /dev/null +++ b/vim/.vim/bundle/index.html @@ -0,0 +1 @@ +dirindex.html \ No newline at end of file diff --git a/vim/.vim/bundle/lightline-buffer b/vim/.vim/bundle/lightline-buffer new file mode 160000 index 0000000..128ddaa --- /dev/null +++ b/vim/.vim/bundle/lightline-buffer @@ -0,0 +1 @@ +Subproject commit 128ddaad4a4d57c10f224428c7f64a10e5f21ca5 diff --git a/vim/.vim/bundle/minibufexpl.vim b/vim/.vim/bundle/minibufexpl.vim new file mode 160000 index 0000000..ad72976 --- /dev/null +++ b/vim/.vim/bundle/minibufexpl.vim @@ -0,0 +1 @@ +Subproject commit ad72976ca3df4585d49aa296799f14f3b34cf953 diff --git a/vim/.vim/bundle/targets.vim b/vim/.vim/bundle/targets.vim new file mode 160000 index 0000000..c3042dc --- /dev/null +++ b/vim/.vim/bundle/targets.vim @@ -0,0 +1 @@ +Subproject commit c3042dc18acc0dfcee479310d3efc6aefe92db75 diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline index e9a7a12..396cc92 160000 --- a/vim/.vim/bundle/vim-airline +++ b/vim/.vim/bundle/vim-airline @@ -1 +1 @@ -Subproject commit e9a7a12d9e1ace3dd0778c375c1b77d2879ba137 +Subproject commit 396cc9226171f8dbf1069800a0ae56700bbf3913 diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes index 08c76e4..26f67b9 160000 --- a/vim/.vim/bundle/vim-airline-themes +++ b/vim/.vim/bundle/vim-airline-themes @@ -1 +1 @@ -Subproject commit 08c76e4cd0cdaa12c476ed03b920912173e31339 +Subproject commit 26f67b926553555e505ac60e992c97ab5fdfc83f diff --git a/vim/.vim/bundle/vim-buftabline b/vim/.vim/bundle/vim-buftabline new file mode 160000 index 0000000..14d208b --- /dev/null +++ b/vim/.vim/bundle/vim-buftabline @@ -0,0 +1 @@ +Subproject commit 14d208b1fa5f4308383e3ce429d57c84423029f9 diff --git a/vim/.vim/bundle/vim-easyescape b/vim/.vim/bundle/vim-easyescape new file mode 160000 index 0000000..710f59b --- /dev/null +++ b/vim/.vim/bundle/vim-easyescape @@ -0,0 +1 @@ +Subproject commit 710f59bc13acd843aa80b2a2954fea6154f730c5 diff --git a/vim/.vim/dirindex.html b/vim/.vim/dirindex.html new file mode 100644 index 0000000..aae61be --- /dev/null +++ b/vim/.vim/dirindex.html @@ -0,0 +1,37 @@ + + + + + + Directory Index: dots/vim/.vim + + + +
+

(root) + / +dots + / +vim + / +.vim

+

Directory Index

+
+ +

+Root | +Global | +Sorted +
+ +

Sub-directories:

+

+ + + + + + + diff --git a/vim/.vim/index.html b/vim/.vim/index.html new file mode 120000 index 0000000..0fc8e54 --- /dev/null +++ b/vim/.vim/index.html @@ -0,0 +1 @@ +dirindex.html \ No newline at end of file diff --git a/vim/.vimrc b/vim/.vimrc index e44b663..b3a0059 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -6,6 +6,7 @@ set encoding=utf-8 let mapleader="," set nu set laststatus=2 +set showtabline=2 set hidden set incsearch @@ -26,7 +27,7 @@ hi cursorline cterm=none term=none ctermbg=236 set cursorline "enable relative line numbers -set number relativenumber +"set number relativenumber "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white nnoremap c :set cursorline! cursorcolumn! @@ -50,10 +51,22 @@ nnoremap nnoremap nnoremap nnoremap + " use jj to escape insert mode inoremap jj inoremap jk inoremap kj +nnoremap o + +" use jk to escape insert mode - using easyescape plugin +let g:easyescape_chars = { "j": 1, "k": 1 } +"let g:easyescape_timeout = 100 +cnoremap jk +cnoremap kj + +" blank lines +nnoremap o +nnoremap O nnoremap l :ls:b nnoremap :bnext @@ -66,7 +79,7 @@ nnoremap za map :NERDTreeToggle "lightline colorscheme -let g:lightline = {'colorscheme': 'powerline',} +let g:lightline = {'colorscheme': 'jellybeans',} " set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/Vundle.vim @@ -81,12 +94,43 @@ Plugin 'vim-scripts/indentpython.vim' Plugin 'scrooloose/syntastic' " PEP8 checking plugin Plugin 'nvie/vim-flake8' -"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'} Plugin 'itchyny/lightline.vim' +Plugin 'taohex/lightline-buffer' "Plugin 'klen/python-mode' Plugin 'itchyny/calendar.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 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': '', + \ }, + \ } + diff --git a/vim/dirindex.html b/vim/dirindex.html new file mode 100644 index 0000000..819e04b --- /dev/null +++ b/vim/dirindex.html @@ -0,0 +1,35 @@ + + + + + + Directory Index: dots/vim + + + +
+

(root) + / +dots + / +vim

+

Directory Index

+
+ +

+Root | +Global | +Sorted +
+ +

Sub-directories:

+

+ + + + + + + diff --git a/vim/index.html b/vim/index.html new file mode 120000 index 0000000..0fc8e54 --- /dev/null +++ b/vim/index.html @@ -0,0 +1 @@ +dirindex.html \ No newline at end of file diff --git a/x/.Xresources b/x/.Xresources index da76c80..13e9429 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -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.font: xft:xos4 Terminus:size=14:antialias=true -URxvt.boldFont: xft:xos4 Terminus:bold:size=14:antialias=true +URxvt.font: xft:Terminus:size=14:antialias=true +!URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true URxvt*transparent: true URxvt*shading: 10 URxvt*perl-ext-common: default,matcher URxvt*matcher.button: 1 ! 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