diff --git a/nanorc b/nanorc index 466bbde..bff566a 100644 --- a/nanorc +++ b/nanorc @@ -1,68 +1,68 @@ -include ~/.nano/apacheconf.nanorc -include ~/.nano/asciidoc.nanorc -include ~/.nano/asm.nanorc -include ~/.nano/awk.nanorc -include ~/.nano/c.nanorc -include ~/.nano/cmake.nanorc -include ~/.nano/coffeescript.nanorc -include ~/.nano/colortest.nanorc -include ~/.nano/conf.nanorc -include ~/.nano/csharp.nanorc -include ~/.nano/css.nanorc -include ~/.nano/cython.nanorc -include ~/.nano/dot.nanorc -include ~/.nano/email.nanorc -include ~/.nano/fish.nanorc -include ~/.nano/fortran.nanorc -include ~/.nano/gentoo.nanorc -include ~/.nano/git.nanorc -include ~/.nano/glsl.nanorc -include ~/.nano/go.nanorc -include ~/.nano/groff.nanorc -include ~/.nano/haml.nanorc -include ~/.nano/html.nanorc -include ~/.nano/ini.nanorc -include ~/.nano/inputrc.nanorc -include ~/.nano/java.nanorc -include ~/.nano/javascript.nanorc -include ~/.nano/js.nanorc -include ~/.nano/json.nanorc -include ~/.nano/keymap.nanorc -include ~/.nano/kickstart.nanorc -include ~/.nano/ledger.nanorc -include ~/.nano/lisp.nanorc -include ~/.nano/lua.nanorc -include ~/.nano/makefile.nanorc -include ~/.nano/man.nanorc -include ~/.nano/markdown.nanorc -include ~/.nano/mpdconf.nanorc -include ~/.nano/mutt.nanorc -include ~/.nano/nanorc.nanorc -include ~/.nano/nginx.nanorc -include ~/.nano/patch.nanorc -include ~/.nano/peg.nanorc -include ~/.nano/perl.nanorc -include ~/.nano/php.nanorc -include ~/.nano/pkg-config.nanorc -include ~/.nano/pkgbuild.nanorc -include ~/.nano/po.nanorc -include ~/.nano/pov.nanorc -include ~/.nano/privoxy.nanorc -include ~/.nano/python.nanorc -include ~/.nano/reST.nanorc -include ~/.nano/rpmspec.nanorc -include ~/.nano/ruby.nanorc -include ~/.nano/scala.nanorc -include ~/.nano/sed.nanorc -include ~/.nano/sh.nanorc -include ~/.nano/sql.nanorc -include ~/.nano/systemd.nanorc -include ~/.nano/tcl.nanorc -include ~/.nano/tex.nanorc -include ~/.nano/vala.nanorc -include ~/.nano/vi.nanorc -include ~/.nano/xml.nanorc -include ~/.nano/xresources.nanorc -include ~/.nano/yaml.nanorc -include ~/.nano/yum.nanorc -include ~/.nano/zsh.nanorc \ No newline at end of file +include ~/dotfiles/lib/nano/syntax/apacheconf.nanorc +include ~/dotfiles/lib/nano/syntax/asciidoc.nanorc +include ~/dotfiles/lib/nano/syntax/asm.nanorc +include ~/dotfiles/lib/nano/syntax/awk.nanorc +include ~/dotfiles/lib/nano/syntax/c.nanorc +include ~/dotfiles/lib/nano/syntax/cmake.nanorc +include ~/dotfiles/lib/nano/syntax/coffeescript.nanorc +include ~/dotfiles/lib/nano/syntax/colortest.nanorc +include ~/dotfiles/lib/nano/syntax/conf.nanorc +include ~/dotfiles/lib/nano/syntax/csharp.nanorc +include ~/dotfiles/lib/nano/syntax/css.nanorc +include ~/dotfiles/lib/nano/syntax/cython.nanorc +include ~/dotfiles/lib/nano/syntax/dot.nanorc +include ~/dotfiles/lib/nano/syntax/email.nanorc +include ~/dotfiles/lib/nano/syntax/fish.nanorc +include ~/dotfiles/lib/nano/syntax/fortran.nanorc +include ~/dotfiles/lib/nano/syntax/gentoo.nanorc +include ~/dotfiles/lib/nano/syntax/git.nanorc +include ~/dotfiles/lib/nano/syntax/glsl.nanorc +include ~/dotfiles/lib/nano/syntax/go.nanorc +include ~/dotfiles/lib/nano/syntax/groff.nanorc +include ~/dotfiles/lib/nano/syntax/haml.nanorc +include ~/dotfiles/lib/nano/syntax/html.nanorc +include ~/dotfiles/lib/nano/syntax/ini.nanorc +include ~/dotfiles/lib/nano/syntax/inputrc.nanorc +include ~/dotfiles/lib/nano/syntax/java.nanorc +include ~/dotfiles/lib/nano/syntax/javascript.nanorc +include ~/dotfiles/lib/nano/syntax/js.nanorc +include ~/dotfiles/lib/nano/syntax/json.nanorc +include ~/dotfiles/lib/nano/syntax/keymap.nanorc +include ~/dotfiles/lib/nano/syntax/kickstart.nanorc +include ~/dotfiles/lib/nano/syntax/ledger.nanorc +include ~/dotfiles/lib/nano/syntax/lisp.nanorc +include ~/dotfiles/lib/nano/syntax/lua.nanorc +include ~/dotfiles/lib/nano/syntax/makefile.nanorc +include ~/dotfiles/lib/nano/syntax/man.nanorc +include ~/dotfiles/lib/nano/syntax/markdown.nanorc +include ~/dotfiles/lib/nano/syntax/mpdconf.nanorc +include ~/dotfiles/lib/nano/syntax/mutt.nanorc +include ~/dotfiles/lib/nano/syntax/nanorc.nanorc +include ~/dotfiles/lib/nano/syntax/nginx.nanorc +include ~/dotfiles/lib/nano/syntax/patch.nanorc +include ~/dotfiles/lib/nano/syntax/peg.nanorc +include ~/dotfiles/lib/nano/syntax/perl.nanorc +include ~/dotfiles/lib/nano/syntax/php.nanorc +include ~/dotfiles/lib/nano/syntax/pkg-config.nanorc +include ~/dotfiles/lib/nano/syntax/pkgbuild.nanorc +include ~/dotfiles/lib/nano/syntax/po.nanorc +include ~/dotfiles/lib/nano/syntax/pov.nanorc +include ~/dotfiles/lib/nano/syntax/privoxy.nanorc +include ~/dotfiles/lib/nano/syntax/python.nanorc +include ~/dotfiles/lib/nano/syntax/reST.nanorc +include ~/dotfiles/lib/nano/syntax/rpmspec.nanorc +include ~/dotfiles/lib/nano/syntax/ruby.nanorc +include ~/dotfiles/lib/nano/syntax/scala.nanorc +include ~/dotfiles/lib/nano/syntax/sed.nanorc +include ~/dotfiles/lib/nano/syntax/sh.nanorc +include ~/dotfiles/lib/nano/syntax/sql.nanorc +include ~/dotfiles/lib/nano/syntax/systemd.nanorc +include ~/dotfiles/lib/nano/syntax/tcl.nanorc +include ~/dotfiles/lib/nano/syntax/tex.nanorc +include ~/dotfiles/lib/nano/syntax/vala.nanorc +include ~/dotfiles/lib/nano/syntax/vi.nanorc +include ~/dotfiles/lib/nano/syntax/xml.nanorc +include ~/dotfiles/lib/nano/syntax/xresources.nanorc +include ~/dotfiles/lib/nano/syntax/yaml.nanorc +include ~/dotfiles/lib/nano/syntax/yum.nanorc +include ~/dotfiles/lib/nano/syntax/zsh.nanorc diff --git a/zshrc b/zshrc index 37360c6..513f12e 100644 --- a/zshrc +++ b/zshrc @@ -1,22 +1,30 @@ +# ohmyzsh Path +export ZSH=$HOME/dotfiles/lib/ohmyzsh + +# ohmyzsh Theme +ZSH_THEME="pygmalion" + # Path export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$PATH" +# plugins +plugins=(gem bundler composer git pip vagrant docker python extract) +plugins+=(npm archlinux systemd systemadmin frontend-search gitignore) +plugins+=(command-not-found colored-man) + # Color TERM export TERM=xterm-256color # Preferred editor for local and remote sessions export EDITOR='nano' -# Load Fresh -source ~/.fresh/build/shell.sh - -# Source Antigen config -source ~/.dotfiles/zsh/antigen.zsh +# Load Oh My ZSH +source $ZSH/oh-my-zsh.sh # Shell Syntax Highlighter -source ~/.fresh/build/vendor/zsh-syntax-highlighting.zsh -source ~/.fresh/build/vendor/highlighters/main/main-highlighter.zsh -source ~/.fresh/build/vendor/highlighters/brackets/brackets-highlighter.zsh +source ~/dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh +source ~/dotfiles/lib/highlighting/main/main-highlighter.zsh +source ~/dotfiles/lib/highlighting/brackets/brackets-highlighter.zsh ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets) # CD without typing cd @@ -28,13 +36,13 @@ setopt histverify setopt histignorealldups setopt extendedhistory setopt histreduceblanks -export HISTSIZE=1000000 SAVEHIST=1000000 HISTFILE=~/.zhistory +export HISTSIZE=1000000 SAVEHIST=1000000 HISTFILE=$HOME/.zhistory # Dircolors -eval `dircolors ~/.dotfiles/dircolors` +eval `dircolors ~/dotfiles/dircolors` # Source Aliases -source ~/.dotfiles/zsh/alias.zsh +source ~/dotfiles/zsh/alias.zsh # Completions Path -fpath=(~/.fresh/build/completion $fpath) +fpath=(~/dotfiles/lib/completions/src $fpath)