From cc9b1c22aee3027b24753732d1c6b2477772f759 Mon Sep 17 00:00:00 2001 From: Yakkala Yagnesh Raghava Date: Wed, 27 Apr 2022 11:24:33 +0530 Subject: [PATCH] load more. --- {lisp => attic}/init-auto-complete.el | 0 {lisp => attic}/init-cedet.el | 0 {lisp => attic}/init-el-get.el | 0 init.el | 38 +++++++++++++++++++++++++++ lisp/init-boxquote.el | 2 +- lisp/init-finish.el | 4 +-- lisp/init-help.el | 22 +++++++++------- lisp/init-misc.el | 3 --- lisp/init-org-diary.el | 7 ++--- lisp/init-org-misc.el | 3 ++- lisp/init-org.el | 2 -- lisp/{init-battery.el => init-sys.el} | 8 ++++-- lisp/init-unixutils.el | 9 ------- lisp/init-utils.el | 1 - lisp/init-weather-metno.el | 3 ++- lisp/init-web.el | 6 ++--- 16 files changed, 71 insertions(+), 37 deletions(-) rename {lisp => attic}/init-auto-complete.el (100%) rename {lisp => attic}/init-cedet.el (100%) rename {lisp => attic}/init-el-get.el (100%) rename lisp/{init-battery.el => init-sys.el} (82%) delete mode 100644 lisp/init-unixutils.el diff --git a/lisp/init-auto-complete.el b/attic/init-auto-complete.el similarity index 100% rename from lisp/init-auto-complete.el rename to attic/init-auto-complete.el diff --git a/lisp/init-cedet.el b/attic/init-cedet.el similarity index 100% rename from lisp/init-cedet.el rename to attic/init-cedet.el diff --git a/lisp/init-el-get.el b/attic/init-el-get.el similarity index 100% rename from lisp/init-el-get.el rename to attic/init-el-get.el diff --git a/init.el b/init.el index b04696d..1f1ffd3 100644 --- a/init.el +++ b/init.el @@ -93,5 +93,43 @@ (load! "init-yasnip") (load! "init-dev") +(load! "init-org") +(load! "init-org-todo-state-tags") +(load! "init-org-agenda") +(load! "init-org-tags") +(load! "init-org-capture") +(load! "init-org-ob") +(load! "init-org-diary") +(load! "init-calender") +(load! "init-weather-metno") +(load! "init-org-export") +(load! "init-org-misc") + +;;; info, help, doc, man(woman) etc.. +(load! "init-info") +(load! "init-eldoc") +(load! "init-help") + +(load! "init-web") + +;;; sys & server shell, term, tramp +(load! "init-sys") +(load! "init-print") +(load! "init-crontab") +(load! "init-time") +(load! "init-term") +(load! "init-tramp") + + +;;; Emacs server +(load! "init-server") +(load! "init-session") + +;;; misc +(load! "init-misc") +(load! "init-utils") +(load! "init-boxquote") + + (load! "init-finish") ;; init ends here diff --git a/lisp/init-boxquote.el b/lisp/init-boxquote.el index 7aa2f07..7765cc9 100644 --- a/lisp/init-boxquote.el +++ b/lisp/init-boxquote.el @@ -1,7 +1,7 @@ ;;; init-boxquote.el ;; Created: 水曜日, 1月 2 2013 -(el-get 'sync 'boxquote) +(ensure-package-installed 'boxquote) (setq boxquote-top-and-tail "─────" boxquote-top-corner "╭" diff --git a/lisp/init-finish.el b/lisp/init-finish.el index 1541888..02f8b0c 100644 --- a/lisp/init-finish.el +++ b/lisp/init-finish.el @@ -7,7 +7,7 @@ (add-hook 'emacs-startup-hook '(lambda () (progn - (message ".emacs loaded in %s; %s" - (emacs-init-time) "As always by your command... ")))) + (message "Startup took %s; %s" + (emacs-init-time) "As always by your command...")))) ;;; init-finish.el ends here diff --git a/lisp/init-help.el b/lisp/init-help.el index b478c6f..9903cef 100644 --- a/lisp/init-help.el +++ b/lisp/init-help.el @@ -3,16 +3,23 @@ ;; Created: Friday, September 16 2011 ;; Emacs help related settings +(ensure-package-installed 'guide-key) ;;; help-map additional keys ;;; jump to source of `key` -(define-key help-map (kbd "C-k") 'find-function-on-key) -(define-key help-map (kbd "C-f") 'find-function-at-point) -(define-key help-map (kbd "C-v") 'find-variable-at-point) +(eval-after-load "help" + `(progn + (define-key help-map (kbd "C-k") 'find-function-on-key) + (define-key help-map (kbd "C-f") 'find-function-at-point) + (define-key help-map (kbd "C-v") 'find-variable-at-point))) ;;; help-mode buffer -(define-key help-mode-map (kbd "n") 'next-line) -(define-key help-mode-map (kbd "p") 'previous-line) +(eval-after-load "help-mode" + `(progn + (define-key help-mode-map (kbd "n") 'next-line) + (define-key help-mode-map (kbd "p") 'previous-line) + (define-key help-mode-map (kbd "M-") 'help-go-back) + (define-key help-mode-map (kbd "M-") 'help-go-forward))) ;;; http://www.masteringemacs.org/articles/2011/08/04/full-text-searching-info-mode-apropos/ ;; Custom 'apropos' key bindings @@ -29,10 +36,7 @@ (define-key Apropos-Prefix (kbd "C-v") 'apropos-value) (define-key Apropos-Prefix (kbd "C-a") 'about-emacs) -(define-key help-mode-map (kbd "M-") 'help-go-back) -(define-key help-mode-map (kbd "M-") 'help-go-forward) - -(el-get 'sync 'guide-key) +;;; guide-key (setq guide-key/guide-key-sequence '("C-x r" "C-x 4")) (guide-key-mode 1) (setq guide-key/guide-key-sequence t) diff --git a/lisp/init-misc.el b/lisp/init-misc.el index 315df0f..b02cb0f 100644 --- a/lisp/init-misc.el +++ b/lisp/init-misc.el @@ -1,9 +1,6 @@ ;;; init-misc.el ;; Author: Yagnesh Raghava Yakkala. http://yagnesh.org -;; (el-get 'sync 'wc-mode) -;; (add-to-list 'org-mode-hook 'wc-mode) - ;;---------------------------------------------------------------------------- ;; Misc config - yet to be placed in separate files ;;---------------------------------------------------------------------------- diff --git a/lisp/init-org-diary.el b/lisp/init-org-diary.el index 46e1cde..67bcb8b 100644 --- a/lisp/init-org-diary.el +++ b/lisp/init-org-diary.el @@ -2,7 +2,7 @@ ;; Yagnesh Raghava Yakkala. http://yagnesh.org ;; Created: Friday, June 17 2011 -(el-get 'sync 'japanese-holidays) +(ensure-package-installed 'japanese-holidays) (setq org-agenda-include-diary nil) (setq org-agenda-diary-file "~/git/org/life/diary.org") @@ -41,12 +41,13 @@ `(progn (define-key calendar-mode-map "f" 'calendar-forward-day) (define-key calendar-mode-map "b" 'calendar-backward-day) - (require 'japanese-holidays) +; (require 'japanese-holidays) (setq diary-number-of-entries 31) (setq calendar-weekend-marker 'diary) (setq mark-holidays-in-calendar t) (setq calendar-holidays - (append japanese-holidays holiday-local-holidays holiday-other-holidays)))) +; (append japanese-holidays holiday-local-holidays holiday-other-holidays) + (append holiday-local-holidays holiday-other-holidays)))) ;; (add-hook 'today-visible-calendar-hook 'calendar-mark-weekend) ;; (add-hook 'today-invisible-calendar-hook 'calendar-mark-weekend) diff --git a/lisp/init-org-misc.el b/lisp/init-org-misc.el index d16609d..4a30a3b 100644 --- a/lisp/init-org-misc.el +++ b/lisp/init-org-misc.el @@ -2,6 +2,8 @@ ;; Author: Yagnesh Raghava Yakkala. http://yagnesh.org ;; Created: Tuesday, May 17 2011 +(ensure-package-installed 'org-tree-slide) + ;;; org-scratch (defun dan/switch-to-org-scratch () "Switch to a temp Org buffer. @@ -38,7 +40,6 @@ If the region is active, insert it." ("A" . (org-agenda nil "T" t)) ("$" . org-archive-subtree))) -(el-get-bundle 'org-tree-slide) (eval-after-load "org-tree-slide" `(progn (define-key org-tree-slide-mode-map (kbd "") diff --git a/lisp/init-org.el b/lisp/init-org.el index 845879e..3846969 100644 --- a/lisp/init-org.el +++ b/lisp/init-org.el @@ -1,8 +1,6 @@ ;;; init-org.el -- ;; Copyright (C) Yagnesh Raghava Yakkala. http://yagnesh.org -;; (el-get 'sync 'org-mode) - ;;; load org (add-to-list 'auto-mode-alist '("\\.\\(org_archive\\)$" . org-mode)) diff --git a/lisp/init-battery.el b/lisp/init-sys.el similarity index 82% rename from lisp/init-battery.el rename to lisp/init-sys.el index ef976ee..9134755 100644 --- a/lisp/init-battery.el +++ b/lisp/init-sys.el @@ -1,6 +1,9 @@ -;;; init-battery.el +;;; init-sys.el ;; Author: Yagnesh Raghava Yakkala. http://yagnesh.org +;;; top-mode missing? +(ensure-package-installed '(wgrep symon)) + ;;; http://stackoverflow.com/questions/5562974/emacs-is-it-running-on-laptop-or-on-desktop ;; (require 'battery) ;; (when (and battery-status-function @@ -13,4 +16,5 @@ (add-hook 'emacs-startup-hook '(lambda nil (display-battery-mode 1))) -;;; init-battery.el ends here + +;;; init-sys.el ends here diff --git a/lisp/init-unixutils.el b/lisp/init-unixutils.el deleted file mode 100644 index 94f93d8..0000000 --- a/lisp/init-unixutils.el +++ /dev/null @@ -1,9 +0,0 @@ -;;; init-unixutils.el -;; Author: Yagnesh Raghava Yakkala. http://yagnesh.org -;; Created: Friday, January 16 2015 -(el-get 'sync '(wgrep top-mode symon)) - -(require 'wgrep) - - -;;; init-unixutils.el ends here diff --git a/lisp/init-utils.el b/lisp/init-utils.el index f1a97ec..a692185 100644 --- a/lisp/init-utils.el +++ b/lisp/init-utils.el @@ -321,5 +321,4 @@ License: GPL v3 or later (execute-kbd-macro inp) (write-file out-file-name)))) - ;;; init-utils-el ends here diff --git a/lisp/init-weather-metno.el b/lisp/init-weather-metno.el index 73799e1..d95264d 100644 --- a/lisp/init-weather-metno.el +++ b/lisp/init-weather-metno.el @@ -1,4 +1,5 @@ -(el-get 'sync 'weather-metno) +(ensure-package-installed 'weather-metno) + (setq weather-metno-get-image-props '(:width 8 :height 8 :ascent center)) diff --git a/lisp/init-web.el b/lisp/init-web.el index 71d6930..4c7e242 100644 --- a/lisp/init-web.el +++ b/lisp/init-web.el @@ -1,9 +1,10 @@ ;;; init-web.el +(ensure-package-installed 'tinkerer) + (after 'webjump (setq webjump-sites - (append '(("yorg" . "yagnesh.org") - ("sap" . "sapporoindians.net")) + (append '(("yorg" . "yagnesh.org")) webjump-sample-sites))) (global-set-key "\C-cj" 'webjump) @@ -13,7 +14,6 @@ ;; (el-get 'sync 'sx) ;;; Tinkerer -(el-get 'sync 'tinkerer) (setq tinkerer-root-path "~/git/yorg/") ;;; init-web.el ends here