Switch ERC to use secrets package instead of password-store
Remove password-store package
This commit is contained in:
parent
877f896ef5
commit
ec3cbbb111
67
README.org
67
README.org
|
@ -1,6 +1,7 @@
|
||||||
#+title: Emacs Config
|
#+title: Emacs Config
|
||||||
#+author: Evie Litherland-Smith
|
#+author: Evie Litherland-Smith
|
||||||
#+email: evie@xenia.me.uk
|
#+email: evie@xenia.me.uk
|
||||||
|
#+startup: content
|
||||||
#+property: header-args:emacs-lisp :results silent
|
#+property: header-args:emacs-lisp :results silent
|
||||||
Personal Emacs configuration. Clone to =~/.config/emacs/= (or
|
Personal Emacs configuration. Clone to =~/.config/emacs/= (or
|
||||||
=~/.emacs.d/=) and install specified plugins using [[file:install.el][the install script]].
|
=~/.emacs.d/=) and install specified plugins using [[file:install.el][the install script]].
|
||||||
|
@ -69,6 +70,17 @@ Bind mouse keys to expected movement commands
|
||||||
(keymap-global-set "<mouse-8>" #'previous-buffer)
|
(keymap-global-set "<mouse-8>" #'previous-buffer)
|
||||||
(keymap-global-set "<mouse-9>" #'next-buffer)
|
(keymap-global-set "<mouse-9>" #'next-buffer)
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
Set custom location for backups
|
||||||
|
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(setq backup-directory-alist '(("." . "~/.local/state/emacs/backups")))
|
||||||
|
#+end_src
|
||||||
|
|
||||||
|
** Secrets
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package secrets)
|
||||||
|
#+end_src
|
||||||
** UI and Appearance
|
** UI and Appearance
|
||||||
Configure the look and feel of Emacs
|
Configure the look and feel of Emacs
|
||||||
|
|
||||||
|
@ -639,6 +651,22 @@ Configure email with iCalendar event support, to integrate with
|
||||||
(setq mu4e-notification-support t))
|
(setq mu4e-notification-support t))
|
||||||
#+end_src
|
#+end_src
|
||||||
*** IRC
|
*** IRC
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package erc
|
||||||
|
:commands erc-compute-nick
|
||||||
|
:custom
|
||||||
|
(erc-nick (user-login-name))
|
||||||
|
(erc-user-full-name (user-full-name)))
|
||||||
|
|
||||||
|
(defun my/libera-chat-connect ()
|
||||||
|
"Connect to irc.libera.chat directly."
|
||||||
|
(interactive)
|
||||||
|
(require 'erc)
|
||||||
|
(require 'secrets)
|
||||||
|
(erc-tls
|
||||||
|
:server "irc.libera.chat"
|
||||||
|
:password (secrets-get-secret "default" "IRC libera.chat")))
|
||||||
|
#+end_src
|
||||||
** Other
|
** Other
|
||||||
** Initial copy from =init.el=
|
** Initial copy from =init.el=
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
@ -652,12 +680,6 @@ Configure email with iCalendar event support, to integrate with
|
||||||
(mouse-wheel-progressive-speed nil)
|
(mouse-wheel-progressive-speed nil)
|
||||||
(mouse-wheel-follow-mouse t))
|
(mouse-wheel-follow-mouse t))
|
||||||
|
|
||||||
;; Function for calling `gsync'
|
|
||||||
(defun my/gsync ()
|
|
||||||
"Run shell command `gsync' asynchronously."
|
|
||||||
(interactive)
|
|
||||||
(async-shell-command "gsync" "*gsync*" "*git-sync-errors*"))
|
|
||||||
|
|
||||||
;; Make shebang (#!) file executable when saved
|
;; Make shebang (#!) file executable when saved
|
||||||
(add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
|
(add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
|
||||||
|
|
||||||
|
@ -665,8 +687,6 @@ Configure email with iCalendar event support, to integrate with
|
||||||
(keymap-global-set "<remap> <upcase-word>" 'upcase-dwim)
|
(keymap-global-set "<remap> <upcase-word>" 'upcase-dwim)
|
||||||
(keymap-global-set "<remap> <downcase-word>" 'downcase-dwim)
|
(keymap-global-set "<remap> <downcase-word>" 'downcase-dwim)
|
||||||
|
|
||||||
(setq backup-directory-alist '(("." . "~/.local/state/emacs/backups")))
|
|
||||||
|
|
||||||
(use-package savehist
|
(use-package savehist
|
||||||
:demand
|
:demand
|
||||||
:config
|
:config
|
||||||
|
@ -1576,31 +1596,6 @@ Configure email with iCalendar event support, to integrate with
|
||||||
:custom
|
:custom
|
||||||
(bbdb-file (locate-user-emacs-file "bbdb.gpg")))
|
(bbdb-file (locate-user-emacs-file "bbdb.gpg")))
|
||||||
|
|
||||||
(use-package erc
|
|
||||||
:commands erc-compute-nick
|
|
||||||
:custom
|
|
||||||
(erc-nick (user-login-name))
|
|
||||||
(erc-user-full-name (user-full-name)))
|
|
||||||
|
|
||||||
(defun my/libera-chat-connect ()
|
|
||||||
"Connect to irc.libera.chat directly."
|
|
||||||
(interactive)
|
|
||||||
(require 'erc)
|
|
||||||
(require 'password-store)
|
|
||||||
(erc-tls
|
|
||||||
:server "irc.libera.chat"
|
|
||||||
:password (password-store-get 'social/irc.libera.chat)))
|
|
||||||
(defun my/znc-connect ()
|
|
||||||
"Connect to my ZNC IRC bouncer."
|
|
||||||
(interactive)
|
|
||||||
(require 'erc)
|
|
||||||
(require 'password-store)
|
|
||||||
(erc-tls
|
|
||||||
:server "xenia.me.uk"
|
|
||||||
:port 6697
|
|
||||||
:nick (concat (erc-compute-nick) "/liberachat")
|
|
||||||
:password (password-store-get 'local/znc)))
|
|
||||||
|
|
||||||
(use-package eww
|
(use-package eww
|
||||||
:defer t
|
:defer t
|
||||||
:custom
|
:custom
|
||||||
|
@ -1611,12 +1606,6 @@ Configure email with iCalendar event support, to integrate with
|
||||||
(eww-auto-rename-buffer 'title)
|
(eww-auto-rename-buffer 'title)
|
||||||
(eww-browse-url-new-window-is-tab nil))
|
(eww-browse-url-new-window-is-tab nil))
|
||||||
|
|
||||||
(add-to-list 'package-selected-packages 'password-store)
|
|
||||||
(use-package password-store
|
|
||||||
:if (package-installed-p 'password-store)
|
|
||||||
:defer t
|
|
||||||
:functions password-store-get)
|
|
||||||
|
|
||||||
(add-to-list 'package-selected-packages 'scad-mode)
|
(add-to-list 'package-selected-packages 'scad-mode)
|
||||||
(use-package scad-mode
|
(use-package scad-mode
|
||||||
:if (package-installed-p 'scad-mode)
|
:if (package-installed-p 'scad-mode)
|
||||||
|
|
Loading…
Reference in a new issue