From 51726d4b5963f16b2dc5b0d8888e32beee4cfbe1 Mon Sep 17 00:00:00 2001
From: Tine Jozelj <tine@tjo.space>
Date: Thu, 2 Mar 2023 21:03:25 +0100
Subject: [PATCH] feat: code signing etc

---
 git/gitconfig          | 10 ++++++++--
 nvim/coc-settings.json |  3 ++-
 nvim/init.vim          | 10 +++++++---
 zsh/zshrc              |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
index 5f85042..02239cf 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -1,10 +1,10 @@
 [user]
   name = Tine Jozelj
   email = tine@tjo.space
-  #signingkey = 3818B74E3830D7CF
+	signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICXAlzwziqfUUb2qmFwNF/nrBYc5MNT1MMOx81ohBmB+
 
 [commit]
-  #gpgsign = true
+	gpgsign = true
 
 [init]
   defaultBranch = main
@@ -20,3 +20,9 @@
 
 [pull]
 	ff = only
+
+[gpg]
+	format = ssh
+
+[gpg "ssh"]
+	allowedSignersFile = /home/tine/.ssh/allowed_signers
diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json
index 6071891..118f17b 100644
--- a/nvim/coc-settings.json
+++ b/nvim/coc-settings.json
@@ -30,7 +30,8 @@
     "graphql",
     "prisma",
     "terraform",
-    "jsonc"
+    "jsonc",
+    "rust"
   ],
   "tsserver.formatOnType": true,
   "coc.preferences.formatOnType": true,
diff --git a/nvim/init.vim b/nvim/init.vim
index 5643d2a..3477b4b 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -50,6 +50,7 @@ let g:coc_global_extensions = [
   \ 'coc-html',
   \ 'coc-sql',
   \ 'coc-toml',
+  \ 'coc-rust-analyzer',
   \ ]
 if isdirectory('./node_modules') && isdirectory('./node_modules/prettier')
   let g:coc_global_extensions += ['coc-prettier']
@@ -63,10 +64,12 @@ endif
 inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
                               \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
 
+" Find symbol of current document.
+nnoremap <silent><nowait> <space>o  :<C-u>CocList outline<cr>
 " Diagnostic list
-nnoremap <silent> <space>d :<C-u>CocList diagnostics<cr>
+nnoremap <silent><nowait> <space>d :<C-u>CocList diagnostics<cr>
 " Symbols list
-nnoremap <silent> <space>s :<C-u>CocList -I symbols<cr>
+nnoremap <silent><nowait> <space>s :<C-u>CocList -I symbols<cr>
 " Code actions
 nmap <leader>do <Plug>(coc-codeaction)
 " Rename current world
@@ -140,7 +143,8 @@ require'nvim-treesitter.configs'.setup {
     "rust",
     "typescript",
     "vim",
-    "yaml"
+    "yaml",
+    "glsl"
   },
   -- Install languages synchronously (only applied to `ensure_installed`)
   sync_install = false,
diff --git a/zsh/zshrc b/zsh/zshrc
index b198a9b..3c48c71 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -42,7 +42,7 @@ bindkey -M vicmd "?" history-incremental-search-backward
 bindkey -M vicmd "/" history-incremental-search-forward
 
 # Aliases
-alias gicm="git checkout main && git pull"
+alias gicm="git checkout main && git pull || git checkout master && git pull"
 alias gic="git checkout"
 
 alias difft="difftastic"