From 530bd977aeca63a72195d51c666bbc140af74bc0 Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Fri, 27 Dec 2019 15:45:55 +0000 Subject: better handling of org-gcal keys --- custom-settings.el | 2 +- init.el | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/custom-settings.el b/custom-settings.el index 431792c..46d1440 100644 --- a/custom-settings.el +++ b/custom-settings.el @@ -68,7 +68,7 @@ '(org-sort-agenda-notime-is-late nil) '(package-selected-packages (quote - (csv-mode expand-region org-gcal lsp-python-ms ace-window discover-my-major popup-kill-ring amx gnu-elpa-keyring-update auto-package-update monokai-theme color-theme-monokai color-theme-sanityinc-tomorrow dracula-theme evil-mode yasnippet-snippets highlight-symbol rainbow-delimiters git-gutter Ivy org-caldav which-key-mode org-plus-contrib use-package ac-cider magit blacken py-autopep8 flycheck elpy yasnippet company-lsp company lsp-ui go-autocomplete lsp-mode go-mode markdown-mode gruvbox-theme helm org cider slime evil))) + (password-store csv-mode expand-region org-gcal lsp-python-ms ace-window discover-my-major popup-kill-ring amx gnu-elpa-keyring-update auto-package-update monokai-theme color-theme-monokai color-theme-sanityinc-tomorrow dracula-theme evil-mode yasnippet-snippets highlight-symbol rainbow-delimiters git-gutter Ivy org-caldav which-key-mode org-plus-contrib use-package ac-cider magit blacken py-autopep8 flycheck elpy yasnippet company-lsp company lsp-ui go-autocomplete lsp-mode go-mode markdown-mode gruvbox-theme helm org cider slime evil))) '(pdf-view-midnight-colors (quote ("#fdf4c1" . "#282828"))) '(pos-tip-background-color "#36473A") '(pos-tip-foreground-color "#FFFFC8") diff --git a/init.el b/init.el index 48a9b2f..2707a12 100644 --- a/init.el +++ b/init.el @@ -210,6 +210,9 @@ (use-package magit :bind ("C-x g" . magit-status)) +;; Integration with pass password manager +(use-package password-store) + ;; Git enhancement (use-package git-gutter :config @@ -309,8 +312,10 @@ (use-package org-gcal :bind (:map org-agenda-mode-map ("g" . org-gcal-fetch)) :config + (setq org-gcal-secret (password-store-get "EmacsSecrets/org-gcal-secret") + org-gcal-client-id (password-store-get "EmacsSecrets/org-gcal-client-id")) (setq org-gcal-client-id "685624394721-5bsfpo57ri2rcc7k6f8sbg12gjrs7dot.apps.googleusercontent.com" - org-gcal-client-secret "IAZ8j86uAPyolUnPGJxfieGO" + org-gcal-client-secret org-gcal-secret org-gcal-file-alist '(("matthew.lemon@gmail.com" . "~/Nextcloud/org/calendar/work-cal.org") ("12panp3nqdbmm9df4if9jigigo@group.calendar.google.com" . "~/Nextcloud/org/calendar/home-cal.org")))) -- cgit v1.2.3