From 395519026e68bd381d1fe9beb9364315a4a18358 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Tue, 16 May 2017 16:16:26 +0200 Subject: [PATCH] changed some stuff --- lib/completions | 2 +- lib/fzf | 2 +- lib/nano/syntax | 2 +- lib/ohmyzsh | 2 +- zsh/zshrc | 28 +++++++++++++++------------- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lib/completions b/lib/completions index 72af5d0..907cba3 160000 --- a/lib/completions +++ b/lib/completions @@ -1 +1 @@ -Subproject commit 72af5d08f1c07507d74103af039e98a2791fccb5 +Subproject commit 907cba3fd9ba16020f55b06b47a86209352652d4 diff --git a/lib/fzf b/lib/fzf index b29375c..337cdbb 160000 --- a/lib/fzf +++ b/lib/fzf @@ -1 +1 @@ -Subproject commit b29375c844744fb45183bdbbb6d1ff854cf23b7a +Subproject commit 337cdbb37c1efc49b09b4cacc6e9ee1369c7d76d diff --git a/lib/nano/syntax b/lib/nano/syntax index 726c1a5..59441c7 160000 --- a/lib/nano/syntax +++ b/lib/nano/syntax @@ -1 +1 @@ -Subproject commit 726c1a50f391f5afbf229bfe1e136a2a1dbfee22 +Subproject commit 59441c7f5ac19b3696af02d859656c3dc898f7be diff --git a/lib/ohmyzsh b/lib/ohmyzsh index 98d8d34..b908fee 160000 --- a/lib/ohmyzsh +++ b/lib/ohmyzsh @@ -1 +1 @@ -Subproject commit 98d8d3429f8b9fc2c4c109fb199a31c8d1735699 +Subproject commit b908feebcfb0ca8a9a80360d177e716c24c317d6 diff --git a/zsh/zshrc b/zsh/zshrc index e82c418..c3c64d3 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,26 +1,31 @@ -# Exports - mostly self-explaining +# Exports export ZSH=${HOME}/dotfiles/lib/ohmyzsh ZSH_THEME="mortalscumbag" DISABLE_AUTO_UPDATE="true" export GOPATH=${HOME}/go -export PATH="${GOPATH}/bin:${HOME}/.gem/ruby/2.3.0/bin:${HOME}/dotfiles/lib/util:${HOME}/dotfiles/lib/dasht/bin:${PATH}" +export PATH="${GOPATH}/bin:${HOME}/.gem/ruby/2.3.0/bin:${HOME}/dotfiles/lib/util:${HOME}/dotfiles/lib/bin:${HOME}/dotfiles/lib/dasht/bin:${PATH}" export DASHT_DOCSETS_DIR=$HOME/.local/share/Zeal/Zeal/docsets export EDITOR='nano' # Plugins -plugins=(gem bundler composer git vagrant docker python) -plugins+=(npm systemd systemadmin gitignore tmux extract) -plugins+=(command-not-found colored-man-pages fabric ansible) +plugins=(gem bundler git vagrant docker python ansible) +plugins+=(systemd systemadmin tmux command-not-found extract) case $(uname -n) in -"megumi|sayaka") - plugins+=(archlinux) +"megumi") + plugins+=(archlinux) ;; -"test|git") - plugins+=(debian) +"sayaka") + plugins+=(archlinux) + ;; +"git") + plugins+=(debian) + ;; +"test") + plugins+=(debian) ;; esac -# Load Parts of Scripts +# OMZ source ${ZSH}/oh-my-zsh.sh # Syntax Highlighting @@ -35,9 +40,6 @@ done # FZF [ -f ${HOME}/.fzf.zsh ] && source ${HOME}/.fzf.zsh -# Local ZSHRC -[ -f ${HOME}/local.zshrc ] && source ${HOME}/local.zshrc - # Dircolors eval `dircolors ${HOME}/dotfiles/zsh/dircolors`