Skip to content

Commit

Permalink
Update config, use external lisp files, enable lsp for php
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Shevchuk committed Dec 15, 2019
1 parent 8f6dc28 commit 2b0cb3c
Show file tree
Hide file tree
Showing 6 changed files with 623 additions and 137 deletions.
26 changes: 17 additions & 9 deletions init.el
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
expand-region
js2-mode
flow-js2-mode
button-lock
json-mode
jsx-mode
tss
Expand Down Expand Up @@ -135,6 +136,7 @@
(add-to-list 'auto-mode-alist '("\\.coffee$" . coffee-mode))

(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
(add-hook 'sh-mode-hook 'flycheck-mode)

;; javascript
(add-hook 'js2-mode-hook
Expand All @@ -152,6 +154,15 @@
(flycheck-mode 1)
))

(add-hook 'php-mode-hook
(lambda ()
(lsp t)))

;; LSP :: You can configure this warning with the `lsp-enable-file-watchers' and `lsp-file-watch-threshold' variables
(setq lsp-enable-file-watchers t)
(setq lsp-file-watch-threshold 1000)


(define-minor-mode sticky-buffer-mode
"Make the current window always display this buffer."
nil " sticky" nil
Expand Down Expand Up @@ -233,7 +244,6 @@

(add-hook 'vue-html-mode-hook #'emmet-mode)


;;(add-hook 'vue-mode-hook #'setup-just-tide-mode)

(setq projectile-switch-project-action 'projectile-dired)
Expand All @@ -244,7 +254,6 @@
;;(add-to-list 'projectile-globally-ignored-directories "node_modules")



(defadvice projectile-on (around exlude-tramp activate)
(unless (--any? (and it (file-remote-p it))
(list
Expand Down Expand Up @@ -307,12 +316,10 @@

(require 'spaceline-config)


(setq-default mode-line-format '("%e" (:eval (spaceline-ml-main))))


;;(spaceline-helm-mode 1)
(spaceline-emacs-theme)
(spaceline-emacs-theme)

(require 'orginit)
;; эта часть настроек для доступа к Gmail по IMAP
Expand Down Expand Up @@ -406,11 +413,13 @@
(require 'cycle-bg-colors)

(require 'swissknife)
(require 'prodigy/vaana)
(require 'etags-select)
(require 'autocommit)

(require 'issue-link)
(require 'ws-butler)
(require 'copy-as-format)

(add-hook 'prog-mode-hook 'issue-link-mode) ;; converts issue lables into buttons

(setq-default dired-details-hidden-string "--- ")
(dired-details-install)
Expand Down Expand Up @@ -505,8 +514,7 @@
;;(setq tumblesocks-blog "micoblog.tumblr.com")

(require 'multi-eshell)
(require 'nordigy)
(require 'jiffy)
(load "elisp-private/main")

(setq transient-mark-mode t)
;;(drag-stuff-global-mode t)
Expand Down
Loading

0 comments on commit 2b0cb3c

Please sign in to comment.