Merge branch 'master' of git.2li.ch:Nebucatnetzer/nixos

home-manager/modules/programs/emacs/emacs.d/lib/az_deft.el

@@ -1,33 +1,34 @@
-(use-package deft
-  :ensure nil
-  :bind ("<f5>" . open-notes)
-  :commands (deft)
-  :config
-  (add-to-list 'evil-emacs-state-modes 'deft-mode)
-  (setq deft-extensions '("md")
-        deft-default-extension "md"
-        deft-markdown-mode-title-level 1
-        deft-auto-save-interval 300.0
-        deft-file-limit 50
-        deft-use-filename-as-title nil
-        deft-use-filter-string-for-filename t
-        deft-strip-summary-regexp (concat "\\("
-                                          "[\n\t]" ;; blank
-                                          "\\|^#\\+[[:upper:]_]+:.*$" ;; org-mode metadata
-                                          "^---\\(?:\n.*\\)*---.*$"
-                                          "\\)")
+(when (boundp 'enable-notes)
+  (use-package deft
+    :ensure nil
+    :bind ("<f5>" . open-notes)
+    :commands (deft)
+    :config
+    (add-to-list 'evil-emacs-state-modes 'deft-mode)
+    (setq deft-extensions '("md")
+          deft-default-extension "md"
+          deft-markdown-mode-title-level 1
+          deft-auto-save-interval 300.0
+          deft-file-limit 50
+          deft-use-filename-as-title nil
+          deft-use-filter-string-for-filename t
+          deft-strip-summary-regexp (concat "\\("
+                                            "[\n\t]" ;; blank
+                                            "\\|^#\\+[[:upper:]_]+:.*$" ;; org-mode metadata
+                                            "^---\\(?:\n.*\\)*---.*$"
+                                            "\\)")
 
-        deft-recursive t)
-  (setq deft-file-naming-rules
-        '((noslash . "-")
-          (nospace . "_")
-          (case-fn . downcase)))
-  (setq deft-directory "~/nextcloud/10_documents/")
-  (add-hook 'deft-mode-hook (lambda() (display-line-numbers-mode -1)))
+          deft-recursive t)
+    (setq deft-file-naming-rules
+          '((noslash . "-")
+            (nospace . "_")
+            (case-fn . downcase)))
+    (setq deft-directory "~/nextcloud/10_documents/")
+    (add-hook 'deft-mode-hook (lambda() (display-line-numbers-mode -1)))
 
-  ;; A function to create a persp for my notes
-  (defun open-notes ()
-    "Create a notes perspective and open deft"
-    (interactive)
-    (persp-switch "notes")
-    (deft)))
+    ;; A function to create a persp for my notes
+    (defun open-notes ()
+      "Create a notes perspective and open deft"
+      (interactive)
+      (persp-switch "notes")
+      (deft))))

home-manager/modules/programs/emacs/emacs.d/lib/az_denote.el

@@ -1,23 +1,24 @@
-(use-package denote
-  :bind
-  (("C-c n r" . denote-rename-file)
-   ("C-c n p" . az-denote-create-new-note-from-region)
-   ("C-c n n" . denote))
-  :config
-  (defun az-denote-create-new-note-from-region (beg end)
-    "Create note whose contents include the text between BEG and END. Prompt
+(when (boundp 'enable-notes)
+  (use-package denote
+    :bind
+    (("C-c n r" . denote-rename-file)
+     ("C-c n p" . az-denote-create-new-note-from-region)
+     ("C-c n n" . denote))
+    :config
+    (defun az-denote-create-new-note-from-region (beg end)
+      "Create note whose contents include the text between BEG and END. Prompt
     for title and keywords of the new note."
-    (interactive "r")
-    (if-let (((region-active-p))
-             (text
-              (buffer-substring-no-properties beg end)))
-        (progn (denote
-                (denote-title-prompt) (denote-keywords-prompt)) (insert text))
-      (user-error
-       "No region is available")))
-  (add-hook 'find-file-hook #'denote-link-buttonize-buffer)
-  (setq denote-rename-buffer-mode 1
-        denote-excluded-directories-regexp "99_archive"
-        denote-file-type "markdown-yaml"
-        denote-directory "~/nextcloud/10_documents/"
-        denote-yaml-front-matter "---\ntitle: %s\ndate: %s\ntags: %s\nidentifier: %S\n---\n\n"))
+      (interactive "r")
+      (if-let (((region-active-p))
+               (text
+                (buffer-substring-no-properties beg end)))
+          (progn (denote
+                  (denote-title-prompt) (denote-keywords-prompt)) (insert text))
+        (user-error
+         "No region is available")))
+    (add-hook 'find-file-hook #'denote-link-buttonize-buffer)
+    (setq denote-rename-buffer-mode 1
+          denote-excluded-directories-regexp "99_archive"
+          denote-file-type "markdown-yaml"
+          denote-directory "~/nextcloud/10_documents/"
+          denote-yaml-front-matter "---\ntitle: %s\ndate: %s\ntags: %s\nidentifier: %S\n---\n\n")))

home-manager/modules/programs/emacs/emacs.d/template_variables.el

@@ -1,15 +1,9 @@
 ;;(setq disable-fringe t)
-;;(setq enable-auctex t)
-;;(setq enable-clocking t)
 ;;(setq enable-color-theme t)
 ;;(setq enable-email t)
 ;;(setq enable-emojis t)
 ;;(setq enable-font t)
 ;;(setq enable-lantool t)
-;;(setq enable-org-bullets t)
-;;(setq enable-ox-pandoc t)
+;;(setq enable-notes t)
 ;;(setq enable-pdf-tools t)
-;;(setq enable-personal-agenda t)
 ;;(setq enable-scroll-bar t)
-;;(setq enable-ticketing t)
-;;(setq enable-work-agenda t)