From 8b90d268a5396f656c0a1407cd4e010adc7a519f Mon Sep 17 00:00:00 2001 From: benj Date: Sun, 26 May 2019 15:34:41 -0700 Subject: rust and go updates --- init.el | 8 +++++++- settings/setup-company-mode.el | 3 +++ settings/setup-flycheck.el | 1 + settings/setup-org-mode.el | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/init.el b/init.el index 94ccc87..9e76047 100644 --- a/init.el +++ b/init.el @@ -31,7 +31,7 @@ ;; 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) +(package-initialize) (setq inhibit-startup-message t) @@ -48,6 +48,7 @@ (defun init-install-packages() (packages-install '(ace-window + cargo cider company company-c-headers @@ -64,6 +65,7 @@ ember-mode ensime erlang + exec-path-from-shell flx-ido flycheck flycheck-clangcheck @@ -89,6 +91,7 @@ purescript-mode org-bullets rust-mode + rust-playground sbt-mode scala-mode slime @@ -146,8 +149,10 @@ (require 'setup-markdown-mode) (require 'setup-multiple-cursors) (require 'setup-org-mode) +(require 'setup-plz-mode) (require 'setup-projectile-mode) (require 'setup-purescript-mode) +(require 'setup-rust-mode) (require 'setup-scala-mode) (require 'setup-slime-mode) (require 'setup-treemacs) @@ -158,6 +163,7 @@ ;; utility globals (require 'fetch-includes) +(exec-path-from-shell-initialize) ;; full power (put 'downcase-region 'disabled nil) diff --git a/settings/setup-company-mode.el b/settings/setup-company-mode.el index 61ee053..997c7ac 100644 --- a/settings/setup-company-mode.el +++ b/settings/setup-company-mode.el @@ -15,8 +15,11 @@ (setq company-idle-delay 0.1) (setq company-clang-executable "/usr/bin/clang++") +(setq company-go-gocode-command (concat (getenv "HOME") "/go/bin/gocode")) + (push 'company-lsp company-backends) +(push 'company-go company-backends) (add-hook 'after-init-hook 'global-company-mode) (provide 'setup-company-mode) diff --git a/settings/setup-flycheck.el b/settings/setup-flycheck.el index 764fe36..0c2b199 100644 --- a/settings/setup-flycheck.el +++ b/settings/setup-flycheck.el @@ -12,6 +12,7 @@ (add-hook 'c-mode-hook #'setup-custom-clang-checker) (add-hook 'c++-mode-hook #'setup-custom-clang-checker) +(add-hook 'flycheck-mode-hook #'flycheck-rust-setup) (global-flycheck-mode 1) diff --git a/settings/setup-org-mode.el b/settings/setup-org-mode.el index 9ad0acc..fee138e 100644 --- a/settings/setup-org-mode.el +++ b/settings/setup-org-mode.el @@ -23,8 +23,8 @@ (global-set-key (kbd "C-c a") 'org-agenda) -(setq org-agenda-files (list "~/org/todo_work.org" - "~/org/todo_home.org")) +(setq org-agenda-files (list "~/Dropbox/org/todo_work.org" + "~/Dropbox/org/todo_home.org")) (org-babel-do-load-languages 'org-babel-load-languages -- cgit v1.2.3