summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbenj <benj@rse8.com>2021-06-07 11:20:57 -0700
committerbenj <benj@rse8.com>2021-06-09 18:31:46 -0700
commit9593d306c2294451ecad44a255c5b03c6f8afa7c (patch)
tree88fabb81c1fc3999bac0b1ab306c6e5f230e8149
parentf06ad4d1ee9338fc9b89010b52dd23f31f9b6232 (diff)
downloademacs-9593d306c2294451ecad44a255c5b03c6f8afa7c.tar
emacs-9593d306c2294451ecad44a255c5b03c6f8afa7c.tar.gz
emacs-9593d306c2294451ecad44a255c5b03c6f8afa7c.tar.bz2
emacs-9593d306c2294451ecad44a255c5b03c6f8afa7c.tar.lz
emacs-9593d306c2294451ecad44a255c5b03c6f8afa7c.tar.xz
emacs-9593d306c2294451ecad44a255c5b03c6f8afa7c.tar.zst
emacs-9593d306c2294451ecad44a255c5b03c6f8afa7c.zip
lsp and emoji stuff
Diffstat (limited to '')
-rw-r--r--.gitignore4
-rw-r--r--init.el3
-rw-r--r--settings/sane-defaults.el3
-rw-r--r--settings/setup-ember-mode.el3
-rw-r--r--settings/setup-lsp-mode.el6
5 files changed, 13 insertions, 6 deletions
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