Made a bunch of changes to shit whoops

This commit is contained in:
jond
2018-04-28 09:57:25 -05:00
parent 6898dd3545
commit f8110f9e99
7 changed files with 40 additions and 2 deletions

View File

@@ -13,6 +13,7 @@ alias l.='ls -lh --color=auto' 2>/dev/null
alias l='ls -lh' alias l='ls -lh'
alias ll='ls -lh' alias ll='ls -lh'
#set -o vi #set -o vi
alias p='ping'
#golang stuff #golang stuff
export GOPATH=$HOME/gopath export GOPATH=$HOME/gopath

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
]] ]]

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

Submodule vim/.vim/bundle/lightline-buffer added at 1c090e0782

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

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
@@ -54,6 +55,9 @@ nnoremap <C-h> <C-W><C-H>
inoremap jj <Esc> inoremap jj <Esc>
inoremap jk <Esc> inoremap jk <Esc>
inoremap kj <Esc> inoremap 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>
@@ -76,17 +80,46 @@ 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'
"Plugin 'fholgado/minibufexpl.vim'
Plugin 'tmhedberg/SimpylFold' Plugin 'tmhedberg/SimpylFold'
Plugin 'vim-scripts/indentpython.vim' 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 'junegunn/goyo.vim'
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': '',
\ },
\ }

View File

@@ -30,3 +30,4 @@ 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.blurRadius: 25