From 2167ca7190d34e0287a44f9b829dbd5cc7a2d35f Mon Sep 17 00:00:00 2001
From: gxlin <iigxlin@gmail.com>
Date: Wed, 23 Jun 2021 22:35:32 +0800
Subject: Add git-crypt and some config about maildir

---
 .emacs.d/init-mu4e.el                                 | Bin 1106 -> 1675 bytes
 .emacs.d/init.el                                      |   2 +-
 .git-crypt/.gitattributes                             |   4 ++++
 .../0/66BE707A881973C4CF90E3D406656CCBA14E6240.gpg    | Bin 0 -> 304 bytes
 .gitattributes                                        |   2 ++
 .offlineimaprc                                        | Bin 0 -> 886 bytes
 .tmux.conf                                            |   4 ++--
 .vim/init.vim                                         |   5 +----
 .vim/plugins/general.plug                             |   1 +
 .vim/plugins/misc.plug                                |   5 ++++-
 .zshrc                                                |   1 +
 11 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 .git-crypt/.gitattributes
 create mode 100644 .git-crypt/keys/default/0/66BE707A881973C4CF90E3D406656CCBA14E6240.gpg
 create mode 100644 .gitattributes
 create mode 100644 .offlineimaprc

diff --git a/.emacs.d/init-mu4e.el b/.emacs.d/init-mu4e.el
index bfa2bdc..513a9bf 100644
Binary files a/.emacs.d/init-mu4e.el and b/.emacs.d/init-mu4e.el differ
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 927ec8c..d37cb3b 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -38,7 +38,7 @@
 (require 'init-evil-mode)
 (require 'init-org-mode)
 (require 'init-lsp-mode)
-(require 'init-mu4e)
+(require 'init-mu4e nil 'noerror)
 
 ;; ledger-mode
 (use-package ledger-mode
diff --git a/.git-crypt/.gitattributes b/.git-crypt/.gitattributes
new file mode 100644
index 0000000..665b10e
--- /dev/null
+++ b/.git-crypt/.gitattributes
@@ -0,0 +1,4 @@
+# Do not edit this file.  To specify the files to encrypt, create your own
+# .gitattributes file in the directory where your files are.
+* !filter !diff
+*.gpg binary
diff --git a/.git-crypt/keys/default/0/66BE707A881973C4CF90E3D406656CCBA14E6240.gpg b/.git-crypt/keys/default/0/66BE707A881973C4CF90E3D406656CCBA14E6240.gpg
new file mode 100644
index 0000000..76353a9
Binary files /dev/null and b/.git-crypt/keys/default/0/66BE707A881973C4CF90E3D406656CCBA14E6240.gpg differ
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..05c1dcd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+.emacs.d/init-mu4e.el filter=git-crypt diff=git-crypt
+.offlineimaprc filter=git-crypt diff=git-crypt
diff --git a/.offlineimaprc b/.offlineimaprc
new file mode 100644
index 0000000..eaa225a
Binary files /dev/null and b/.offlineimaprc differ
diff --git a/.tmux.conf b/.tmux.conf
index 454d63c..5cf68e6 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -37,6 +37,6 @@ bind J resize-pane -D 5
 
 
 # copy and paste like vim
-# bind -T copy-mode-vi 'v' send -X begin-selection
-# bind -T copy-mode-vi 'y' send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
+ bind -T copy-mode-vi 'v' send -X begin-selection
+ bind -T copy-mode-vi 'y' send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
 
diff --git a/.vim/init.vim b/.vim/init.vim
index 7f2fbdc..275e838 100644
--- a/.vim/init.vim
+++ b/.vim/init.vim
@@ -48,9 +48,6 @@ if has("gui_running")
     endif
 endif
 
-if has("macunix")
-endif
-
 " Identation
 
 set autoindent
@@ -107,7 +104,7 @@ nnoremap <leader>cd :cd %:p:h<CR> :pwd<CR>
 source ~/.dotfiles/.vim/plugins/init.vim
 source ~/.dotfiles/.vim/keybindings.vim
 
-silent colorscheme onehalfdark
+silent colorscheme onedark
 
 highlight Pmenu ctermbg=grey
 set exrc
diff --git a/.vim/plugins/general.plug b/.vim/plugins/general.plug
index fd57452..4bbc709 100644
--- a/.vim/plugins/general.plug
+++ b/.vim/plugins/general.plug
@@ -4,6 +4,7 @@ Plug 'Valloric/YouCompleteMe', {
             \ 'for': ['python', 'cpp', 'go', 'gdscript']
             \ }
 Plug 'dense-analysis/ale'
+Plug 'sheerun/vim-polyglot'
 
 let g:ycm_language_server = []
 let g:Lf_RootMarkers = []
diff --git a/.vim/plugins/misc.plug b/.vim/plugins/misc.plug
index f79b438..34de763 100644
--- a/.vim/plugins/misc.plug
+++ b/.vim/plugins/misc.plug
@@ -10,4 +10,7 @@ nnoremap <F10> :call asyncrun#quickfix_toggle(6)<cr>
 Plug 'mhinz/vim-signify'
 Plug 'tpope/vim-unimpaired'
 Plug 'godlygeek/tabular'
-Plug 'sonph/onehalf', { 'rtp': 'vim' }
+
+" colorscheme
+" Plug 'sonph/onehalf', { 'rtp': 'vim' }
+Plug 'joshdick/onedark.vim'
diff --git a/.zshrc b/.zshrc
index e96709c..ed96e66 100644
--- a/.zshrc
+++ b/.zshrc
@@ -5,6 +5,7 @@ bindkey -e
 EDITOR=vim
 
 export LANG=en_US.UTF-8
+export GPG_KEY=$(tty)
 
 # Edit command line
 autoload -U edit-command-line
-- 
cgit v1.2.3