From: rearman Date: Tue, 28 Feb 2023 18:21:22 +0000 (-0500) Subject: Move org-setup.el into use-package block in package-config X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=b497120fc440b136b480b242411bc1aa7b08703d;p=emacsinit.git Move org-setup.el into use-package block in package-config --- diff --git a/org-setup.el b/org-setup.el deleted file mode 100644 index ef44485..0000000 --- a/org-setup.el +++ /dev/null @@ -1,52 +0,0 @@ -;; -*- lexical-binding: t; -*- -;; ORG SETTINGS AND DEFUNS -(defun erfassen-zettel () - "Add a new zettel to the kasten. -Creates a new file .org in ~/org/kasten." - (interactive) - (expand-file-name (format "%s.org" (format-time-string "%Y-%m-%d-%H%M")) "~/org/kasten/")) - -(defun org-auto-archive () - "Automatically archive completed tasks in an org file. -Intended for use as an after-save-hook." - (interactive) - (org-map-entries - (lambda () - (org-archive-subtree) - (setq org-map-continue-from (org-element-property :begin (org-element-at-point)))) - "TODO=\"DONE\"|TODO=\"CANCELLED\"|TODO=\"DELEGATED\"" - 'file) - (save-buffer)) - -(setq org-M-RET-may-split-line nil - org-reverse-note-order t - org-use-fast-todo-selection 'expert - org-agenda-start-on-weekday nil - org-catch-invisible-edits 'show - org-directory "~/org" - org-agenda-files '("~/org/" - "~/org/kasten/") - org-refile-targets '((nil :maxlevel . 9) - (org-agenda-files :maxlevel . 9)) - org-default-notes-file (concat org-directory "/notes.org") - safe-local-variable-values '((after-save-hook org-auto-archive)) - org-todo-keywords '((sequence "TODO(t@)" - "WAITING(w@)" - "IN-PROGRESS(i@)" - "APPT(a@)" "|" - "DELEGATED(l@)" - "DONE(d@)" - "CANCELLED(c@)")) - org-capture-templates '(("n" "Note" entry (file+olp org-default-notes-file "Notes") "* %u %?") - ("t" "TODO" entry (file+olp org-default-notes-file "Tasks") "* TODO %? \n %u") - ("s" "Service" entry (file+olp org-default-notes-file "Service") "* TODO %? \n %u") - ("z" "Zettel" entry (file erfassen-zettel) "* %? ::")) - org-agenda-custom-commands '(("n" "Agenda and all TODOs" - ((agenda "") (alltodo ""))) - ("u" "Unscheduled TODOs" - alltodo "" ((org-agenda-skip-function - (lambda nil - (org-agenda-skip-entry-if 'scheduled - 'deadline - 'regexp "\n]+>"))) - (org-agenda-overriding-header "Unscheduled TODO entries: "))))) diff --git a/package-config.el b/package-config.el index cf93231..d99ded7 100644 --- a/package-config.el +++ b/package-config.el @@ -5,56 +5,154 @@ '(("elpa" . "https://elpa.gnu.org/packages/") ("nongnu" . "https://elpa.nongnu.org/nongnu/") ("melpa" . "https://melpa.org/packages/"))) -(package-initialize) + +(unless (bound-and-true-p package--initialized) + (setq package-enable-at-startup nil) + (package-initialize)) (unless (package-installed-p 'use-package) (package-refresh-contents) (package-install 'use-package)) -(use-package company - :ensure t - :custom - (company-idle-delay 0) - (company-minimum-prefix-length 3) - (company-selection-wrap-around t) - (company-dabbrev-other-buffers t) - (company-dabbrev-code-other-buffers t) - (company-dabbrev-downcase nil) - (company-dabbrev-ignore-case t) - :config - (global-company-mode t)) +(setq use-package-always-ensure t) + +(unless (eq system-type 'windows-nt) + (use-package slime) + (use-package ledger-mode)) + +(use-package s) +(use-package dash) +(use-package gnuplot-mode) (use-package expand-region - :ensure t - :bind (("C-=" . er/expand-region))) + :bind + (("C-=" . er/expand-region))) + +(use-package popup-kill-ring + :bind + ("M-y" . popup-kill-ring)) + +(use-package openwith + :config + (openwith-mode t)) + +(use-package page-break-lines + :init + (global-page-break-lines-mode)) (use-package magit - :ensure t :init (message "Loading Magit...") :config (message "Loaded Magit!") - :bind (("C-x g" . magit-status))) - -(use-package gnuplot-mode - :ensure t) + :bind + (("C-x g" . magit-status))) -(use-package openwith - :ensure t +(use-package auto-package-update + :if (not (daemonp)) + :custom + (auto-package-update-interval 7) ;; in days + (auto-package-update-prompt-before-update t) + (auto-package-update-delete-old-versions t) :config - (openwith-mode t)) + (auto-package-update-maybe)) -(use-package s - :ensure t) +(use-package recentf + :ensure nil + :hook + (after-init . recentf-mode) + :custom + (recentf-auto-cleanup "05:00am") + (recentf-max-saved-items 200) + (recentf-exclude '((expand-file-name package-user-dir) + ".cache" + ".cask" + ".elfeed" + "bookmarks" + "cache" + "ido.*" + "recentf"))) -(use-package dash - :ensure t) +(use-package company + :custom + (company-idle-delay 0) + (company-tooltip-idle-delay 10) + (company-minimum-prefix-length 1) + (company-require-match nil) + (company-show-quick-access t) + (company-format-margin-function 'company-text-icons-margin) + (company-text-face-extra-attributes '(:slant italic)) + (company-selection-wrap-around t) + (company-tooltip-flip-when-above t) + (company-insertion-on-trigger nil) + (company-dabbrev-other-buffers t) + (company-dabbrev-code-other-buffers t) + (company-dabbrev-downcase nil) + (company-dabbrev-ignore-case 'keep-prefix) + (company-frontends '(company-pseudo-tooltip-unless-just-one-frontend-with-delay + company-preview-frontend + company-echo-metadata-frontend)) + :config + (global-company-mode t) + :bind + (:map company-active-map + ("" . (lambda () + (interactive) + (let ((company-tooltip-idle-delay 0.0)) + (company-complete) + (and company-candidates + (company-call-frontends 'post-command))))))) -(use-package acme-theme - :ensure t) - ;;:config - ;;(load-theme 'acme t)) +(use-package org + :ensure nil + :custom + (org-M-RET-may-split-line nil) + (org-reverse-note-order t) + (org-use-fast-todo-selection 'expert) + (org-agenda-start-on-weekday nil) + (org-catch-invisible-edits 'show) + (org-directory "~/org") + (org-agenda-files '("~/org/" + "~/org/kasten/")) + (org-refile-targets '((nil :maxlevel . 9) + (org-agenda-files :maxlevel . 9))) + (org-default-notes-file (concat org-directory "/notes.org")) + (safe-local-variable-values '((after-save-hook org-auto-archive))) + (org-todo-keywords '((sequence "TODO(t@)" + "WAITING(w@)" + "IN-PROGRESS(i@)" + "APPT(a@)" "|" + "DELEGATED(l@)" + "DONE(d@)" + "CANCELLED(c@)"))) + (org-capture-templates '(("n" "Note" entry (file+olp org-default-notes-file "Notes") "* %u %?") + ("t" "TODO" entry (file+olp org-default-notes-file "Tasks") "* TODO %? \n %u") + ("s" "Service" entry (file+olp org-default-notes-file "Service") "* TODO %? \n %u") + ("z" "Zettel" entry (file erfassen-zettel) "* %? ::"))) + (org-agenda-custom-commands '(("n" "Agenda and all TODOs" + ((agenda "") (alltodo ""))) + ("u" "Unscheduled TODOs" + alltodo "" ((org-agenda-skip-function + (lambda nil + (org-agenda-skip-entry-if 'scheduled + 'deadline + 'regexp "\n]+>"))) + (org-agenda-overriding-header "Unscheduled TODO entries: "))))) + :config + (defun erfassen-zettel () + "Add a new zettel to the kasten. +Creates a new file .org in ~/org/kasten." + (interactive) + (expand-file-name (format "%s.org" (format-time-string "%Y-%m-%d-%H%M")) "~/org/kasten/")) -(unless (eq system-type 'windows-nt) - (use-package slime :ensure t) - (use-package ledger-mode :ensure t)) + (defun org-auto-archive () + "Automatically archive completed tasks in an org file. +Intended for use as an after-save-hook." + (interactive) + (org-map-entries + (lambda () + (org-archive-subtree) + (setq org-map-continue-from (org-element-property :begin (org-element-at-point)))) + "TODO=\"DONE\"|TODO=\"CANCELLED\"|TODO=\"DELEGATED\"" + 'file) + (save-buffer))) diff --git a/setq-defaults.el b/setq-defaults.el index 8cdedf7..89ea1df 100644 --- a/setq-defaults.el +++ b/setq-defaults.el @@ -21,19 +21,28 @@ global-hl-line-sticky-flag t echo-keystrokes 0.01 save-interprogram-paste-before-kill t + confirm-kill-emacs 'y-or-n-p + confirm-kill-processes nil + eshell-destroy-buffer-when-process-dies t + custom-file (concat user-emacs-directory "custom-set-variables.el") ediff-window-setup-function 'ediff-setup-windows-plain ediff-split-window-function (if (> (frame-width) 150) 'split-window-horizontally - 'split-window-vertically)) + 'split-window-vertically) + prettify-symbols-alist '(("lambda" . 955) + ("delta" . 120517) + ("epsilon" . 120518) + ("->" . 8594) + ("<=" . 8804) + (">=" . 8805))) ;; OPTIONS -(recentf-mode t) +(save-place-mode 1) (fringe-mode 1) (winner-mode 1) (show-paren-mode t) (auto-fill-mode t) (midnight-mode t) -;;(mouse-avoidance-mode 'animate) (column-number-mode t) (delete-selection-mode t) (global-hl-line-mode t)