chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some emacs annoyances

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-03-29 10:11:55 +02:00
parent 706c8305fe
commit c992f1c033
No known key found for this signature in database
GPG key ID: 019E764B7184435A
4 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/base/emacs/base-init.el
View file

@ -250,14 +250,14 @@
(defun set-creation-date-heading-property () (org-set-property "CREATED" (format-time-string (org-time-stamp-format t t)))) (defun set-creation-date-heading-property () (org-set-property "CREATED" (format-time-string (org-time-stamp-format t t))))
:general :general
(lmap (lmap
:keymap 'org-mode-map :keymaps 'org-mode-map
"SPC i" '(org-insert-heading :which-key "Insert heading") "SPC i" '(org-insert-heading :which-key "Insert heading")
"SPC <" '(org-promote-subtree :which-key "Decrease level") "SPC <" '(org-promote-subtree :which-key "Decrease level")
"SPC >" '(org-demote-subtree :which-key "Increase level") "SPC >" '(org-demote-subtree :which-key "Increase level")
"SPC c" '(orc-clone-subtree-with-time-shift :which-key "Repeat subtree") "SPC c" '(orc-clone-subtree-with-time-shift :which-key "Repeat subtree")
) )
(lmap (lmap
"o a" '(org-agenda :which-key "Agenda") "o a" '(org-agenda-list :which-key "Agenda")
"o t" '(org-todo-list :which-key "Todo list") "o t" '(org-todo-list :which-key "Todo list")
"o o" '(find-file-in-org-directory :which-key "Find org file") "o o" '(find-file-in-org-directory :which-key "Find org file")
) )

1
modules/base/emacs/default.nix
View file

@ -16,7 +16,6 @@
readOnly = true; readOnly = true;
default = pkgs.emacsWithPackagesFromUsePackage { default = pkgs.emacsWithPackagesFromUsePackage {
config = config.chvp.base.emacs.fullConfig; config = config.chvp.base.emacs.fullConfig;
package = pkgs.emacsPgtk;
alwaysEnsure = true; alwaysEnsure = true;
# mu4e is included in the mu package and should be used from there # mu4e is included in the mu package and should be used from there
extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu; extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu;

11
modules/development/default.nix
View file

@ -58,17 +58,6 @@
;; Snippets ;; Snippets
(use-package yasnippet (use-package yasnippet
:init
;; See https://orgmode.org/org.html#index-yasnippet_002eel
(defun yas/org-very-safe-expand () (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
(defun chvp/yas-org-fix () (
(make-variable-buffer-local 'yas/trigger-key)
(setq yas/trigger-key [tab])
(add-to-list 'org-tab-first-hook 'yas/org-very-safe-expand)
(define-key yas/keymap [tab] 'yas/next-field)
))
:hook
(org-mode . chvp/yas-org-fix)
;; This is not very nice, but let's just assume that development machines have my nixos-config checked out ;; This is not very nice, but let's just assume that development machines have my nixos-config checked out
:custom (yas-snippet-dirs '("/home/charlotte/repos/nixos-config/modules/development/snippets/")) :custom (yas-snippet-dirs '("/home/charlotte/repos/nixos-config/modules/development/snippets/"))
:diminish (yas-minor-mode) :diminish (yas-minor-mode)

3
modules/graphical/mail/default.nix
View file

@ -113,7 +113,7 @@ in
(use-package mu4e (use-package mu4e
;; Use mu4e included in the mu package, see emacs/default.nix ;; Use mu4e included in the mu package, see emacs/default.nix
:ensure nil :ensure nil
:commands (mu4e mu4e-update-index) :demand t
:after (vertico) :after (vertico)
:init :init
(defun mu4e--main-action-str (title cmd) "") (defun mu4e--main-action-str (title cmd) "")
@ -208,6 +208,7 @@ in
(when (and msg (mu4e-message-contact-field-matches msg :to "dodona@ugent.be")) (mail/dodona-cc-reply-to)) (when (and msg (mu4e-message-contact-field-matches msg :to "dodona@ugent.be")) (mail/dodona-cc-reply-to))
) )
) )
(mu4e 'background)
:general :general
(lmap "m" '(mu4e :which-key "mail")) (lmap "m" '(mu4e :which-key "mail"))
;; Unmap SPC in the mail view so we can still use the leader. ;; Unmap SPC in the mail view so we can still use the leader.