Compare commits

...

15 Commits
master ... wsr

Author SHA1 Message Date
Peter J. Holzer f0e262faaa Merge branch 'master' into wsr 2024-05-17 10:51:24 +02:00
Peter J. Holzer 2be2dbcf7c Merge branch 'master' into wsr 2024-05-11 16:53:15 +02:00
Peter J. Holzer b28a2cb5c0 Fix GIT_AUTHOR_EMAIL 2024-04-23 09:28:39 +02:00
Peter J. Holzer 5854bc87fe Set colors for man to match the background 2024-04-18 12:34:10 +02:00
Peter J. Holzer d52f548201 Merge branch 'master' into wsr 2024-02-01 14:50:50 +01:00
Peter J. Holzer e2eecd93e3 Merge branch 'master' into wsr 2023-11-21 13:23:53 +01:00
Peter J. Holzer b3734a861b Merge branch 'master' into wsr 2023-10-13 10:49:21 +02:00
Peter J. Holzer d34e84c609 Use .nvm if present 2023-08-08 15:51:24 +02:00
Peter J. Holzer d466fe0733 Merge branch 'master' into wsr 2023-03-05 15:10:51 +01:00
Peter J. Holzer 0d49086578 Merge branch 'master' into wsr 2023-03-05 15:07:21 +01:00
Peter J. Holzer 7615a2b46d Merge branch 'master' into wsr 2022-09-10 23:06:19 +02:00
Peter J. Holzer 6b43dd1992 Disable colors for node REPL 2022-06-09 10:31:38 +02:00
Peter J. Holzer f5eddf9c4e Merge branch 'master' into wsr 2022-05-05 16:24:50 +02:00
Peter J. Holzer 03c2eba133 Merge branch 'wsr' of git.hjp.at:hjp/dot into wsr 2022-04-23 01:20:27 +02:00
Peter J. Holzer 9fad80eac7 Add int.wsr.at to LOCALDOMAIN 2022-03-04 10:43:28 +01:00
2 changed files with 11 additions and 3 deletions

View File

@ -228,7 +228,8 @@ esac
case "$FQDN" in
*.wsr.ac.at)
export LOCALDOMAIN="wsr.ac.at hjp.at"
# This seems to be used only be ssh
export LOCALDOMAIN="int.wsr.at wsr.ac.at hjp.at"
;;
esac
@ -238,10 +239,10 @@ then
fi
case "$FQDN" in
*.wsr.ac.at)
*.wsr.ac.at|*.int.wsr.at|*.wifo.ac.at)
if [ -z "$GIT_AUTHOR_EMAIL" ]
then
export GIT_AUTHOR_EMAIL="$LOGNAME@wsr.ac.at"
export GIT_AUTHOR_EMAIL="$LOGNAME@wifo.ac.at"
fi
if [ -z "$GIT_AUTHOR_NAME" ]
then

7
.zshrc
View File

@ -152,3 +152,10 @@ fi
# for new style completion:
autoload -U compinit
compinit
# NVM
if [ -d "$HOME/.nvm" ]
then
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
fi