emacs: move init prog languages to rul-prog module

5 files changed, 39 insertions, 38 deletions

diff --git a/.emacs.d/rul-init.d/go-lang.el b/.emacs.d/rul-init.d/go-lang.el
deleted file mode 100644
index 8ec678b..0000000
--- a/.emacs.d/rul-init.d/go-lang.el
+++ /dev/null
@@ -1,23 +0,0 @@
-;; Debian packages: elpa-go-mode
-;; Elpa packages: go-eldoc
-
-(use-package go-mode
-  :ensure t
-  :init
-  (progn
-    (bind-key [remap find-tag] #'godef-jump))
-  :config
-  (add-hook 'go-mode-hook #'yas-minor-mode)
-  (add-hook 'go-mode-hook 'electric-pair-mode)
-  (add-hook 'go-mode-hook 'my-go-mode-hook)
-  (add-hook 'before-save-hook 'gofmt-before-save)
-)
-
-(use-package go-eldoc
-  :ensure t
-  :init
-  (add-hook 'go-mode-hook 'go-eldoc-setup))
-
-;; Define function to call when go-mode loads
-(defun my-go-mode-hook ()
-  (set 'compile-command "go build -v && go test -v && go vet"))
diff --git a/.emacs.d/rul-init.d/latex.el b/.emacs.d/rul-init.d/latex.el
deleted file mode 100644
index de4de1f..0000000
--- a/.emacs.d/rul-init.d/latex.el
+++ /dev/null
@@ -1,9 +0,0 @@
-(add-hook 'latex-mode-hook 'flyspell-mode)
-(setq TeX-PDF-mode t)
-
-(defun pdfevince ()
-  (add-to-list 'TeX-output-view-style
-		'("^pdf$" "." "evince %o %(outpage)")))
-
-(add-hook  'LaTeX-mode-hook  'pdfevince  t) ; AUCTeX LaTeX mode
-
diff --git a/.emacs.d/rul-init.d/markdown.el b/.emacs.d/rul-init.d/markdown.el
deleted file mode 100644
index f035509..0000000
--- a/.emacs.d/rul-init.d/markdown.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(autoload 'markdown-mode "markdown-mode.el"
-  "Major mode for editing Markdown files" t)
-
-(setq auto-mode-alist
-      (cons '("\\.mdwn" . markdown-mode) auto-mode-alist))
diff --git a/.emacs.d/rul-init.d/python.el b/.emacs.d/rul-init.d/python.el
deleted file mode 100644
index 3186c72..0000000
--- a/.emacs.d/rul-init.d/python.el
+++ /dev/null
@@ -1 +0,0 @@
-(add-hook 'python-mode-hook 'py-autopep8-enable-on-save)
diff --git a/.emacs.d/rul-lisp/packages/rul-prog.el b/.emacs.d/rul-lisp/packages/rul-prog.el
index e7753a2..7e2d1e8 100644
--- a/.emacs.d/rul-lisp/packages/rul-prog.el
+++ b/.emacs.d/rul-lisp/packages/rul-prog.el
@@ -7,8 +7,47 @@
 (setq gc-cons-threshold (* 100 1024 1024)
       read-process-output-max (* 1024 1024))
 
+;; Go
+(use-package go-mode
+  :ensure t
+  :init
+  (progn
+    (bind-key [remap find-tag] #'godef-jump))
+  :config
+  (add-hook 'go-mode-hook #'yas-minor-mode)
+  (add-hook 'go-mode-hook 'electric-pair-mode)
+  (add-hook 'go-mode-hook 'my-go-mode-hook)
+  (add-hook 'before-save-hook 'gofmt-before-save))
+
+(use-package go-eldoc
+  :ensure t
+  :init
+  (add-hook 'go-mode-hook 'go-eldoc-setup))
+
+;; Define function to call when go-mode loads
+(defun my-go-mode-hook ()
+  (set 'compile-command "go build -v && go test -v && go vet"))
+
+;; Latex
+(add-hook 'latex-mode-hook 'flyspell-mode)
+(setq TeX-PDF-mode t)
+
+(defun pdfevince ()
+  (add-to-list 'TeX-output-view-style
+		'("^pdf$" "." "evince %o %(outpage)")))
+
+(add-hook  'LaTeX-mode-hook  'pdfevince  t) ; AUCTeX LaTeX mode
+
+;; Markdown
+(autoload 'markdown-mode "markdown-mode.el"
+  "Major mode for editing Markdown files" t)
+
+(setq auto-mode-alist
+      (cons '("\\.mdwn" . markdown-mode) auto-mode-alist))
+
 ;; Python
 (use-package blacken :ensure t :defer t)
+(add-hook 'python-mode-hook 'py-autopep8-enable-on-save)
 
 ;; Terraform
 (use-package terraform-mode :ensure t :defer t)