From 7de5620da579c02116a77e87de0060805b7fa7cd Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Thu, 6 Dec 2018 17:05:54 -0500 Subject: [PATCH] Setup GPG and added key --- aliases/zsh_aliases | 6 ++--- configs/i3/config | 2 +- dotfiles/.gitconfig | 3 +++ dotfiles/.mygpg-key-default | 52 +++++++++++++++++++++++++++++++++++++ dotfiles/.vimrc | 8 +++--- dotfiles/.zshrc | 18 ++++++++----- setup.sh | 4 +-- 7 files changed, 76 insertions(+), 17 deletions(-) create mode 100644 dotfiles/.mygpg-key-default diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases index 2f76b89..e59f533 100644 --- a/aliases/zsh_aliases +++ b/aliases/zsh_aliases @@ -199,7 +199,7 @@ alias gstr="git config credential.helper store" # add {{{ # alias ga="git add -A . && gs" -alias gac="git add -A . && git commit" +alias gac="git add -A . && git commit -S" # }}} add # # diff/log {{{ # @@ -222,11 +222,11 @@ alias gheadm1="git reset --hard HEAD~1" alias gls="git ls-tree -r HEAD --name-only" # push {{{ # -alias egc="nvim -c \"set syn=gitcommit\" -c \"set tw=72\" commit-msg.txt" +alias vgc="ni commit-msg.txt" alias gst="git stash" alias gstp="git stash pop" -alias gc="git commit" +alias gc="git commit -S" alias gcam="ga && git commit --amend --no-edit" alias gcamp="ga && git commit --amend --no-edit && gpsf" # todo: fix diff --git a/configs/i3/config b/configs/i3/config index 3932923..13a6b55 100644 --- a/configs/i3/config +++ b/configs/i3/config @@ -391,7 +391,7 @@ set $bar_trans 00 set $benq_ws_trans aa bar { i3bar_command i3bar -t - font pango:$sb_font 20 + font pango:$sb_font 21 colors { # 0 (transparent) -> 255 (opaque) in hex background $black$bar_trans diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig index dc6af0a..78f5e50 100644 --- a/dotfiles/.gitconfig +++ b/dotfiles/.gitconfig @@ -1,6 +1,7 @@ [user] email = kevin.mok@live.ca name = Kevin Mok + signingkey = AEA75288DC135CF5 [color] ui = auto [core] @@ -14,3 +15,5 @@ prompt = false [diff] tool = vimdiff +[commit] + gpgsign = true diff --git a/dotfiles/.mygpg-key-default b/dotfiles/.mygpg-key-default new file mode 100644 index 0000000..2f1a244 --- /dev/null +++ b/dotfiles/.mygpg-key-default @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +e811Sz/r0q/MXoY1iKXe +=ONHQ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index c468f35..7680262 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -27,6 +27,7 @@ set linespace=5 set timeoutlen=500 set hlsearch +set noswapfile " }}} set x=y " " commands for file types {{{ " @@ -34,7 +35,7 @@ set hlsearch autocmd VimResized * wincmd = autocmd BufNewFile,BufRead .* set syntax=sh autocmd Filetype css,htmldjango,html,tex,txt,markdown set tabstop=2 shiftwidth=2 expandtab -autocmd BufRead commit-msg.txt set filetype=gitcommit +autocmd BufRead commit-msg.txt set filetype=gitcommit tw=72 autocmd BufNewFile,BufRead *.md set filetype=markdown autocmd Filetype markdown set textwidth=0 @@ -254,12 +255,12 @@ nnoremap yg ggyG " }}} Mappings " -" Local Mappings {{{ " +" (tex) Local Mappings {{{ " let maplocalleader="-" autocmd Filetype c inoremap s struct pixel -" tex {{{ " autocmd Filetype tex inoremap bt \bowtie +autocmd Filetype tex inoremap c \checkmark autocmd Filetype tex inoremap d \delta autocmd Filetype tex inoremap D \Delta autocmd Filetype tex inoremap e \exists @@ -291,7 +292,6 @@ autocmd Filetype tex inoremap Z \mathbb{Z} " par3 autocmd Filetype tex inoremap wx $w(x)$ autocmd Filetype tex inoremap tx $t(x)$ -" }}} tex " autocmd Filetype md inoremap x 0f[lRX diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc index f459dfd..25a6b61 100644 --- a/dotfiles/.zshrc +++ b/dotfiles/.zshrc @@ -115,18 +115,22 @@ fi # pywal export PATH="${PATH}:${HOME}/.local/bin/:${HOME}/linux-config/scripts" (cat ~/.cache/wal/sequences &) +source ~/.cache/wal/colors.sh -# keyboard delay/rate xset r rate 200 60 -# laptop -if [ "$(hostname)" = "X1-Carbon" ]; + +# laptop specific {{{ # + +# keyboard delay/rate +if [ "$(hostname)" = "x1-carbon" ]; then xrandr --dpi 125 xinput disable "ELAN Touchscreen" # enable horizontal scrolling synclient HorizTwoFingerScroll=1 fi -source /home/kevin/.shortcuts + +# }}} laptop specific # # autoreload zsh aliases {{{ # @@ -152,10 +156,10 @@ add-zsh-hook precmd reload_aliases # }}} autoreload zsh aliases # -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh +source /home/kevin/.shortcuts # export pywal colors -source ~/.cache/wal/colors.sh +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -# autoload -U add-zsh-hook add-zsh-hook -Uz chpwd (){ ls -a; } +export GPG_TTY=$(tty) diff --git a/setup.sh b/setup.sh index 31c2166..ab86996 100755 --- a/setup.sh +++ b/setup.sh @@ -25,8 +25,8 @@ link_to_lc () { } link_to_lc "files" "$HOME" "$lc_dir/dotfiles" -link_to_lc "dirs" "$HOME/.config" "$lc_dir/configs" -link_to_lc "dirs" "$HOME/.themes" "$lc_dir/gtk/themes" +# link_to_lc "dirs" "$HOME/.config" "$lc_dir/configs" +# link_to_lc "dirs" "$HOME/.themes" "$lc_dir/gtk/themes" # setup nvim config # nvim_file="/home/kevin/lc-test/init.vim"