     ;; (set 'company-clang-arguments (list "-std=c++11"))
     )
 
-  (use-package ycmd
-    :ensure t
-    :config
-    (require 'ycmd)
-    (add-hook 'after-init-hook #'global-ycmd-mode)
-    (set-variable 'ycmd-server-command '("python" "/home/danylo/Downloads/ycmd/ycmd"))
-    (use-package company-ycmd
-      ;; company (autocompletion)
+  ;; (use-package ycmd
+  ;;   :ensure t
+  ;;   :config
+  ;;   (require 'ycmd)
+  ;;   (add-hook 'after-init-hook #'global-ycmd-mode)
+  ;;   (set-variable 'ycmd-server-command '("python" "/home/danylo/Downloads/ycmd/ycmd"))
+  ;;   (use-package company-ycmd
+  ;;     ;; company (autocompletion)
+  ;;     :ensure t
+  ;;     :config
+  ;;     (require 'company-ycmd)
+  ;;     (company-ycmd-setup)
+  ;;     )
+  ;;   (use-package flycheck-ycmd
+  ;;     ;; flycheck (syntax highlighting)
+  ;;     :ensure t
+  ;;     :config
+  ;;     (require 'flycheck-ycmd)
+  ;;     (flycheck-ycmd-setup)
+  ;;     )
+  ;;   )
+
+  (use-package irony
+    ;; asynchronous capabilities (improces C/C++ editing experience)
+    ;; Linux Mint:
+    ;;  sudo apt-get install g++ clang libclang-dev
+    ;;  M-x irony-install-server # when in c-mode or c++-mode
+    :ensure t
+    :defer t
+    :init
+    (add-hook 'c-mode-common-hook 'irony-mode)
+    :config
+    ;; replace completion-at-point and complete-symbol by irony-mode's asynchronous functions
+    (defun my-irony-mode-hook ()
+      (define-key irony-mode-map [remap completion-at-point]
+  	'irony-completion-at-point-async)
+      (define-key irony-mode-map [remap complete-symbol]
+  	'irony-completion-at-point-async))
+    (add-hook 'irony-mode-hook 'my-irony-mode-hook)
+    (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)
+    (setq irony-additional-clang-options '(;; use C++11
+  					   "-std=c++11"))
+    ;; additional include paths
+    ;;					 "-I/home/danylo/catkin_ws/devel/include/"
+    ;;					 "-I/opt/ros/kinetic/include/"))
+    ;; asynchronous code linting
+    (use-package flycheck-irony
       :ensure t
       :config
-      (require 'company-ycmd)
-      (company-ycmd-setup)
+      ;; Enable Irony for Flycheck
+      (eval-after-load 'flycheck '(add-hook 'flycheck-mode-hook #'flycheck-irony-setup)))
+    ;; asynchronous completion
+    (use-package company-irony
+      :ensure t
+      :init
+      (add-hook 'irony-mode-hook 'company-irony-setup-begin-commands)
+      (eval-after-load 'company '(add-to-list 'company-backends 'company-irony))
+      ;; :config
+      ;; (setq company-idle-delay 0.05)
       )
-    (use-package flycheck-ycmd
-      ;; flycheck (syntax highlighting)
+    ;; enable C/C++ header completion
+    (use-package company-irony-c-headers
       :ensure t
       :config
-      (require 'flycheck-ycmd)
-      (flycheck-ycmd-setup)
-      )
-    )
-
-  ;; (use-package irony
-  ;;   ;; asynchronous capabilities (improces C/C++ editing experience)
-  ;;   ;; Linux Mint:
-  ;;   ;;  sudo apt-get install g++ clang libclang-dev
-  ;;   ;;  M-x irony-install-server # when in c-mode or c++-mode
-  ;;   :ensure t
-  ;;   :defer t
-  ;;   :init
-  ;;   (add-hook 'c-mode-common-hook 'irony-mode)
-  ;;   :config
-  ;;   ;; replace completion-at-point and complete-symbol by irony-mode's asynchronous functions
-  ;;   (defun my-irony-mode-hook ()
-  ;;     (define-key irony-mode-map [remap completion-at-point]
-  ;; 	'irony-completion-at-point-async)
-  ;;     (define-key irony-mode-map [remap complete-symbol]
-  ;; 	'irony-completion-at-point-async))
-  ;;   (add-hook 'irony-mode-hook 'my-irony-mode-hook)
-  ;;   (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)
-  ;;   (setq irony-additional-clang-options '(;; use C++11
-  ;; 					   "-std=c++11"))
-  ;;   ;; additional include paths
-  ;;   ;;					 "-I/home/danylo/catkin_ws/devel/include/"
-  ;;   ;;					 "-I/opt/ros/kinetic/include/"))
-  ;;   ;; asynchronous code linting
-  ;;   (use-package flycheck-irony
-  ;;     :ensure t
-  ;;     :config
-  ;;     ;; Enable Irony for Flycheck
-  ;;     (eval-after-load 'flycheck '(add-hook 'flycheck-mode-hook #'flycheck-irony-setup)))
-  ;;   ;; asynchronous completion
-  ;;   (use-package company-irony
-  ;;     :ensure t
-  ;;     :init
-  ;;     (add-hook 'irony-mode-hook 'company-irony-setup-begin-commands)
-  ;;     (eval-after-load 'company '(add-to-list 'company-backends 'company-irony))
-  ;;     ;; :config
-  ;;     ;; (setq company-idle-delay 0.05)
-  ;;     )
-  ;;   ;; enable C/C++ header completion
-  ;;   (use-package company-irony-c-headers
-  ;;     :ensure t
-  ;;     :config
-  ;;     (eval-after-load 'company '(add-to-list 'company-backends '(company-irony-c-headers company-irony)))))
+      (eval-after-load 'company '(add-to-list 'company-backends '(company-irony-c-headers company-irony)))))
 
   (use-package helm
     ;; incremental completion and selection narrowing framework

     ("C-<right>" . windmove-right)
     ("C-<up>" . windmove-up)
     ("C-<down>" . windmove-down)))

  (use-package buffer-menu
    ;; show all current buffers
    :init

  (menu-bar-mode -1)  ;; disable menubar
  (tool-bar-mode -1) ;; disable toolbar
  (toggle-scroll-bar -1) ;; disable scrollbar

  ;; Comint unset C-up C-down
  (global-unset-key (kbd "C-<up>"))
  (global-unset-key (kbd "C-<down>"))


  ;; MELPA
  (require 'package)
