From 9593d306c2294451ecad44a255c5b03c6f8afa7c Mon Sep 17 00:00:00 2001
From: benj <benj@rse8.com>
Date: Mon, 7 Jun 2021 11:20:57 -0700
Subject: lsp and emoji stuff

---
 .gitignore                   | 4 +++-
 init.el                      | 3 +--
 settings/sane-defaults.el    | 3 +++
 settings/setup-ember-mode.el | 3 ---
 settings/setup-lsp-mode.el   | 6 ++++++
 5 files changed, 13 insertions(+), 6 deletions(-)
 delete mode 100644 settings/setup-ember-mode.el

diff --git a/.gitignore b/.gitignore
index 87d766e..ebecbd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,6 @@ metastore_db*
 projectile-bookmarks.eld
 projectile.cache
 rust-playground/
-.cache
\ No newline at end of file
+.cache
+.extension
+emojis
\ No newline at end of file
diff --git a/init.el b/init.el
index 1515f2f..7e74dc3 100644
--- a/init.el
+++ b/init.el
@@ -158,7 +158,7 @@ CURRENT-NAME, if it does not already have them:
      dap-mode
      dockerfile-mode
      elm-mode
-     ember-mode
+     emojify
      erlang
      exec-path-from-shell
      flx-ido
@@ -239,7 +239,6 @@ CURRENT-NAME, if it does not already have them:
 (require 'setup-clojure-mode)
 (require 'setup-company-mode)
 (require 'setup-dockerfile-mode)
-(require 'setup-ember-mode)
 (require 'setup-flycheck)
 (require 'setup-go-mode)
 (require 'setup-haskell-mode)
diff --git a/settings/sane-defaults.el b/settings/sane-defaults.el
index 3c316d1..ace0e51 100644
--- a/settings/sane-defaults.el
+++ b/settings/sane-defaults.el
@@ -135,6 +135,9 @@
 (global-set-key (kbd "s-c") 'clipboard-kill-region)
 (global-set-key (kbd "s-v") 'clipboard-yank)
 
+;; emojify everywhere!
+(global-emojify-mode 1)
+
 (defun beautify-json ()
   (interactive)
   (let ((b (if mark-active (min (point) (mark)) (point-min)))
diff --git a/settings/setup-ember-mode.el b/settings/setup-ember-mode.el
deleted file mode 100644
index 5a56413..0000000
--- a/settings/setup-ember-mode.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(require 'ember-mode)
-;;; setup ember mode
-(provide 'setup-ember-mode)
diff --git a/settings/setup-lsp-mode.el b/settings/setup-lsp-mode.el
index cef50ac..7fd94b3 100644
--- a/settings/setup-lsp-mode.el
+++ b/settings/setup-lsp-mode.el
@@ -10,8 +10,14 @@
 
 (add-hook 'c-mode-hook #'lsp)
 (add-hook 'c++-mode-hook #'lsp)
+(add-hook 'dart-mode-hook #'lsp)
+(add-hook 'lisp-mode-hook #'lsp)
+(add-hook 'python-mode-hook #'lsp)
 
 (add-hook 'lsp-after-open-hook 'lsp-ui-mode)
 
+(with-eval-after-load 'lsp-mode
+  (add-hook 'lsp-mode-hook #'lsp-enable-which-key-integration))
+
 (provide 'setup-lsp-mode)
 ;;; setup-lsp-mode.el ends here
-- 
cgit v1.2.3