Merge host-specific configuration to tags

10 files changed, 11 insertions, 17 deletions

diff --git a/host-ap-spotcap.local/emacs.d/private.el.gpg b/emacs/.emacs.d/private.el.gpg
index 784a023b..784a023b 100644
--- a/host-ap-spotcap.local/emacs.d/private.el.gpg
+++ b/emacs/.emacs.d/private.el.gpg
Binary files differdiff --git a/host-ap-spotcap.local/config/zsh/zshenv.local b/host-ap-spotcap.local/config/zsh/zshenv.local
deleted file mode 100644
index af63e1ba..00000000
--- a/host-ap-spotcap.local/config/zsh/zshenv.local
+++ /dev/null
@@ -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
diff --git a/host-ap-spotcap.local/rcrc.local b/host-ap-spotcap.local/rcrc.local
deleted file mode 100644
index 4639c9e2..00000000
--- a/host-ap-spotcap.local/rcrc.local
+++ /dev/null
@@ -1,2 +0,0 @@
-DOTFILES_DIRS="$HOME/projects/dotfiles"
-TAGS="emacs git global tmux zsh"
\ No newline at end of file
diff --git a/host-prefect/Xresources b/host-prefect/Xresources
deleted file mode 100644
index c89d4863..00000000
--- a/host-prefect/Xresources
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "main"
-
-Emacs.Font:                         -xos4-Terminus-normal-normal-normal-*-14-*-*-*-*-*-*-*
-Emacs.fixed-pitch.attributeFont:    -xos4-Terminus-normal-normal-normal-*-14-*-*-*-*-*-*-*
diff --git a/host-prefect/rcrc.local b/host-prefect/rcrc.local
deleted file mode 100644
index 3b80dd6e..00000000
--- a/host-prefect/rcrc.local
+++ /dev/null
@@ -1,2 +0,0 @@
-DOTFILES_DIRS="$HOME/projects/dotfiles"
-TAGS="emacs git hg clojure ssh zsh"
diff --git a/host-ap-spotcap.local/config/mpv/config b/mpv/.config/config
index 56c6d996..56c6d996 100644
--- a/host-ap-spotcap.local/config/mpv/config
+++ b/mpv/.config/config
diff --git a/host-ap-spotcap.local/slate b/slate/.slate
index e8c675d0..e8c675d0 100644
--- a/host-ap-spotcap.local/slate
+++ b/slate/.slate
diff --git a/host-marvin/xmodmaprc b/xmodmap/xmodmaprc
index 82a8674f..82a8674f 100644
--- a/host-marvin/xmodmaprc
+++ b/xmodmap/xmodmaprc
diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv
index f1cad02f..0be5a7a6 100644
--- a/zsh/.config/zsh/.zshenv
+++ b/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
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index f2102b34..8a9c8063 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/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