Skip to content

Commit

Permalink
added binding, removed zsh binding, changed oni config, added vimrc s…
Browse files Browse the repository at this point in the history
…hortcut
  • Loading branch information
g-erson committed Jul 17, 2018
1 parent 30495cf commit d69730d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .config/oni/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ exports.deactivate = function (oni) {

exports.configuration = {
//add custom config here, such as
"ui.colorscheme": "hybrid",
"language.vue.languageServer.command":"vls",
"experimental.indentLines.enabled": true,
"oni.useDefaultConfig": true,
"oni.bookmarks": ["~/Documents"],
Expand Down
2 changes: 0 additions & 2 deletions .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ set -g display-time 1000 # slightly longer status messages display time

set -g status-interval 10 # redraw status line every 10 seconds

# clear both screen and history
bind -n C-l send-keys C-l \; run 'sleep 0.1' \; clear-history

# activity
set -g monitor-activity on
Expand Down
11 changes: 6 additions & 5 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ if exists('g:gui_oni')
set noshowcmd
else
" Statements here
Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
" Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
"with ./<plugin location>/install.sh
" --clang-completer
"
Plugin 'jistr/vim-nerdtree-tabs'
"Configure ctrlp
set runtimepath^=~/.vim/bundle/ctrlp.vim

Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes'
endif

Plugin 'ap/vim-css-color'
Expand All @@ -42,8 +43,6 @@ Plugin 'vim-ruby/vim-ruby'
Plugin 'peterhoeg/vim-qml'
Plugin 'christoomey/vim-tmux-navigator'
Plugin 'guns/vim-clojure-static'
Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes'
Plugin 'posva/vim-vue'

" The sparkup vim script is in a subdirectory of this repo called vim.
Expand Down Expand Up @@ -144,11 +143,13 @@ set clipboard=unnamed
set backspace=2
"=================================== Detect QML Syntax ======================
au BufNewFile,BufRead *.qml set filetype=qml
"============================ Airline Config =================================
"============================ Airline Config ================================
let g:airline_powerline_fonts = 1 "git clone [email protected]:powerline/fonts.git
"./install.sh
let g:airline_theme = 'durant'
if !exists('g:airline_symbols')
let g:airline_symbols = {}
endif
let g:airline_symbols.space = "\ua0"
"======================== Enter insert mode terminals ======================
autocmd BufEnter * if &buftype == 'terminal' | :startinsert | endif
5 changes: 3 additions & 2 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ export EDITOR="/usr/local/bin/nvim"
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
ZSH_THEME="refined"

bindkey "^P" up-line-or-search

# Set list of themes to load
# Setting this variable when ZSH_THEME=random
# cause zsh load theme from this variable instead of
Expand Down Expand Up @@ -95,6 +93,9 @@ source $ZSH/oh-my-zsh.sh

# User configuration

bindkey "^P" up-line-or-search
setopt NO_NOMATCH

# export MANPATH="/usr/local/man:$MANPATH"

# You may need to manually set your language environment
Expand Down

0 comments on commit d69730d

Please sign in to comment.