Compare commits
No commits in common. "0d93f1a1d24166b5a44ca0ce624ea91df32bf00d" and "ad09b481aca56cb54a2061eb2453d25f9c56e488" have entirely different histories.
0d93f1a1d2
...
ad09b481ac
1 changed files with 14 additions and 17 deletions
31
init.el
31
init.el
|
@ -66,14 +66,14 @@
|
||||||
(setq tab-always-indent nil) ;; tab key inserts tabs after hitting indent point
|
(setq tab-always-indent nil) ;; tab key inserts tabs after hitting indent point
|
||||||
|
|
||||||
;; display mismatched whitespace at the beginning or end of lines
|
;; display mismatched whitespace at the beginning or end of lines
|
||||||
;; (add-hook 'after-change-major-mode-hook
|
(add-hook 'after-change-major-mode-hook
|
||||||
;; (lambda ()
|
(lambda ()
|
||||||
;; (if (derived-mode-p 'prog-mode)
|
(if (derived-mode-p 'prog-mode)
|
||||||
;; (progn
|
(progn
|
||||||
;; (if (eq indent-tabs-mode t)
|
(if (eq indent-tabs-mode t)
|
||||||
;; (setq whitespace-style '(face indentation::tab trailing missing-newline-at-eof))
|
(setq whitespace-style '(face indentation::tab trailing missing-newline-at-eof))
|
||||||
;; (setq whitespace-style '(face indentation::space trailing missing-newline-at-eof)))
|
(setq whitespace-style '(face indentation::space trailing missing-newline-at-eof)))
|
||||||
;; (whitespace-mode t)))))
|
(whitespace-mode t)))))
|
||||||
|
|
||||||
(add-hook 'prog-mode-hook 'enable-tabs)
|
(add-hook 'prog-mode-hook 'enable-tabs)
|
||||||
(add-hook 'lisp-mode-hook 'disable-tabs)
|
(add-hook 'lisp-mode-hook 'disable-tabs)
|
||||||
|
@ -99,8 +99,6 @@
|
||||||
;; Packages
|
;; Packages
|
||||||
(require 'use-package)
|
(require 'use-package)
|
||||||
|
|
||||||
(electric-pair-mode)
|
|
||||||
|
|
||||||
;; Evil (Vim Emulation)
|
;; Evil (Vim Emulation)
|
||||||
(use-package evil
|
(use-package evil
|
||||||
:init
|
:init
|
||||||
|
@ -136,9 +134,10 @@
|
||||||
|
|
||||||
;; Avy (jump to char)
|
;; Avy (jump to char)
|
||||||
(use-package avy
|
(use-package avy
|
||||||
:bind (("C-:" . avy-goto-char)
|
:bind
|
||||||
("C-;" . avy-goto-word-1)
|
(("C-;" . avy-goto-char)
|
||||||
("C-'" . avy-goto-line)))
|
("C-:" . avy-goto-word-1)
|
||||||
|
("M-g g" . avy-goto-line)))
|
||||||
|
|
||||||
(use-package undo-tree
|
(use-package undo-tree
|
||||||
:after evil
|
:after evil
|
||||||
|
@ -300,9 +299,7 @@
|
||||||
:init
|
:init
|
||||||
(setq lsp-headerline-breadcrumb-enable nil
|
(setq lsp-headerline-breadcrumb-enable nil
|
||||||
lsp-signature-auto-activate nil
|
lsp-signature-auto-activate nil
|
||||||
lsp-signature-doc-lines 0
|
lsp-signature-doc-lines 0)
|
||||||
lsp-idle-delay 0
|
|
||||||
lsp-enable-snippet nil)
|
|
||||||
:config
|
:config
|
||||||
(add-hook 'lsp-mode-hook #'lsp-enable-which-key-integration)
|
(add-hook 'lsp-mode-hook #'lsp-enable-which-key-integration)
|
||||||
(add-hook 'evil-insert-state-entry-hook #'lsp-signature-activate)
|
(add-hook 'evil-insert-state-entry-hook #'lsp-signature-activate)
|
||||||
|
@ -382,7 +379,7 @@
|
||||||
:config
|
:config
|
||||||
(add-to-list 'lsp-language-id-configuration '(qml-ts-mode . "qml-ts"))
|
(add-to-list 'lsp-language-id-configuration '(qml-ts-mode . "qml-ts"))
|
||||||
(lsp-register-client
|
(lsp-register-client
|
||||||
(make-lsp-client :new-connection (lsp-stdio-connection '("qmlls"))
|
(make-lsp-client :new-connection (lsp-stdio-connection '("qmlls" "-E"))
|
||||||
:activation-fn (lsp-activate-on "qml-ts")
|
:activation-fn (lsp-activate-on "qml-ts")
|
||||||
:server-id 'qmlls))
|
:server-id 'qmlls))
|
||||||
(add-hook 'qml-ts-mode-hook (lambda ()
|
(add-hook 'qml-ts-mode-hook (lambda ()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue