diff --git a/bootstrap.sh b/bootstrap.sh index d113abd..9f16c98 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -17,7 +17,6 @@ test -L $HOME/.ncmpcpp/config || ln -f -s $BASEDIR/ncmpcpp $HOME/.ncmpcpp/config test -L $HOME/.tmux.conf || ln -f -s $BASEDIR/tmux $HOME/.tmux.conf test -L $HOME/.zsh || ln -f -s $BASEDIR/zsh $HOME/.zsh test -L $HOME/.zshrc || ln -f -s $BASEDIR/zshrc.zsh $HOME/.zshrc -test -L $HOME/.config/powerline || ln -f -s $BASEDIR/powerline $HOME/.config/powerline # ln vim files echo "Setting up vim" diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index c576cdf..5425649 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -9,7 +9,6 @@ alias brewcurl="/usr/local/opt/curl/bin/curl --cacert /usr/local/etc/openssl@1.1 alias brewssl="/usr/local/opt/openssl@1.1/bin/openssl" alias ga="git add" alias gf="git fetch --all; git fetch --tags" -alias git="hub" alias gs="git status" alias gb="git rev-parse --abbrev-ref HEAD" alias irc="ssh jmb -t '. ~/.zshrc; tmux attach -t irc'" diff --git a/zsh/functions.zsh b/zsh/functions.zsh index 2e936de..be578a7 100644 --- a/zsh/functions.zsh +++ b/zsh/functions.zsh @@ -19,7 +19,7 @@ gencert () { openssl ecparam -name secp384r1 -genkey -noout -out key chmod 644 key - openssl req -new -sha256 -key key -subj "/C=UK/ST=England/L=Darwen/O=JMB Dev Ltd/CN=$DOMAIN" -reqexts SAN -config <(cat $SSLCNF <(printf "[SAN]\nsubjectAltName=DNS:$DOMAIN")) -out csr + openssl req -new -sha256 -key key -subj "/C=UK/ST=England/L=Bury/O=JMB Dev Ltd/CN=$DOMAIN" -reqexts SAN -config <(cat $SSLCNF <(printf "[SAN]\nsubjectAltName=DNS:$DOMAIN")) -out csr openssl x509 -req -in csr -extfile <(cat $SSLCNF <(printf "[SAN]\nsubjectAltName=DNS:$DOMAIN")) -extensions SAN -CA ../jmb-ca-ecc.pem -CAkey ../jmb-ca-ecc.key -CAcreateserial -days 90 -sha256 -out crt cd $HOME/git/ca diff --git a/zshrc.zsh b/zshrc.zsh index b23c80a..88b620e 100644 --- a/zshrc.zsh +++ b/zshrc.zsh @@ -56,8 +56,7 @@ auto-ls () { chpwd_functions=( auto-ls $chpwd_functions ) # Go Lang stuff -test $PLATFORM = 'linux' && export GOPATH=$HOME/go -test $PLATFORM = 'osx' && export GOPATH=$HOME/Development/go +export GOPATH=$HOME/go export PATH="$PATH:/usr/local/go/bin:/usr/local/opt/go/libexec/bin:$GOPATH/bin" # GnuPG stuff