From f8110f9e99f2746e47e2c3027c3a14bb250633af Mon Sep 17 00:00:00 2001 From: jond Date: Sat, 28 Apr 2018 09:57:25 -0500 Subject: [PATCH 1/4] Made a bunch of changes to shit whoops --- bash/.bashrc | 1 + conky/.config/conky/conky.conf | 2 +- vim/.vim/bundle/goyo.vim | 1 + vim/.vim/bundle/lightline-buffer | 1 + vim/.vim/bundle/minibufexpl.vim | 1 + vim/.vimrc | 35 +++++++++++++++++++++++++++++++- x/.Xresources | 1 + 7 files changed, 40 insertions(+), 2 deletions(-) create mode 160000 vim/.vim/bundle/goyo.vim create mode 160000 vim/.vim/bundle/lightline-buffer create mode 160000 vim/.vim/bundle/minibufexpl.vim diff --git a/bash/.bashrc b/bash/.bashrc index 8f63c90..cfd6be4 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -13,6 +13,7 @@ alias l.='ls -lh --color=auto' 2>/dev/null alias l='ls -lh' alias ll='ls -lh' #set -o vi +alias p='ping' #golang stuff export GOPATH=$HOME/gopath 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/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/lightline-buffer b/vim/.vim/bundle/lightline-buffer new file mode 160000 index 0000000..1c090e0 --- /dev/null +++ b/vim/.vim/bundle/lightline-buffer @@ -0,0 +1 @@ +Subproject commit 1c090e0782dbe4e5a6a8353dffcd97971c84b1ca 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/.vimrc b/vim/.vimrc index e44b663..3b3bf55 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 @@ -54,6 +55,9 @@ nnoremap inoremap jj inoremap jk inoremap kj +" blank lines +nnoremap o +nnoremap O nnoremap l :ls:b nnoremap :bnext @@ -76,17 +80,46 @@ Plugin 'VundleVim/Vundle.vim' Plugin 'tpope/vim-fugitive' Plugin 'kien/ctrlp.vim' Plugin 'scrooloose/nerdtree' +"Plugin 'fholgado/minibufexpl.vim' Plugin 'tmhedberg/SimpylFold' 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 'junegunn/goyo.vim' 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/x/.Xresources b/x/.Xresources index da76c80..2043cc1 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -30,3 +30,4 @@ URxvt*matcher.button: 1 ! URxvt*url-launcher: /usr/bin/google-chrome URxvt*url-launcher: /home/jon/apps/firefox/firefox +! URxvt.blurRadius: 25 From bd4ca982b15b6a875136117cec04d9840dcfac0b Mon Sep 17 00:00:00 2001 From: jond Date: Sat, 5 May 2018 08:02:30 -0500 Subject: [PATCH 2/4] Added easyescape for faster jk/kj escaping --- vim/.vim/bundle/vim-easyescape | 1 + vim/.vimrc | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 160000 vim/.vim/bundle/vim-easyescape 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/.vimrc b/vim/.vimrc index 3b3bf55..4745d72 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -51,10 +51,12 @@ nnoremap nnoremap nnoremap nnoremap -" use jj to escape insert mode -inoremap jj -inoremap jk -inoremap kj +" 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 @@ -93,6 +95,7 @@ Plugin 'itchyny/calendar.vim' Plugin 'davidhalter/jedi-vim' Plugin 'tpope/vim-surround' Plugin 'junegunn/goyo.vim' +Plugin 'zhou13/vim-easyescape' call vundle#end() " required filetype plugin indent on " required From 3c959a0fb8ec41b1ac2a49e7a7063256ad945a47 Mon Sep 17 00:00:00 2001 From: jond Date: Sun, 20 May 2018 08:57:21 -0500 Subject: [PATCH 3/4] Big change here was tmux status bar and messing with X colors --- bash/.bashrc | 3 ++ tmux/.tmux.conf | 33 ++++++++++++++++ vim/.vim/bundle/Vundle.vim | 2 +- vim/.vim/bundle/calendar.vim | 2 +- vim/.vim/bundle/jedi-vim | 2 +- vim/.vim/bundle/lightline-buffer | 2 +- vim/.vim/bundle/lightline.vim | 2 +- vim/.vim/bundle/nerdtree | 2 +- vim/.vim/bundle/syntastic | 2 +- vim/.vim/bundle/vim-fugitive | 2 +- x/.Xresources | 67 ++++++++++++++++++++------------ 11 files changed, 87 insertions(+), 32 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index cfd6be4..6dbc515 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -14,6 +14,7 @@ alias l='ls -lh' alias ll='ls -lh' #set -o vi alias p='ping' +alias s='sudo' #golang stuff export GOPATH=$HOME/gopath @@ -22,3 +23,5 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH export EDITOR=/usr/bin/vim [ -f ~/.fzf.bash ] && source ~/.fzf.bash +xrdb -merge /home/jon/.colors/codeschool.dark + diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 9cf6ff1..ec1c43d 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -36,3 +36,36 @@ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \ bind-key Tab last-window bind-key BTab previous-window +set -g default-terminal "screen-256color" + +# 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/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim index 6437ad6..9a38216 160000 --- a/vim/.vim/bundle/Vundle.vim +++ b/vim/.vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87 +Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim index 6d6be26..1aee272 160000 --- a/vim/.vim/bundle/calendar.vim +++ b/vim/.vim/bundle/calendar.vim @@ -1 +1 @@ -Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c +Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim index 0c6a2b7..f07ff6a 160000 --- a/vim/.vim/bundle/jedi-vim +++ b/vim/.vim/bundle/jedi-vim @@ -1 +1 @@ -Subproject commit 0c6a2b77379f994c316983ca7f59784c1c957f78 +Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65 diff --git a/vim/.vim/bundle/lightline-buffer b/vim/.vim/bundle/lightline-buffer index 1c090e0..128ddaa 160000 --- a/vim/.vim/bundle/lightline-buffer +++ b/vim/.vim/bundle/lightline-buffer @@ -1 +1 @@ -Subproject commit 1c090e0782dbe4e5a6a8353dffcd97971c84b1ca +Subproject commit 128ddaad4a4d57c10f224428c7f64a10e5f21ca5 diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim index b19faca..41fb97e 160000 --- a/vim/.vim/bundle/lightline.vim +++ b/vim/.vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590 +Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index 8cd17c1..6188c5e 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538 +Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index 5e1b26c..d17b98c 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333 +Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index 913fff1..b14434b 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5 +Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2 diff --git a/x/.Xresources b/x/.Xresources index 2043cc1..13e9429 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -1,33 +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 + From 8339691402a347f81d8e7896e8acfc8cebca7ddf Mon Sep 17 00:00:00 2001 From: jon Date: Sun, 20 May 2018 10:08:10 -0500 Subject: [PATCH 4/4] Removed xrdb from bashrc --- bash/.bashrc | 1 - vim/.vim/bundle/jedi-vim | 2 +- vim/.vim/bundle/lightline.vim | 2 +- vim/.vim/bundle/nerdtree | 2 +- vim/.vim/bundle/syntastic | 2 +- vim/.vim/bundle/vim-fugitive | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 6dbc515..2f28a73 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -23,5 +23,4 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH export EDITOR=/usr/bin/vim [ -f ~/.fzf.bash ] && source ~/.fzf.bash -xrdb -merge /home/jon/.colors/codeschool.dark diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim index f07ff6a..48af2af 160000 --- a/vim/.vim/bundle/jedi-vim +++ b/vim/.vim/bundle/jedi-vim @@ -1 +1 @@ -Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65 +Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36 diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim index 41fb97e..78c43c1 160000 --- a/vim/.vim/bundle/lightline.vim +++ b/vim/.vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b +Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923 diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree index 6188c5e..a172d7c 160000 --- a/vim/.vim/bundle/nerdtree +++ b/vim/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3 +Subproject commit a172d7cfcb4fe9b927dcc24184204fc89d826301 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index d17b98c..b7b473b 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d +Subproject commit b7b473b2688827dcd7d8c801197b8bfc31b20dc4 diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index b14434b..3e0bd86 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2 +Subproject commit 3e0bd86b99c50691f830d9e25a4bbe2a88078f8f