summaryrefslogtreecommitdiff
path: root/dotfiles
diff options
context:
space:
mode:
Diffstat (limited to 'dotfiles')
-rw-r--r--dotfiles/.emacs.d/init.el51
1 files changed, 26 insertions, 25 deletions
diff --git a/dotfiles/.emacs.d/init.el b/dotfiles/.emacs.d/init.el
index a04f959..64d00a1 100644
--- a/dotfiles/.emacs.d/init.el
+++ b/dotfiles/.emacs.d/init.el
@@ -30,7 +30,7 @@
(home-file "/.guix-profile/share/emacs/site-lisp"))
;; (add-to-list 'load-path
;; (home-file "/.guix-profile/share/emacs/site-lisp/guix.d/typo-1.1"))
-(add-to-list 'load-path (home-file "/Code/guix/emacs"))
+;; (add-to-list 'load-path (home-file "/Code/guix/emacs"))
(when-require 'guix-init
(setf guix-dot-program (concat (getenv "HOME") "/.guix-profile/bin/dot")))
@@ -254,9 +254,6 @@ might be bad."
(show-paren-mode t)
-;; Use scheme-mode for Skribe documents.
-(add-to-list 'auto-mode-alist '("\\.skr$" . scheme-mode))
-
(defmacro use-mode-for-lisp (mode)
`(progn
(add-hook 'emacs-lisp-mode-hook (lambda () (,mode t)))
@@ -264,15 +261,6 @@ might be bad."
(add-hook 'lisp-interaction-mode-hook (lambda () (,mode t)))
(add-hook 'scheme-mode-hook (lambda () (,mode t)))))
-(when-require 'skribe
- ;; Activate Skribe minor mode on .skr files.
- (add-hook 'scheme-mode-hook
- (lambda ()
- (when (string-match "\\.skr$" (buffer-file-name))
- (skribe-mode t)
- (when-require 'typo
- (typo-mode t))))))
-
(when-require 'rainbow-delimiters
(use-mode-for-lisp rainbow-delimiters-mode))
@@ -284,6 +272,18 @@ might be bad."
(global-set-key (kbd "C-c s") 'connect-to-guile))
+;; Use scheme-mode for Skribe documents.
+(add-to-list 'auto-mode-alist '("\\.skr$" . scheme-mode))
+
+(when-require 'skribe
+ ;; Activate Skribe minor mode on .skr files.
+ (add-hook 'scheme-mode-hook
+ (lambda ()
+ (when (string-match "\\.skr$" (buffer-file-name))
+ (skribe-mode t)
+ (when-require 'typo
+ (typo-mode t))))))
+
(require 'scheme)
;; Hacked to properly indent keywords. Thanks to mark_weaver.
@@ -428,12 +428,6 @@ indentation."
(global-set-key (kbd "C-c f") 'elfeed))
;;;
-;;; GPG
-;;;
-
-(setf epg-gpg-program "gpg2")
-
-;;;
;;; Mail
;;;
@@ -462,11 +456,17 @@ indentation."
:query ,(concat "tag:" tag " AND tag:unread")
:sort-order newest-first))
+ (defun unarchived-mail-by-tag (tag)
+ `(:name ,tag
+ :query ,(concat "tag:" tag " AND NOT tag:archive")
+ :sort-order newest-first))
+
(setf notmuch-saved-searches
`((:name "inbox"
:query "tag:inbox"
:sort-order newest-first)
- ,(unread-mail-by-tag "guile")
+ ,(unarchived-mail-by-tag "guix")
+ ,(unarchived-mail-by-tag "guile")
,@(mapcar 'recent-mail-by-tag
'("nagios" "semaphore" "airbrake" "newrelic"
"rackspace" "vividcortex" "aws" "papertrail"
@@ -481,9 +481,10 @@ indentation."
(define-key notmuch-search-mode-map "a"
(lambda ()
- "Remove 'unread' and 'inbox' tags from message."
+ "Remove 'unread' and 'inbox' tags from message and add
+'archive' tag."
(interactive)
- (notmuch-search-tag '("-unread" "-inbox"))
+ (notmuch-search-tag '("-unread" "-inbox" "+archive"))
(notmuch-search-next-thread)))
(define-key notmuch-search-mode-map "d"
@@ -495,10 +496,10 @@ indentation."
(define-key notmuch-search-mode-map "i"
(lambda ()
- "Remove 'unread' and 'inbox' tags from message, and add the
-'important' tag."
+ "Remove 'unread' and 'archive' tags from message, and add
+the 'inbox' tag."
(interactive)
- (notmuch-search-tag '("-unread" "-inbox" "+important"))
+ (notmuch-search-tag '("-unread" "-archive" "+inbox"))
(notmuch-search-next-thread)))
(define-key notmuch-search-mode-map "s"