aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2016-10-12 22:43:53 +0200
committerKarel Kočí <cynerd@email.cz>2016-10-12 22:43:53 +0200
commit3292431be4912793435819d40d7ba154deacc096 (patch)
tree3306727e3ae6619658873eb4b11f5201f39e1fef
parent271a3fbb14ccc50a3a3c1690dd64ac0695566bcc (diff)
parent62a5bb5a67b0392048b47fec32ac8b17369acd89 (diff)
downloadmyconfigs-3292431be4912793435819d40d7ba154deacc096.tar.gz
myconfigs-3292431be4912793435819d40d7ba154deacc096.tar.bz2
myconfigs-3292431be4912793435819d40d7ba154deacc096.zip
Merge branch 'master' of git.cynerd.cz:myconfigs
-rw-r--r--conkerorrc7
-rw-r--r--vimrc3
2 files changed, 5 insertions, 5 deletions
diff --git a/conkerorrc b/conkerorrc
index afe3a48..1ede2ba 100644
--- a/conkerorrc
+++ b/conkerorrc
@@ -132,7 +132,7 @@ function pass_chose_account(I) {
I.window.minibuffer.message("pass: No accounts detected for domain: " + pass_domain);
pass_account = "";
return;
- // Note that accs has empty line at end so all this is bupped by one
+ // Note that accs has empty line at end so all this is bumped by one
} else if (accs.length == 2) {
pass_account = accs[0].replace(/\.\//, '').replace(/\.gpg$/, '');
} else {
@@ -153,7 +153,7 @@ function pass_chose_account(I) {
function pass_get_password(I) {
var domain = yield get_domain(I);
- if (pass_account == "" || pass_domain != domain) {
+ if (pass_account == "" || String(pass_domain) != String(domain)) {
yield pass_chose_account(I);
}
if (pass_account != "" && I.buffer.focused_element) {
@@ -161,6 +161,7 @@ function pass_get_password(I) {
dumpln(res.stdout);
I.buffer.focused_element.value = res.stdout;
I.window.minibuffer.message("pass: Inserted password for account: " + pass_account);
+ pass_account = ""; // remove selected account so we can select new one
}
};
@@ -173,8 +174,6 @@ function pass_get_name(I) {
}
};
-// TODO iterate trough all pass to chose account
-
interactive("pass-get-name", "Choses account for to be loged as. As result name of account is outputed.", pass_get_name);
interactive("pass-get-password", "Receives password from pass for currently selected account.", pass_get_password);
/////////////////////////////////////////////////////////////////////////////////
diff --git a/vimrc b/vimrc
index 4460f33..addd436 100644
--- a/vimrc
+++ b/vimrc
@@ -6,6 +6,8 @@ execute pathogen#infect()
syntax on
filetype plugin indent on
+colorscheme elflord
+
set exrc
set secure
set title
@@ -23,7 +25,6 @@ set colorcolumn=82
set textwidth=82
highlight ColorColumn ctermbg=darkgray
-colorscheme elflord
" Tabs setting. In default we want 4 spaces tab, but allows also 8 spaced tabs
set noexpandtab