From ab7e848a5067456f932acba339b8cc74b2fa3b78 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Wed, 20 Mar 2019 08:27:47 +0100
Subject: [PATCH] Fixed some warnings, threw old code away.

---
 init.el       | 89 ++++++++-------------------------------------------
 server/server |  2 +-
 2 files changed, 15 insertions(+), 76 deletions(-)

diff --git a/init.el b/init.el
index afb52b9..fabf21e 100644
--- a/init.el
+++ b/init.el
@@ -110,48 +110,6 @@
 ;; Reduce whitespace around point to 0 or 1, according to context
 (global-set-key (kbd "C-S-<delete>") 'fixup-whitespace)
 
-;;;;;;;;;;;;;;;;;;;; Programming / irony ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; (unless slow-computer
-;;   (use-package irony
-;;     :hook
-;;     (c++-mode        . irony-mode)
-;;     (c-mode          . irony-mode)
-;;     (irony-mode      . irony-cdb-autosetup-compile-options)
-;;     :config
-;;     ;; If irony server was never installed, install it.
-;;     (unless (irony--find-server-executable)
-;;       (call-interactively #'irony-install-server))
-;;     ;; Use compilation database first, clang_complete as fallback.
-;;     (setq-default irony-cdb-compilation-databases '(irony-cdb-libclang
-;;                                                     irony-cdb-clang-complete))))
-
-;; ;; Eldoc shows argument list of the function you are currently writing.
-;; (unless slow-computer
-;;   (use-package eldoc))
-;; (use-package irony-eldoc
-;;   :after (eldoc irony)
-;;   :init
-;;   :hook
-;;   (irony-mode . #'irony-eldoc))
-
-;; (use-package flycheck-irony
-;;   :after (flycheck irony)
-;;   :config
-;;   (global-flycheck-mode)
-;;   (eval-after-load 'flycheck
-;;     '(add-hook 'flycheck-mode-hook #'flycheck-irony-setup)))
-
-;; (use-package company-irony
-;;   :after (company irony)
-;;   :config
-;;   (add-to-list 'company-backends 'company-irony))
-
-;; ;; Autocomplete headers
-;; (use-package company-irony-c-headers
-;;   :after (company-irony)
-;;   :config
-;;   (add-to-list 'company-backends 'company-irony-c-headers))
-
 ;;;;;;;;;;;;;;;;;;;; Programming / RTags ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (unless slow-computer
   (use-package rtags
@@ -181,7 +139,6 @@
   (defun setup-flycheck-rtags ()
     (flycheck-select-checker 'rtags)
     (setq-local flycheck-highlighting-mode nil))  ; Can't disable RTags overlay
-  (global-flycheck-mode)
   :hook
   (c-mode-hook   . #'setup-flycheck-rtags)
   (c++-mode-hook . #'setup-flycheck-rtags))
@@ -197,7 +154,9 @@
 ;;;;;;;;;;;;;;;;;;;; Programming / other ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Syntax checking
 (unless slow-computer
-  (use-package flycheck))
+  (use-package flycheck
+    :config
+    (global-flycheck-mode)))
 
 ;; Autocompletion
 (unless slow-computer
@@ -248,7 +207,7 @@
   (c++-mode . load-realgud)
   (c-mode   . load-realgud))
 
-;; Highlight TODO, FIXME, NOTE
+;; Highlight TODO, FIXME, NOTE and so on.
 (use-package hl-todo
   :config
   (global-hl-todo-mode t))
@@ -276,14 +235,6 @@
 
 
 ;;;;;;;;;;;;;;;;;;;; Appearance ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Theme
-;; (unless slow-computer
-;;   (use-package monokai-theme
-;;     :init
-;;     (setq monokai-highlight-line "#34342F")
-;;     :config
-;;     (load-theme 'monokai t)))
-
 ;; Icons (required by doom)
 (use-package all-the-icons
   :config
@@ -299,6 +250,7 @@
     (doom-themes-neotree-config)
     :custom
     (doom-neotree-file-icons 'icons)))
+
 ;; Modeline
 (use-package doom-modeline
   :after all-the-icons
@@ -337,20 +289,16 @@
 ;; Draw line in column 80
 (use-package fill-column-indicator
   :after company
-  :init
-  (setq fci-rule-column 80)
-  ;; Fix bug with fci + company
-  (defun on-off-fci-before-company(command)
-    (when (string= "show" command)
-      (turn-off-fci-mode))
-    (when (string= "hide" command)
-      (turn-on-fci-mode)))
-  ;; Add global fci-mode
-  (define-globalized-minor-mode global-fci-mode fci-mode
-    (lambda () (fci-mode t)))
   :config
-  (global-fci-mode t)
-  (advice-add 'company-call-frontends :before #'on-off-fci-before-company))
+  ;; TODO: Find out why I can't put this in :init or :config
+  ;; (define-globalized-minor-mode global-fci-mode fci-mode
+  ;;   (lambda () (fci-mode 1)))
+  ;; (global-fci-mode t)
+  :hook
+  (prog-mode . fci-mode)
+  (text-mode . fci-mode)
+  :custom
+  (fci-rule-column 80))
 
 ;; Interactive substring matching
 (use-package ido
@@ -366,15 +314,6 @@
         ido-ignore-extensions t
         ido-use-virtual-buffers t)) ; Keep log of recently opened files
 
-
-;; (use-package ido-sort-mtime
-;;   :after ido
-;;   :config
-;;   (ido-sort-mtime-mode 1)
-;;   (if slow-computer
-;;       (setq ido-sort-mtime-limit 500)
-;;     (setq ido-sort-mtime-limit 2000)))
-
 ;; Tab bar
 (unless slow-computer
   (use-package tabbar-ruler
diff --git a/server/server b/server/server
index bda8bf3..ec43231 100644
--- a/server/server
+++ b/server/server
@@ -1,2 +1,2 @@
-127.0.0.1:51313 17125
+127.0.0.1:51313 16029
 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh
\ No newline at end of file