From 56fa6951bccc312b24b3766c38c0e49e64a796fb Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Thu, 1 Mar 2018 14:38:58 +0000
Subject: Merge 'username' and 'passwords' scripts

---
 bin/bin/password | 7 ++++++-
 bin/bin/username | 4 ----
 vim/.vimrc       | 6 +++++-
 3 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100755 bin/bin/username

diff --git a/bin/bin/password b/bin/bin/password
index f94379a..ffcbb7e 100755
--- a/bin/bin/password
+++ b/bin/bin/password
@@ -1,2 +1,7 @@
 #!/usr/bin/env bash
-passmenu
+
+# Username in primary, password in clipboard
+
+target=$(find "$HOME/.password-store/" -name "*.gpg" -printf "%P\\n" | dmenu -i -p "Get identifier for:")
+basename "$target" .gpg | xclip -i -selection "primary"
+pass show --clip "${target%.gpg}"
diff --git a/bin/bin/username b/bin/bin/username
deleted file mode 100755
index b124733..0000000
--- a/bin/bin/username
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-target=$(find $HOME/.password-store/ -name "*.gpg" -printf "%P\n" | dmenu -i -p "Get identifier for:")
-basename $target .gpg | xclip -i
diff --git a/vim/.vimrc b/vim/.vimrc
index dfbe0e9..30bc942 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -95,7 +95,6 @@ map gs <Plug>(easymotion-prefix)
 " Fuzzy finder
 nnoremap <c-p>a  :Ag
 nnoremap <c-p>b  :Buffers<cr>
-nnoremap <c-p>c  :Commands<cr>
 nnoremap <c-p>C  :Colors<cr>
 nnoremap <c-p>f  :Files<cr>
 nnoremap <c-p>g  :GitFiles<cr>
@@ -105,6 +104,11 @@ nnoremap <c-p>/  :History/<cr>
 nnoremap <c-p>l  :BLines<cr>
 nnoremap <c-p>m  :Marks<cr>
 nnoremap <c-p>t  :Tags<cr>
+nnoremap <c-p>a  :Ag
+
+nnoremap <a-b>  :Buffers<cr>
+nnoremap <a-f>  :Files<cr>
+nnoremap <a-g>  :GitFiles<cr>
 
 " LLDB
 nnoremap <c-d>n :LLsession new<cr>
-- 
cgit v1.2.3