Browse Source

isg-init.org -> config.org

Inderjit Gill 2 months ago
parent
commit
931986a447
3 changed files with 37 additions and 37 deletions
  1. 2
    2
      .gitignore
  2. 5
    5
      config.org
  3. 30
    30
      init.el

+ 2
- 2
.gitignore View File

@@ -1,5 +1,5 @@
1
-isg-custom.el
2
-isg-init.el
1
+config.el
2
+custom.el
3 3
 org-gcal
4 4
 gcal.org
5 5
 eshell

isg-init.org → config.org View File

@@ -2,16 +2,16 @@
2 2
 #+AUTHOR: Inderjit Gill
3 3
 
4 4
 NOTE: after changing this file:
5
-1. Either call isg--generate-isg-init-file or delete ~/.emacs.d/isg-init.el
5
+1. Either call isg--compile-config or delete ~/.emacs.d/config.el
6 6
 2. restart emacs
7 7
 
8 8
 #+BEGIN_SRC emacs-lisp
9
-(defun isg--compile-isg-init ()
9
+(defun isg--compile-config ()
10 10
   (interactive)
11
-  (org-babel-tangle-file (expand-file-name "~/.emacs.d/isg-init.org")
12
-                         (expand-file-name "~/.emacs.d/isg-init.el")
11
+  (org-babel-tangle-file (expand-file-name "~/.emacs.d/config.org")
12
+                         (expand-file-name "~/.emacs.d/config.el")
13 13
                          "emacs-lisp"))
14
-;; (isg--compile-isg-init)
14
+;; (isg--compile-config)
15 15
 #+END_SRC
16 16
 
17 17
   |--------------+-------------+--------------------------------------------------|

+ 30
- 30
init.el View File

@@ -25,7 +25,7 @@
25 25
 
26 26
 (defvar isg--timing-hash (make-hash-table :test 'equal))
27 27
 
28
-;; here's the most recent package-selected-packages list which should be copied into isg-custom.el:
28
+;; here's the most recent package-selected-packages list which should be copied into custom.el:
29 29
 ;;
30 30
 ;; (package-selected-packages
31 31
 ;;    (quote
@@ -54,11 +54,11 @@
54 54
      (isg--time-section-stop ,key)))
55 55
 
56 56
 (defun isg--time-show-slower-than (min)
57
-    (progn
58
-      (message "________________________START TIMES________________________")
59
-      (maphash (lambda (k _v) (if (> _v min) (message "%.3f: %s" _v k))) isg--timing-hash)
60
-      (message "___________________________________________________________")
61
-      nil))
57
+  (progn
58
+    (message "________________________START TIMES________________________")
59
+    (maphash (lambda (k _v) (if (> _v min) (message "%.3f: %s" _v k))) isg--timing-hash)
60
+    (message "___________________________________________________________")
61
+    nil))
62 62
 
63 63
 (isg--time-section-start "overall")
64 64
 
@@ -69,22 +69,22 @@
69 69
 (package-initialize)
70 70
 
71 71
 (isg--timer "package"
72
-           (eval-when-compile
73
-             (require 'use-package))
74
-           (setq package-enable-at-startup nil)
75
-           (setcdr (last package-archives)
76
-                   '(("melpa-stable" . "https://stable.melpa.org/packages/")
77
-                     ("melpa" . "https://melpa.org/packages/")
78
-                     ("org" . "https://orgmode.org/elpa/")))
79
-
80
-           (setq package-check-signature nil)
81
-
82
-           (unless (package-installed-p 'use-package)
83
-             ;; check for new packages (package versions)
84
-             (message "%s" "Emacs Prelude is now refreshing its package database...")
85
-             (package-refresh-contents)
86
-             (message "%s" " done.")
87
-             (package-install 'use-package)))
72
+            (eval-when-compile
73
+              (require 'use-package))
74
+            (setq package-enable-at-startup nil)
75
+            (setcdr (last package-archives)
76
+                    '(("melpa-stable" . "https://stable.melpa.org/packages/")
77
+                      ("melpa" . "https://melpa.org/packages/")
78
+                      ("org" . "https://orgmode.org/elpa/")))
79
+
80
+            (setq package-check-signature nil)
81
+
82
+            (unless (package-installed-p 'use-package)
83
+              ;; check for new packages (package versions)
84
+              (message "%s" "Emacs Prelude is now refreshing its package database...")
85
+              (package-refresh-contents)
86
+              (message "%s" " done.")
87
+              (package-install 'use-package)))
88 88
 
89 89
 ;; after use-package-always-ensure is set, all subsequent use-package
90 90
 ;; statements will download packages if needed
@@ -92,20 +92,20 @@
92 92
 (setq use-package-verbose t)
93 93
 
94 94
 (require 'cl)
95
-; third party code that isn't in melpa-stable yet
95
+                                        ; third party code that isn't in melpa-stable yet
96 96
 (push "~/.emacs.d/external" load-path)
97 97
 (push "~/.emacs.d/external/org-drill" load-path)
98 98
 
99 99
 
100
-(if (file-exists-p (expand-file-name "~/.emacs.d/isg-init.el"))
101
-    (isg--timer "load isg-init.el"
102
-                (load "~/.emacs.d/isg-init.el"))
103
-  (isg--timer "load isg-init.org"
104
-               (org-babel-load-file (expand-file-name "~/.emacs.d/isg-init.org"))))
100
+(if (file-exists-p (expand-file-name "~/.emacs.d/config.el"))
101
+    (isg--timer "load config.el"
102
+                (load "~/.emacs.d/config.el"))
103
+  (isg--timer "load config.org"
104
+              (org-babel-load-file (expand-file-name "~/.emacs.d/config.org"))))
105 105
 
106 106
 (isg--timer "custom-file"
107
-           (setq custom-file "~/.emacs.d/isg-custom.el")
108
-           (load custom-file))
107
+            (setq custom-file "~/.emacs.d/custom.el")
108
+            (load custom-file))
109 109
 
110 110
 (isg--time-section-stop "overall")
111 111
 ;; show slowest sections in the *Messages* buffer

Loading…
Cancel
Save