environment.sh

mj
1 parent a911fd5846
Showing 3 changed files with 24 additions and 6 deletions Side-by-side Diff
dotfiles/environment.sh
templates/bashrc.sh
templates/zshrc.sh
@@ -0,0 +1,7 @@
+#@IgnoreInspection AddShebang
+
+# git:
+export GIT_AUTHOR_NAME="mj"
+export GIT_AUTHOR_EMAIL="mj@str8.biz"
+export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME
+export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL
@@ -100,9 +100,13 @@ if [ -x /usr/bin/dircolors ]; then
     alias egrep='egrep --color=auto'
 fi
  
+# Environment
+if [ -f $ZCFG/dotfiles/environment.sh ]; then
+    . $ZCFG/dotfiles/environment.sh
+fi
  
-# Alias definitions
  
-if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
-    . ~/.config/zsh-config/templates/bash_aliases
+# Alias definitions
+if [ -f $ZCFG/templates/bash_aliases ]; then
+    . $ZCFG/templates/bash_aliases
 fi
 #@IgnoreInspection AddShebang
 # ENVIRONMENT:
-export GJ_DEVENV=local_aptproxy
+export GJ_ENV=local_aptproxy
  
 export ZCFG=~/.config/zsh-config
 # Path to your oh-my-zsh installation.
@@ -32,12 +32,19 @@ plugins=(command-not-found common-aliases debian dirhistory git history history-
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
  
+# Environment
+if [ -f $ZCFG/dotfiles/environment.sh ]; then
+    . $ZCFG/dotfiles/environment.sh
+fi
+
 export HISTFILESIZE=
 export HISTSIZE=
 export HISTFILE=~/.history
  
 source $ZSH/oh-my-zsh.sh
  
-if [ -f ~/.config/zsh-config/templates/bash_aliases.sh ]; then
-    . ~/.config/zsh-config/templates/bash_aliases.sh
+
+# Aliases
+if [ -f $ZCFG/templates/bash_aliases.sh ]; then
+    . $ZCFG/templates/bash_aliases.sh
 fi
...	...	@@ -0,0 +1,7 @@
	1	+#@IgnoreInspection AddShebang
	2	+
	3	+# git:
	4	+export GIT_AUTHOR_NAME="mj"
	5	+export GIT_AUTHOR_EMAIL="mj@str8.biz"
	6	+export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME
	7	+export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL
...	...	@@ -100,9 +100,13 @@ if [ -x /usr/bin/dircolors ]; then
100	100	alias egrep='egrep --color=auto'
101	101	fi
102	102
	103	+# Environment
	104	+if [ -f $ZCFG/dotfiles/environment.sh ]; then
	105	+ . $ZCFG/dotfiles/environment.sh
	106	+fi
103	107
104		-# Alias definitions
105	108
106		-if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
107		- . ~/.config/zsh-config/templates/bash_aliases
	109	+# Alias definitions
	110	+if [ -f $ZCFG/templates/bash_aliases ]; then
	111	+ . $ZCFG/templates/bash_aliases
108	112	fi
1	1	#@IgnoreInspection AddShebang
2	2	# ENVIRONMENT:
3		-export GJ_DEVENV=local_aptproxy
	3	+export GJ_ENV=local_aptproxy
4	4
5	5	export ZCFG=~/.config/zsh-config
6	6	# Path to your oh-my-zsh installation.
...	...	@@ -32,12 +32,19 @@ plugins=(command-not-found common-aliases debian dirhistory git history history-
32	32	export PATH=$HOME/bin:/usr/local/bin:$PATH
33	33	# export MANPATH="/usr/local/man:$MANPATH"
34	34
	35	+# Environment
	36	+if [ -f $ZCFG/dotfiles/environment.sh ]; then
	37	+ . $ZCFG/dotfiles/environment.sh
	38	+fi
	39	+
35	40	export HISTFILESIZE=
36	41	export HISTSIZE=
37	42	export HISTFILE=~/.history
38	43
39	44	source $ZSH/oh-my-zsh.sh
40	45
41		-if [ -f ~/.config/zsh-config/templates/bash_aliases.sh ]; then
42		- . ~/.config/zsh-config/templates/bash_aliases.sh
	46	+
	47	+# Aliases
	48	+if [ -f $ZCFG/templates/bash_aliases.sh ]; then
	49	+ . $ZCFG/templates/bash_aliases.sh
43	50	fi