From a6e860b9ebb959bb12430356d9afd0b519526d06 Mon Sep 17 00:00:00 2001 From: benj Date: Thu, 16 Apr 2020 11:33:40 -0700 Subject: some golang, terraform, and protobuf stuff --- README | 7 +++++++ init.el | 6 +++++- settings/setup-company-mode.el | 1 + settings/setup-flycheck.el | 1 - settings/setup-protobuf-mode.el | 6 ++++++ settings/setup-terraform-mode.el | 6 ++++++ 6 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 README create mode 100644 settings/setup-protobuf-mode.el create mode 100644 settings/setup-terraform-mode.el diff --git a/README b/README new file mode 100644 index 0000000..34a19c0 --- /dev/null +++ b/README @@ -0,0 +1,7 @@ +# Emacs Configuration + +Most of the configuration should be automatically handled upon startup. However, there are a few third part programs which are required as follows: + +- +- +- diff --git a/init.el b/init.el index 9e76047..8981021 100644 --- a/init.el +++ b/init.el @@ -54,6 +54,7 @@ company-c-headers company-glsl company-lsp + company-terraform clojure-mode clojure-mode-extra-font-locking clojure-snippets @@ -98,6 +99,7 @@ smart-mode-line solarized-theme systemd + terraform-mode treemacs treemacs-projectile visual-regexp @@ -118,7 +120,7 @@ ;; Are we in gui or terminal? (if (display-graphic-p) ;; load the theme so we don't have a block of white for too long upon startup - (load-theme 'solarized-dark)) + (load-theme 'solarized-dark t)) (require 'visual-regexp) (require 'visual-regexp-steroids) @@ -151,10 +153,12 @@ (require 'setup-org-mode) (require 'setup-plz-mode) (require 'setup-projectile-mode) +(require 'setup-protobuf-mode) (require 'setup-purescript-mode) (require 'setup-rust-mode) (require 'setup-scala-mode) (require 'setup-slime-mode) +(require 'setup-terraform-mode) (require 'setup-treemacs) (require 'setup-txt-mode) (require 'setup-web-mode) diff --git a/settings/setup-company-mode.el b/settings/setup-company-mode.el index 997c7ac..fbe3468 100644 --- a/settings/setup-company-mode.el +++ b/settings/setup-company-mode.el @@ -20,6 +20,7 @@ (push 'company-lsp company-backends) (push 'company-go company-backends) +(push 'company-terraform 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 0c2b199..764fe36 100644 --- a/settings/setup-flycheck.el +++ b/settings/setup-flycheck.el @@ -12,7 +12,6 @@ (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-protobuf-mode.el b/settings/setup-protobuf-mode.el new file mode 100644 index 0000000..14876b5 --- /dev/null +++ b/settings/setup-protobuf-mode.el @@ -0,0 +1,6 @@ +(require 'protobuf-mode) +(c-lang-defconst c-cpp-matchers +protobuf 'nil) + +(provide 'setup-protobuf-mode) +;;; setup-protobuf-mode.el ends here diff --git a/settings/setup-terraform-mode.el b/settings/setup-terraform-mode.el new file mode 100644 index 0000000..7740f91 --- /dev/null +++ b/settings/setup-terraform-mode.el @@ -0,0 +1,6 @@ +(add-hook 'terraform-mode-hook + (lambda () + (add-hook 'before-save-hook 'terraform-format-buffer))) + +(provide 'setup-terraform-mode) +;;; setup-terraform-mode.el ends here -- cgit v1.2.3