git.fiddlerwoaroof.com
Browse code

feat: add prolog config to emacs, adjust emacs config

Ed L authored on 16/03/2020 18:38:58
Showing 2 changed files
... ...
@@ -737,3 +737,10 @@ With a prefix ARG invalidates the cache first."
737 737
     (no-other-window t)
738 738
     (no-delete-other-windows t))
739 739
   ())
740
+
741
+(use-package prolog)
742
+(use-package ediprolog
743
+  :after prolog
744
+  :ensure t
745
+  :config
746
+  (define-key prolog-mode-map (kbd "C-j") 'ediprolog-dwim))
... ...
@@ -113,38 +113,36 @@ started from a shell."
113 113
             (helm-projectile-rg))
114 114
         (error "`helm-rg' is not available.  Is MELPA in your `package-archives'?")))))
115 115
 
116
-(defun post-init ()
117
-  ;;;;; INDENTATION SETUP  {{{
118
-
119
-
120
-  (centaur-tabs-mode 1)
121
-  (progn
122
-    (setq-default indent-tabs-mode nil
123
-                  tab-width 2)
124
-    (defvaralias 'c-basic-offset 'tab-width)
125
-    (defvaralias 'sh-basic-offset 'tab-width)
126
-    (defvaralias 'js2-basic-offset 'tab-width)
127
-    (defvaralias 'sgml-basic-offset 'tab-width)
128
-    (defvaralias 'cperl-indent-level 'tab-width))
129
-            ;;;;; }}}
130
-
131
-  ;; (require 'projectile)
132
-  ;; (require 'evil-numbers)
116
+(defun setup-indentation ()
117
+  (setq-default indent-tabs-mode nil
118
+                tab-width 2)
119
+  (defvaralias 'c-basic-offset 'tab-width)
120
+  (defvaralias 'sh-basic-offset 'tab-width)
121
+  (defvaralias 'js2-basic-offset 'tab-width)
122
+  (defvaralias 'sgml-basic-offset 'tab-width)
123
+  (defvaralias 'cperl-indent-level 'tab-width)
124
+  nil)
125
+
126
+(defun start-server ()
133 127
   (unless (fboundp 'server-running-p)
134 128
     (require 'server))
135 129
   (let ((server-name (if fwoar.is-ordinary
136 130
                          server-name
137 131
                        "notes")))
138 132
     (unless (server-running-p)
139
-      (server-start)))
140
-
141
-  (projectile-mode)
142
-  (evil-mode)
143
-  ;; (paredit-mode)
144
-  ;;(global-company-mode)
145
-  ;; (setq linum-format "%5d\u2502")
146
-  (if (version<= "26.0.50" emacs-version )
133
+      (server-start))))
134
+
135
+(defun post-init ()
136
+  (centaur-tabs-mode 1)
137
+  (projectile-mode 1)
138
+  (evil-mode 1)
139
+
140
+  (setup-indentation)
141
+  (start-server)
142
+
143
+  (if (version<= "26.0.50" emacs-version)
147 144
       (global-display-line-numbers-mode)
145
+    (setq linum-format "%5d\u2502")
148 146
     (global-linum-mode))
149 147
   (set-exec-path-from-shell-PATH)
150 148
   ;; NOTE: this must be here...
... ...
@@ -154,7 +152,8 @@ started from a shell."
154 152
   (setq fwoar.is-ordinary (not (string= invocation-name "EmacsNotes")))
155 153
   (add-hook 'after-init-hook 'post-init)
156 154
   (electric-indent-mode -1)
157
-  (electric-pair-mode -1)
155
+  (comment
156
+   (electric-pair-mode -1))
158 157
   (add-hook 'before-save-hook 'delete-trailing-whitespace)
159 158
 
160 159
   (when (file-exists-p "/usr/local/bin/gls")