From a5f710d2e1080b5aee84b088cd87f5148f2dab30 Mon Sep 17 00:00:00 2001
From: benj <benj@rse8.com>
Date: Tue, 26 May 2020 20:36:57 -0700
Subject: typescript, opam, dockerfile

---
 init.el | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'init.el')

diff --git a/init.el b/init.el
index a215bb5..d46ecc8 100644
--- a/init.el
+++ b/init.el
@@ -83,6 +83,7 @@
      lsp-ui
      magit
      markdown-mode
+     merlin
      modern-cpp-font-lock
      multiple-cursors
      paredit
@@ -103,6 +104,7 @@
      terraform-mode
      treemacs
      treemacs-projectile
+     tuareg
      typescript-mode
      visual-regexp
      visual-regexp-steroids
@@ -141,6 +143,7 @@
 (require 'setup-c++-mode)
 (require 'setup-clojure-mode)
 (require 'setup-company-mode)
+(require 'setup-dockerfile-mode)
 (require 'setup-ember-mode)
 (require 'setup-flycheck)
 (require 'setup-go-mode)
@@ -163,11 +166,16 @@
 (require 'setup-slime-mode)
 (require 'setup-terraform-mode)
 (require 'setup-treemacs)
+(require 'setup-typescript-mode)
 (require 'setup-txt-mode)
 (require 'setup-web-mode)
 (require 'setup-yaml-mode)
 (require 'setup-yasnippet)
 
+;; ## added by OPAM user-setup for emacs / base ## 56ab50dc8996d2bb95e7856a6eddb17b ## you can edit, but keep this line
+(require 'setup-opam)
+;; ## end of OPAM user-setup addition for emacs / base ## keep this line
+
 ;; utility globals
 (require 'fetch-includes)
 (exec-path-from-shell-initialize)
-- 
cgit v1.2.3