From bbac3731d23fb49c524b6f4de1119d5f89d4bfc8 Mon Sep 17 00:00:00 2001 From: Marcel Schneider Date: Tue, 3 Jan 2017 19:06:58 +0100 Subject: [PATCH] Use oh-my-zshs dir for custom settings --- zsh/zshrc.symlink => custom.zsh | 3 ++- install.sh | 6 +++--- tmux/tmux.conf.symlink | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) rename zsh/zshrc.symlink => custom.zsh (54%) diff --git a/zsh/zshrc.symlink b/custom.zsh similarity index 54% rename from zsh/zshrc.symlink rename to custom.zsh index d64d389..b5568dd 100644 --- a/zsh/zshrc.symlink +++ b/custom.zsh @@ -1,3 +1,4 @@ -source $HOME/.oh-my-zsh/zshrc.sh +ZSH_THEME="agnoster" + source $HOME/.dotfiles/zsh/aliases.zsh diff --git a/install.sh b/install.sh index 6087f9c..f8384bb 100755 --- a/install.sh +++ b/install.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash +DOTFILES=$HOME/.dotfiles + if [[ ! -d ~/.oh-my-zsh ]]; then echo -e "\nInstall oh-my-zsh" echo "=============================" sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" - mv $HOME/.zshrc $HOME/.oh-my-zsh/zshrc.sh + ln -s $DOTFILES/zsh/custom.zsh ~/.oh-my-zsh/custom/custom.zsh fi -DOTFILES=$HOME/.dotfiles - echo -e "\nCreating symlinks" echo "==============================" linkables=$( find -H "$DOTFILES" -maxdepth 3 -name '*.symlink' ) diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink index 518f8cf..367539c 100644 --- a/tmux/tmux.conf.symlink +++ b/tmux/tmux.conf.symlink @@ -1,4 +1,4 @@ -#set -g default-command "login-shell" +set -g default-command "zsh" # tmux display things in 256 colors #set -g default-terminal "tmux-256color-italic"