diff options
| author | Andreas Fankhauser | 2022-12-21 14:49:02 +0100 |
|---|---|---|
| committer | Andreas Fankhauser | 2022-12-21 14:49:10 +0100 |
| commit | 74b90ef03771d37c3081e8b3025ebac9024be84c (patch) | |
| tree | 6457dc99c99bbf2264403aea4d0c26326bed6d5c | |
| parent | f2de55f1adaad7c25cf566815a40503c6b735d41 (diff) | |
| parent | 7e9462ebbf82449537d7b42f02def81612772734 (diff) | |
| download | dotfiles-74b90ef03771d37c3081e8b3025ebac9024be84c.zip dotfiles-74b90ef03771d37c3081e8b3025ebac9024be84c.tar.gz | |
Merge gh master to local master
| -rw-r--r-- | src/gpg/gpg-agent.conf | 0 | ||||
| -rw-r--r-- | src/gpg/gpg.conf | 6 | ||||
| -rw-r--r-- | src/vi/_vimrc | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/gpg/gpg-agent.conf b/src/gpg/gpg-agent.conf new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/gpg/gpg-agent.conf diff --git a/src/gpg/gpg.conf b/src/gpg/gpg.conf new file mode 100644 index 0000000..ae206dc --- /dev/null +++ b/src/gpg/gpg.conf @@ -0,0 +1,6 @@ + +with-keygrip +keyid-format long +with-fingerprint +with-subkey-fingerprint + diff --git a/src/vi/_vimrc b/src/vi/_vimrc index cca102a..af86e7e 100644 --- a/src/vi/_vimrc +++ b/src/vi/_vimrc @@ -87,14 +87,14 @@ set linebreak set nobackup set nowritebackup set noswapfile -set formatoptions=roq +set fo=jlnroq fo-=t +set textwidth=72 set number set hidden " <- Allow to switch buffer even it is not saved. set ruler set hlsearch set scrolloff=1 " <- Keep free lines top/bottom before/after cursor set showcmd -set textwidth=0 set listchars=eol:$,tab:>- set showbreak=↳\ "set wildmenu |