Skip to content

Commit

Permalink
cleaned up coder stuff
Browse files Browse the repository at this point in the history
Removed GPG since it's not a thing anymore
  • Loading branch information
mterhar committed Dec 4, 2022
1 parent 2638c8a commit 5dd8da3
Show file tree
Hide file tree
Showing 12 changed files with 3 additions and 119 deletions.
4 changes: 0 additions & 4 deletions .bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ esac

alias ll='ls -la'

if [ -z $CODER_ASSETS_ROOT ]; then
alias code="$CODER_ASSETS_ROOT/code-server/bin/code-server"
fi

export EDITOR=vim

if ! which __git_ps1 2>&1 /dev/null; then
Expand Down
8 changes: 0 additions & 8 deletions .gnupg/.profile

This file was deleted.

1 change: 0 additions & 1 deletion .gnupg/gpg-agent.conf

This file was deleted.

1 change: 0 additions & 1 deletion .gnupg/gpg.conf

This file was deleted.

43 changes: 0 additions & 43 deletions .gnupg/mike_coder.com-publickey.asc

This file was deleted.

28 changes: 0 additions & 28 deletions .gnupg/setup-gpg

This file was deleted.

2 changes: 1 addition & 1 deletion .local/share/code-server/User/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
"git.enableSmartCommit": true,
"git.autofetch": true,
"editor.fontLigatures": true
}
}
4 changes: 0 additions & 4 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ else
alias ls="ls --color"
fi

if [ -n "$CODER_ASSETS_ROOT" ]; then
alias code="$CODER_ASSETS_ROOT/code-server/bin/code-server"
fi

alias v="vim"

## HISTORY
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ Easy usage: `curl -FSsl https://mjt.sh`

Configuration files for `vim`, `git`, `bash`, `zsh`, and `fzf`.

Some GPG stuff is also in there but is optional and only used for Coder environments.

## Clean-up

Occasionally it's good to clean up a repo like this one since history is less important after stuff has been working for a while.
Expand Down
Binary file removed extensions/eamodio.gitlens-11.7.0.vsix
Binary file not shown.
21 changes: 1 addition & 20 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cp -f ${DOTFILES_DIR}/.zshrc ~/.zshrc
cp -f ${DOTFILES_DIR}/.bashrc ~/.bashrc

git config --file ~/.gitconfig.local user.name "Mike Terhar"
git config --file ~/.gitconfig.local user.email "mike@coder.com"
git config --file ~/.gitconfig.local user.email "mike@terhar.com"

if [ -f "~/.fzf" ]
then
Expand All @@ -43,22 +43,3 @@ else
fi

mkdir -p ~/.vim_backup

echo "need a new gpg key before re-enabling this."

exit 0
if hash gpg 2>/dev/null; then
mkdir -p ~/.gnupg
chmod 700 ~/.gnupg
echo "gpg found, configuring public key and matching git credentials"
gpg --import ${DOTFILES_DIR}/.gnupg/mike_coder.com-publickey.asc
echo "7E8272805E6921642AA3A2A0F21DA83779444E18:6:" | gpg --import-ownertrust
git config --file ~/.gitconfig.local user.signingkey F21DA83779444E18
# git config --file ~/.gitconfig.local commit.gpgsign true
mv -n ~/.gnupg/gpg.conf ~/.gnupg/gpg.conf.${builddt}.bak
mv -n ~/.profile ~/.profile.${builddt}.bak
echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
echo "export GPG_TTY=\$(tty)" > ~/.profile
else
echo "gpg not found, no git signing"
fi
8 changes: 1 addition & 7 deletions linux/configure.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
#!/usr/bin/env bash

if [ -z "$CODER_ASSETS_ROOT" ]; then
echo "no coder, no extensions"
else
echo "insalling gitlens"
${CODER_ASSETS_ROOT}/code-server/bin/code-server --install-extension ${DOTFILES_DIR}/extensions/eamodio.gitlens-11.7.0.vsix
fi

echo "no custom linux configs these days"

0 comments on commit 5dd8da3

Please sign in to comment.