Skip to content

Commit

Permalink
Added oh-my-zsh and oni configs
Browse files Browse the repository at this point in the history
  • Loading branch information
g-erson committed Jul 12, 2018
1 parent b7d62d5 commit 3e30505
Show file tree
Hide file tree
Showing 6 changed files with 213 additions and 14 deletions.
35 changes: 35 additions & 0 deletions .config/oni/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"use strict";
exports.__esModule = true;
exports.activate = function (oni) {
console.log("config activated");

oni.input.bind("<C-h>", () =>
oni.editors.activeEditor.neovim.command(`call OniNextWindow('h')<CR>`)
)
oni.input.bind("<C-j>", () =>
oni.editors.activeEditor.neovim.command(`call OniNextWindow('j')<CR>`)
)
oni.input.bind("<C-k>", () =>
oni.editors.activeEditor.neovim.command(`call OniNextWindow('k')<CR>`)
)
oni.input.bind("<C-l>", () =>
oni.editors.activeEditor.neovim.command(`call OniNextWindow('l')<CR>`)
)
};

exports.deactivate = function (oni) {
console.log("config deactivated");
};

exports.configuration = {
//add custom config here, such as
"experimental.indentLines.enabled": true,
"oni.useDefaultConfig": true,
"oni.bookmarks": ["~/Documents"],
"editor.textMateHighlighting.enabled" : true,
"editor.fontSize": "12px",
"editor.fontFamily": "Monaco",
// UI customizations
"ui.animations.enabled": true,
"ui.fontSmoothing": "auto"
};
35 changes: 35 additions & 0 deletions .config/oni/config.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

import * as React from "react"
import * as Oni from "oni-api"

export const activate = (oni: Oni.Plugin.Api) => {
console.log("config activated")

// Input
//
// Add input bindings here:
//
oni.input.bind("<c-enter>", () => console.log("Control+Enter was pressed"))

//
// Or remove the default bindings here by uncommenting the below line:
//
// oni.input.unbind("<c-p>")
}

export const deactivate = (oni: Oni.Plugin.Api) => {
console.log("config deactivated")
}

export const configuration = {
//add custom config here, such as

"oni.useDefaultConfig": true,
"oni.bookmarks": ["~/Documents"],
"editor.fontSize": "12px",
"editor.fontFamily": "Monaco",

// UI customizations
"ui.animations.enabled": true,
"ui.fontSmoothing": "auto",
}
6 changes: 6 additions & 0 deletions .config/oni/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compilerOptions": {
"jsx": "react",
"baseUrl": "/Applications/Oni.app/Contents/Resources/app/node_modules"
}
}
1 change: 1 addition & 0 deletions .oh-my-zsh
Submodule .oh-my-zsh added at f88396
31 changes: 17 additions & 14 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,29 @@ Plugin 'gmarik/vundle'
" The following are examples of different formats supported.
" Keep bundle commands between here and filetype plugin indent on.
" scripts on GitHub repos
Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
"with ./<plugin location>/install.sh
" --clang-completer
if exists('g:gui_oni')
set noshowmode
set noruler
set laststatus=0
set noshowcmd
else
" Statements here
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

endif

Plugin 'ap/vim-css-color'
Plugin 'tpope/vim-fugitive'
Plugin 'tpope/vim-fireplace'
Plugin 'tpope/vim-rails'
Plugin 'altercation/vim-colors-solarized'
Plugin 'scrooloose/nerdtree'
Plugin 'jistr/vim-nerdtree-tabs'
Plugin 'airblade/vim-gitgutter'
"Plugin 'scrooloose/syntastic'
Plugin 'vim-ruby/vim-ruby'
Expand All @@ -42,8 +55,6 @@ Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
" git repos on your local machine (i.e. when working on your own plugin)
"Plugin 'file:///home/gmarik/path/to/plugin'
" ...
"Configure ctrlp
set runtimepath^=~/.vim/bundle/ctrlp.vim

call vundle#end()
filetype plugin indent on " required
Expand Down Expand Up @@ -91,14 +102,6 @@ nnoremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l
" ======================== scrooloose/syntastic settings ====================
let g:syntastic_error_symbol = ''
let g:syntastic_warning_symbol = ""
augroup mySyntastic
au!
au FileType tex let b:syntastic_mode = "passive"
augroup END

"================================ Turn Swap files off =======================
set noswapfile
set nobackup
Expand Down
119 changes: 119 additions & 0 deletions .zshrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
# If you come from bash you might have to change your $PATH.
# export PATH=$HOME/bin:/usr/local/bin:$PATH
zmodload zsh/zprof

# Path to your oh-my-zsh installation.
export ZSH="/Users/George/.oh-my-zsh"
export TERM="xterm-256color"
export EDITOR="/usr/local/bin/nvim"

# Set name of the theme to load. Optionally, if you set this to "random"
# it'll load a random theme each time that oh-my-zsh is loaded.
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
ZSH_THEME="agnoster"

# Set list of themes to load
# Setting this variable when ZSH_THEME=random
# cause zsh load theme from this variable instead of
# looking in ~/.oh-my-zsh/themes/
# An empty array have no effect
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )

# Uncomment the following line to use case-sensitive completion.
# CASE_SENSITIVE="true"

# Uncomment the following line to use hyphen-insensitive completion. Case
# sensitive completion must be off. _ and - will be interchangeable.
# HYPHEN_INSENSITIVE="true"

# Uncomment the following line to disable bi-weekly auto-update checks.
# DISABLE_AUTO_UPDATE="true"

# Uncomment the following line to change how often to auto-update (in days).
# export UPDATE_ZSH_DAYS=13

# Uncomment the following line to disable colors in ls.
# DISABLE_LS_COLORS="true"

# Uncomment the following line to disable auto-setting terminal title.
# DISABLE_AUTO_TITLE="true"

# Uncomment the following line to enable command auto-correction.
# ENABLE_CORRECTION="true"

# Uncomment the following line to display red dots whilst waiting for completion.
# COMPLETION_WAITING_DOTS="true"

# Uncomment the following line if you want to disable marking untracked files
# under VCS as dirty. This makes repository status check for large repositories
# much, much faster.
# DISABLE_UNTRACKED_FILES_DIRTY="true"

# Uncomment the following line if you want to change the command execution time
# stamp shown in the history command output.
# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
# HIST_STAMPS="mm/dd/yyyy"

# Would you like to use another custom folder than $ZSH/custom?
# ZSH_CUSTOM=/path/to/new-custom-folder

# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(
git
git-extras
git-flow
colored-man
colorize
github
vagrant
virtualenv
pip
python
brew
osx
zsh-syntax-highlighting
npm
docker
django
bower
celery
node
sublime
sudo
supervisor
web-search
)

source $ZSH/oh-my-zsh.sh

# User configuration

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

# You may need to manually set your language environment
# export LANG=en_US.UTF-8

# Preferred editor for local and remote sessions
# if [[ -n $SSH_CONNECTION ]]; then
# export EDITOR='vim'
# else
# export EDITOR='mvim'
# fi

# Compilation flags
# export ARCHFLAGS="-arch x86_64"

# ssh
# export SSH_KEY_PATH="~/.ssh/rsa_id"

# Set personal aliases, overriding those provided by oh-my-zsh libs,
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
# For a full list of active aliases, run `alias`.
#
# Example aliases
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"

0 comments on commit 3e30505

Please sign in to comment.