diff --git a/.myemacs b/.myemacs index b464d94..fdb802e 100644 --- a/.myemacs +++ b/.myemacs @@ -6,7 +6,7 @@ ; By: tmaze +#+ +:+ +#+ ; ; +#+#+#+#+#+ +#+ ; ; Created: 2018/07/09 18:59:05 by tmaze #+# #+# ; -; Updated: 2019/05/08 10:15:23 by tmaze ### ########.fr ; +; Updated: 2019/11/01 17:32:23 by tmaze ### ########.fr ; ; ; ;******************************************************************************; @@ -32,7 +32,13 @@ There are two things you can do about this warning: (setq package-initialize-at-startup nil) -(defvar tmaze/packages '(evil +(defvar tmaze/packages '(ccls + rust-mode + company + use-package + lsp-mode + company-lsp + column-enforce-mode magit treemacs treemacs-magit @@ -56,12 +62,37 @@ There are two things you can do about this warning: (load-theme 'dakrone t) (global-set-key (kbd "C-x g") 'magit-status) +(global-set-key (kbd "C-x t") 'treemacs) + +(menu-bar-mode -1) +(xterm-mouse-mode 1) (global-git-commit-mode) (global-undo-tree-mode) -(global-column-enforce-mode) (line-number-mode 1) (column-number-mode 1) +(use-package rust-mode + :mode "\\.rs\\'" + :init + (setq rust-format-on-save t)) +(use-package lsp-mode + :init + (add-hook 'prog-mode-hook 'lsp-mode) + :config + (use-package lsp-flycheck + :ensure f ; comes with lsp-mode + :after flycheck)) +(use-package lsp-rust + :after lsp-mode) +(use-package ccls + :hook ((c-mode c++-mode objc-mode cuda-mode) . + (lambda () (require 'ccls) (lsp)))) + +(use-package flymake-cursor + :load-path "~/.emacs.d/lisp/emacs-flymake-cursor" ;; cloned repo path + :config + (flymake-cursor-mode)) + (setenv "ESHELL" (expand-file-name "~/.emacs.d/eshell")) diff --git a/init.el b/init.el index 2dc68e2..eeb3380 100644 --- a/init.el +++ b/init.el @@ -6,7 +6,7 @@ ; by: thor +#+ +:+ +#+ ; ; +#+#+#+#+#+ +#+ ; ; Created: 2013/06/18 14:01:14 by thor #+# #+# ; -; Updated: 2018/07/16 15:57:40 by tmaze ### ########.fr ; +; Updated: 2019/10/28 09:01:53 by tmaze ### ########.fr ; ; ; ;*******************************************************************************; @@ -16,7 +16,6 @@ ;; installed packages. Don't delete this line. If you don't want it, ;; just comment it out by adding a semicolon to the start of the line. ;; You may delete these explanatory comments. -(package-initialize) (setq config_files "/usr/share/emacs/site-lisp/") (setq load-path (append (list nil config_files) load-path)) @@ -48,3 +47,18 @@ ;*******************************************************************************; +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; 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. + '(gud-gdb-command-name "gdb --annotate=1") + '(large-file-warning-threshold nil) + '(package-selected-packages + '(dockerfile-mode ccls yasnippet ox-reveal web-mode json-mode docker-compose-mode column-enforce-mode treemacs-magit ox-twbs evil dakrone-theme))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; 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. + )