summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--README7
-rw-r--r--init.el4
-rw-r--r--settings/setup-company-mode.el1
-rw-r--r--settings/setup-flycheck.el1
-rw-r--r--settings/setup-protobuf-mode.el6
-rw-r--r--settings/setup-terraform-mode.el2
6 files changed, 17 insertions, 4 deletions
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 b1167db..a215bb5 100644
--- a/init.el
+++ b/init.el
@@ -55,6 +55,7 @@
company-c-headers
company-glsl
company-lsp
+ company-terraform
clojure-mode
clojure-mode-extra-font-locking
clojure-snippets
@@ -121,7 +122,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)
@@ -154,6 +155,7 @@
(require 'setup-org-mode)
(require 'setup-plz-mode)
(require 'setup-projectile-mode)
+(require 'setup-protobuf-mode)
(require 'setup-purescript-mode)
(require 'setup-python-mode)
(require 'setup-rust-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
index d87cb4d..7740f91 100644
--- a/settings/setup-terraform-mode.el
+++ b/settings/setup-terraform-mode.el
@@ -2,7 +2,5 @@
(lambda ()
(add-hook 'before-save-hook 'terraform-format-buffer)))
-
-
(provide 'setup-terraform-mode)
;;; setup-terraform-mode.el ends here