emacs: Add more modules

8 files changed, 77 insertions, 0 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 5d7b856..c20a9f9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -201,6 +201,12 @@ _mbsetupuser/.emacs.d/init.el: \
 		emacs/.emacs.d/oni-flycheck.el \
 		emacs/.emacs.d/oni-dumb-jump.el \
 		emacs/.emacs.d/oni-grep.el \
+		emacs/.emacs.d/oni-display-fill-column-indicator.el \
+		emacs/.emacs.d/oni-sops.el \
+		emacs/.emacs.d/oni-treesit.el \
+		emacs/.emacs.d/oni-typescript.el \
+		emacs/.emacs.d/oni-wgrep.el \
+		emacs/.emacs.d/oni-yaml.el \
 		oni/home/config/pop-os/emacs.el
 	mkdir -p $$(dirname $@)
 	cat $^ > $@
diff --git a/emacs/.emacs.d/oni-display-fill-column-indicator.el b/emacs/.emacs.d/oni-display-fill-column-indicator.el
new file mode 100644
index 0000000..fe07fdf
--- /dev/null
+++ b/emacs/.emacs.d/oni-display-fill-column-indicator.el
@@ -0,0 +1,8 @@
+;; Start of oni-display-fill-column-indicator
+
+(use-package display-fill-column-indicator
+  :ensure nil
+  :hook (yaml-ts-mode
+         prog-mode))
+
+;; End of oni-display-fill-column-indicator
diff --git a/emacs/.emacs.d/oni-flycheck.el b/emacs/.emacs.d/oni-flycheck.el
index 6ee6a19..84f0088 100644
--- a/emacs/.emacs.d/oni-flycheck.el
+++ b/emacs/.emacs.d/oni-flycheck.el
@@ -1,6 +1,8 @@
 ;; Start of oni-flycheck
 
 (use-package flycheck
+  :hook (php-mode
+         yaml-ts-mode)
   :config
   (require 'flycheck-posframe)
 
diff --git a/emacs/.emacs.d/oni-sops.el b/emacs/.emacs.d/oni-sops.el
new file mode 100644
index 0000000..9a0936f
--- /dev/null
+++ b/emacs/.emacs.d/oni-sops.el
@@ -0,0 +1,7 @@
+;; Oni-sops starts here
+
+(use-package sops
+  :init
+  (global-sops-mode))
+
+;; Oni-sops ends here
diff --git a/emacs/.emacs.d/oni-treesit.el b/emacs/.emacs.d/oni-treesit.el
new file mode 100644
index 0000000..8ce2839
--- /dev/null
+++ b/emacs/.emacs.d/oni-treesit.el
@@ -0,0 +1,10 @@
+;; Start of oni-treesit
+
+(use-package treesit
+  :defer t
+  :ensure nil
+  :config
+  (setq treesit-language-source-alist
+        '((yaml "https://github.com/ikatyang/tree-sitter-yaml"))))
+
+;; End of oni-treesit
diff --git a/emacs/.emacs.d/oni-typescript.el b/emacs/.emacs.d/oni-typescript.el
new file mode 100644
index 0000000..7792cd3
--- /dev/null
+++ b/emacs/.emacs.d/oni-typescript.el
@@ -0,0 +1,5 @@
+;; Start of oni-typescript
+
+(use-package typescript-mode)
+
+;; End of oni-typescript
diff --git a/emacs/.emacs.d/oni-wgrep.el b/emacs/.emacs.d/oni-wgrep.el
new file mode 100644
index 0000000..df9eae9
--- /dev/null
+++ b/emacs/.emacs.d/oni-wgrep.el
@@ -0,0 +1,5 @@
+;; Oni-wgrep starts here
+
+(use-package wgrep)
+
+;; Oni-wgrep ends here
diff --git a/emacs/.emacs.d/oni-yaml.el b/emacs/.emacs.d/oni-yaml.el
new file mode 100644
index 0000000..56d99b8
--- /dev/null
+++ b/emacs/.emacs.d/oni-yaml.el
@@ -0,0 +1,34 @@
+;; Start of oni-yaml
+
+(use-package yaml-ts-mode
+  :ensure nil
+  :defer t
+  :init
+  (when (and (functionp 'treesit-available-p)
+             (treesit-available-p)
+             (require 'treesit)
+             (treesit-ready-p 'yaml))
+    (add-to-list 'major-mode-remap-alist '(yaml-mode . yaml-ts-mode)))
+  :config
+  (defun oni-yaml--auto-fill-mode ()
+    "Enable ‘auto-fill-mode’ only for comments."
+    (setq-local comment-auto-fill-only-comments t)
+    (auto-fill-mode))
+
+  (defun oni-yaml--enable-hooks (hook)
+    "Enable all hooks I use for editing yaml files for HOOK."
+    (add-hook hook 'electric-indent-local-mode)
+    (add-hook hook 'electric-pair-local-mode)
+    (add-hook hook 'highlight-indent-guides-mode)
+    (add-hook hook 'oni-yaml--auto-fill-mode)
+    (add-hook hook 'yaml-imenu-enable)
+    (add-hook hook 'yaml-pro-mode)
+    (add-hook hook 'flycheck-mode))
+
+  (define-key yaml-ts-mode-map (kbd "C-c >") 'indent-tools-hydra/body)
+
+  (oni-yaml--enable-hooks 'yaml-mode-hook))
+
+(use-package yaml-pro)
+
+;; End of oni-yaml