diff --git a/.emacs b/.emacs index d49de1e..ffbc640 100644 --- a/.emacs +++ b/.emacs @@ -13,7 +13,6 @@ (other . "gnu"))) '(company-idle-delay 20.0) '(compilation-scroll-output 'first-error) - '(display-line-numbers-type t) '(elpy-formatter 'black) '(elpy-test-runner 'elpy-test-pytest-runner) '(global-auto-revert-mode t) @@ -31,19 +30,23 @@ '((vc-follow-symlinks . t) (TeX-master . t) (TeX-parse-self . t))) - '(srefactor--getter-prefix "Get") - '(srefactor--getter-setter-capitalize-p t) - '(srefactor--setter-prefix "Set") '(tab-width 4) '(whitespace-style '(face trailing tabs lines-tail newline space-before-tab::tab space-before-tab::space space-before-tab tab-mark))) - -(if (fboundp 'toggle-scroll-bar) - (toggle-scroll-bar -1)) -(menu-bar-mode -1) -(if (fboundp 'tool-bar-mode) - (tool-bar-mode -1)) +(if (display-graphic-p) + (progn + (if (fboundp 'tool-bar-mode) + (tool-bar-mode -1)) + ) + (progn + (if (fboundp 'toggle-scroll-bar) + (toggle-scroll-bar -1)) + (menu-bar-mode -1) + (if (fboundp 'tool-bar-mode) + (tool-bar-mode -1)) + ) + ) (add-to-list 'default-frame-alist '(fullscreen . maximized)) (add-hook 'before-save-hook 'delete-trailing-whitespace) @@ -178,11 +181,20 @@ :bind ( "C-c C-f" . ff-find-other-file) ) +(use-package flycheck) + (use-package lsp-mode :config (yas-minor-mode) - (global-set-key (kbd "C-c C-n") 'flymake-goto-next-error) - :bind ("C-c C-d" . lsp-ui-doc-show) + (global-set-key (kbd "C-c C-n") 'flycheck-next-error) + (if (display-graphic-p) + (setq lsp-ui-doc-use-webkit t) + ) + (custom-set-faces + '(lsp-ui-doc-background ((t (:background "#373B41"))))) + :bind ( + ("C-c C-d" . lsp-ui-doc-toggle) + ) :init ;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l") @@ -415,8 +427,8 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. + '(default ((t (:family "UbuntuMono Nerd Font" :foundry "DAMA" :slant normal :weight normal :height 113 :width normal)))) ) - ;; Local Variables: ;; vc-follow-symlinks: t ;; End: