Merge host-specific configuration to tags
Alan Pearce alan@ap-spotcap.local
Fri, 17 Mar 2017 10:01:23 +0100
10 files changed, 11 insertions(+), 17 deletions(-)
D host-ap-spotcap.local/config/zsh/zshenv.local
@@ -1,9 +0,0 @@-# -*- mode: sh; -*- -if [[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] -then - . $HOME/.nix-profile/etc/profile.d/nix.sh; -fi - -JIRA_RAPID_BOARD=true -JIRA_URL=https://spotcap.atlassian.net -EMAIL=alan.pearce@spotcap.com
D host-ap-spotcap.local/rcrc.local
@@ -1,2 +0,0 @@-DOTFILES_DIRS="$HOME/projects/dotfiles" -TAGS="emacs git global tmux zsh"
D host-prefect/Xresources
@@ -1,4 +0,0 @@-#include "main" - -Emacs.Font: -xos4-Terminus-normal-normal-normal-*-14-*-*-*-*-*-*-* -Emacs.fixed-pitch.attributeFont: -xos4-Terminus-normal-normal-normal-*-14-*-*-*-*-*-*-*
D host-prefect/rcrc.local
@@ -1,2 +0,0 @@-DOTFILES_DIRS="$HOME/projects/dotfiles" -TAGS="emacs git hg clojure ssh zsh"
M zsh/.config/zsh/.zshenv → zsh/.config/zsh/.zshenv
@@ -17,6 +17,11 @@ then export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR:-/run/user/$UID}/ssh-agent fi + if [[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] + then + . $HOME/.nix-profile/etc/profile.d/nix.sh; + fi + case $OSTYPE in darwin*) os=darwin
M zsh/.config/zsh/.zshrc → zsh/.config/zsh/.zshrc
@@ -133,6 +133,12 @@ then eval $(ssh-agent) fi +if zplug check gerges/oh-my-zsh-jira-plus +then + JIRA_RAPID_BOARD=true + JIRA_URL=https://spotcap.atlassian.net +fi + # Then, source plugins and add commands to $PATH zplug load