Refactoring.

init.el

@@ -1,5 +1,5 @@
 ;;; init.el --- tastytea's Emacs init file.
-;;; Time-stamp: <2019-03-21 13:53:37 CET>
+;;; Time-stamp: <2019-03-22 00:39:03 CET>
 
 ;;; Commentary:
 ;;; I am using this file with Emacs 26, but most of it will probably work with
@@ -164,8 +164,8 @@
 (global-set-key (kbd "M-<up>") 'scroll-down-line)
 
 ;;;;;;;;;;;;;;;;;;;; Programming / RTags ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(unless slow-computer
 (use-package rtags
+  :unless slow-computer
   :if (executable-find "llvm-config")
   :if (executable-find "clang++")
   :config
@@ -181,7 +181,7 @@
   :hook
   (c++-mode   . (rtags-start-process-unless-running))
   (c-mode     . (rtags-start-process-unless-running))
-    (kill-emacs . rtags-quit-rdm)))
+  (kill-emacs . rtags-quit-rdm))
 
 (use-package flycheck-rtags
   :after (flycheck rtags)
@@ -211,16 +211,16 @@
   (prog-mode . turn-on-eldoc-mode))
 
 ;; Syntax checking
-(unless slow-computer
 (use-package flycheck
+  :unless slow-computer
   :config
-    (global-flycheck-mode)))
+  (global-flycheck-mode))
 
 ;; Autocompletion
-(unless slow-computer
 (use-package company
+  :unless slow-computer
   :hook
-    (after-init . global-company-mode)))
+  (after-init . global-company-mode))
 
 ;; Fuzzy autocompletion
 (use-package company-flx
@@ -229,11 +229,11 @@
   (company-flx-mode +1))
 
 ;; cmake integration
-(unless slow-computer
 (use-package cmake-ide
+  :unless slow-computer
   :config
   (setq cmake-ide-build-dir "build")
-    (cmake-ide-setup)))
+  (cmake-ide-setup))
 
 ;; Indentation
 (setq-default indent-tabs-mode nil
@@ -242,8 +242,8 @@
       c-basic-offset 4)
 
 ;; Project management
-(unless slow-computer
 (use-package projectile
+  :unless slow-computer
   :after neotree
   :config
   (projectile-mode +1)
@@ -263,7 +263,7 @@
   ("C-c p" . 'projectile-command-map)
   (:map projectile-command-map
         ("k" . 'projectile-kill-buffers-and-change-tabbar-grouping))
-    ))
+  )
 
 ;; Debugger
 (use-package realgud
@@ -323,14 +323,14 @@
     (all-the-icons-install-fonts t)))
 
 ;; Theme
-(unless slow-computer
 (use-package doom-themes
+  :unless slow-computer
   :after (all-the-icons neotree)
   :config
   (load-theme 'doom-molokai t)
   (doom-themes-neotree-config)
   :custom
-    (doom-neotree-file-icons 'icons)))
+  (doom-neotree-file-icons 'icons))
 
 ;; Modeline
 (use-package doom-modeline
@@ -362,8 +362,8 @@
   :bind
   ("<f8>" . neotree-toggle))
 
-(unless slow-computer
+(use-package git-commit
-  (use-package git-commit))
+  :unless slow-computer)
 (use-package magit
   :config
   (defun my-magit-kill-buffers (arg)
@@ -421,13 +421,14 @@
 
 ;; Replaces stock emacs completion with ido completion wherever it is possible
 (use-package ido-completing-read+
+  :unless slow-computer
   :after ido
   :config
   (ido-ubiquitous-mode t))
 
 ;; Tab bar
-(unless slow-computer
 (use-package tabbar-ruler
+  :unless slow-computer
   :after projectile
   :init
   (setq tabbar-ruler-global-tabbar t)
@@ -465,8 +466,7 @@
                       :background "gray18"
                       :foreground "dark gray"
                       :family "Sans Serif"
-                        :italic t))
+                      :italic t)))
-    ))
 
 ;; Keybinding for whitespace, don't visualise newlines
 (use-package whitespace
@@ -549,8 +549,8 @@
 
 ;;;;;;;;;;;;;;;;;;;; Server / Remote editing ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Edit remote files
-(unless slow-computer
 (use-package tramp
+  :unless slow-computer
   :defer 1
   :config
   ;; ssh is faster than scp and supports ports
@@ -567,7 +567,7 @@
      t)
     ".*:\0? *"))
   ;; Respect remote PATH
-    (add-to-list 'tramp-remote-path 'tramp-own-remote-path)))
+  (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
 
 ;; Run server if:
 ;; - Our EUID is not 0

server/server

@@ -1,2 +1,2 @@
-127.0.0.1:51313 23104
+127.0.0.1:51313 24224
 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh