Scraped the rust off c-mode

1 files changed, 29 insertions, 5 deletions

diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index 72241b6..da47f83 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2020-05-17 10:51:43 (tslil@forfeit)>
+;; Time-stamp: <2020-12-29 18h53 EST (hobbies)>
 
 ;; -----------------------------------------------------------------------------
 ;; General setup
@@ -128,12 +128,29 @@
   :defer t
   :ensure t)
 
+(use-package company-irony-c-headers
+  :ensure t
+  :defer t)
+
+(use-package company-irony
+  :ensure t
+  :defer t)
+
 (use-package irony
   :ensure t
   :defer t
-  :hook (lambda ()
-          (irony-cdb-autosetup-compile-options)
-          (company-irony-setup-begin-commands)))
+  :hook (irony-mode . (lambda ()
+                        (require 'company)
+                        (company-mode-on)
+                        (irony-cdb-autosetup-compile-options)
+
+                        (require 'company-irony)
+                        (require 'company-irony-c-headers)
+                        (add-to-list 'company-backends '(company-irony-c-headers company-irony)))))
+
+(use-package flycheck-irony
+  :ensure t
+  :defer t)
 
 (use-package cc-mode
   :defer t
@@ -143,10 +160,13 @@
 
 (add-hook 'c-mode-hook
           (lambda ()
-            (irony-mode)
             (abbrev-mode 0)
+
+            (irony-mode)
+
             (flycheck-mode)
             (flycheck-irony-setup)
+
             (c-toggle-hungry-state 1)
             (c-toggle-electric-state 1)
             (c-toggle-syntactic-indentation 1)))
@@ -168,6 +188,10 @@
          ("\\.fb$" . forth-block-mode)
          ("\\.4th$" . forth-mode)))
 
+(use-package clojure-mode
+  :ensure t
+  :defer t)
+
 ;; -----------------------------------------------------------------------------
 ;; Rust