Scraped the rust off c-mode

2 files changed, 32 insertions, 6 deletions

diff --git a/emacs/inits/13-ibuffer.el b/emacs/inits/13-ibuffer.el
index ffcdedb..0b36bcc 100644
--- a/emacs/inits/13-ibuffer.el
+++ b/emacs/inits/13-ibuffer.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2020-01-11 15:47:15 (tslil@bison)>
+;; Time-stamp: <2020-12-30 17h58 EST (hobbies)>
 
 (use-package ibuffer
   :bind (("C-x C-b" . ibuffer))
@@ -10,6 +10,8 @@
         '(("default"
            ("agda" (or (mode . agda2-mode)
                        (name . "^\\*[aA]gda")))
+           ("c" (or (mode . c-mode)
+                    (mode . makefile-gmake-mode)))
            ("coq" (or (mode . coq-mode)
                       (mode . coq-goals-mode)
                       (mode . coq-response-mode)
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