diff options
| -rwxr-xr-x | .bashrc | 26 | ||||
| -rw-r--r-- | .gitconfig | 14 | ||||
| -rw-r--r-- | .zshrc | 4 | ||||
| -rwxr-xr-x | brew.sh | 3 |
4 files changed, 27 insertions, 20 deletions
@@ -10,10 +10,10 @@ case $- in esac # Start the gpg-agent if not already running -if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then - gpg-connect-agent /bye >/dev/null 2>&1 -fi -gpg-connect-agent updatestartuptty /bye >/dev/null +# if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then +# gpg-connect-agent /bye >/dev/null 2>&1 +# fi +# gpg-connect-agent updatestartuptty /bye >/dev/null # use a tty for gpg # solves error: "gpg: signing failed: Inappropriate ioctl for device" @@ -21,13 +21,13 @@ GPG_TTY=$(tty) export GPG_TTY # Set SSH to use gpg-agent -unset SSH_AGENT_PID -if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then - if [[ -z "$SSH_AUTH_SOCK" ]] || [[ "$SSH_AUTH_SOCK" == *"apple.launchd"* ]]; then - SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" - export SSH_AUTH_SOCK - fi -fi +# unset SSH_AGENT_PID +# if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then +# if [[ -z "$SSH_AUTH_SOCK" ]] || [[ "$SSH_AUTH_SOCK" == *"apple.launchd"* ]]; then +# SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" +# export SSH_AUTH_SOCK +# fi +# fi # Shell if [ -z "$SSH_AUTH_SOCK" ] ; then @@ -53,4 +53,6 @@ for file in ~/.{aliases,path,extras}; do source "$file" fi done -unset file
\ No newline at end of file +unset file +export VOLTA_HOME="$HOME/.volta" +export PATH="$VOLTA_HOME/bin:$PATH" @@ -36,14 +36,14 @@ [merge] # Include summaries of merged commits in newly created merge commit messages log = true -[commit] - gpgsign = true -[pull] - rebase = true -[gpg] - program = gpg +#[commit] +# gpgsign = true +#[pull] +# rebase = true +# [gpg] +# program = gpg [user] name = Simen A. W. Olsen - email = so@bjerk.io + email = cobraz@cobraz.no [github] user = cobraz @@ -87,4 +87,6 @@ autoload -U add-zsh-hook if [[ -r "${HOME}/.bashrc" ]]; then # shellcheck source=/dev/null source "${HOME}/.bashrc" -fi
\ No newline at end of file +fi +export VOLTA_HOME="$HOME/.volta" +export PATH="$VOLTA_HOME/bin:$PATH" @@ -48,6 +48,7 @@ brew install gmp # Install font tools. brew tap bramstein/webfonttools +brew tap homebrew/cask-drivers brew install sfnt2woff brew install sfnt2woff-zopfli brew install woff2 @@ -86,6 +87,8 @@ brew cask install spotify brew cask install memory brew cask install slack brew cask install docker +brew cask install postman +brew cask install sonos # Github CLI brew install gh |