From cb83cd5ae774bdfbfe4829ea67c73a62533613f7 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Mon, 27 Jan 2020 02:39:22 +0100
Subject: [PATCH] Emacs: Clean up init files a bit.

---
 init.d/basics/appearance.el  | 18 +++++++-----------
 init.d/basics/buffers.el     |  3 +--
 init.d/programming/c++.el    |  4 +---
 init.d/programming/common.el |  6 ++----
 init.d/text/common.el        | 18 +++++-------------
 server/server                |  2 +-
 6 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/init.d/basics/appearance.el b/init.d/basics/appearance.el
index 894062a..3fc5a4d 100644
--- a/init.d/basics/appearance.el
+++ b/init.d/basics/appearance.el
@@ -1,6 +1,6 @@
 ;;; appearance.el --- Configure appearance. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2019-12-26T21:11:25+0100>
+;; Time-stamp: <2020-01-27T02:37:47+0100>
 
 ;;; Commentary:
 
@@ -11,6 +11,12 @@
 (use-package emacs
   :ensure nil
 
+  :custom
+  ;; If 2 files have the same name, append directory name after the filename.
+  (uniquify-after-kill-buffer-p t)
+  (uniquify-buffer-name-style 'post-forward)
+  (uniquify-strip-common-suffix t)
+
   :config
   (tool-bar-mode -1)                    ; Hide toolbar.
   (if (display-graphic-p)
@@ -69,16 +75,6 @@
   (after-init . doom-modeline-mode)
   )
 
-;; If 2 files have the same name, append directory name after the filename.
-(use-package uniquify
-  :ensure nil                           ; Builtin.
-
-  :custom
-  (uniquify-after-kill-buffer-p t)
-  (uniquify-buffer-name-style 'post-forward)
-  (uniquify-strip-common-suffix t)
-  )
-
 ;; Show line numbers on the left side of the buffer.
 (use-package display-line-numbers
   :if (>= emacs-major-version 26)
diff --git a/init.d/basics/buffers.el b/init.d/basics/buffers.el
index 5a69aae..85b50c0 100644
--- a/init.d/basics/buffers.el
+++ b/init.d/basics/buffers.el
@@ -1,6 +1,6 @@
 ;;; buffers.el --- Default settings for buffers. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2020-01-25T00:27:35+0100>
+;; Time-stamp: <2020-01-27T02:35:31+0100>
 
 ;;; Commentary:
 ;; * Setup scratch buffer.
@@ -50,7 +50,6 @@
 ;; Delete old buffers.
 ;; https://www.emacswiki.org/emacs/CleanBufferList
 (use-package midnight
-  :ensure nil                           ; Builtin.
   :defer 10
 
   :init
diff --git a/init.d/programming/c++.el b/init.d/programming/c++.el
index 1388627..78af8e4 100644
--- a/init.d/programming/c++.el
+++ b/init.d/programming/c++.el
@@ -1,6 +1,6 @@
 ;;; c++.el --- C++ settings. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2020-01-26T06:58:53+0100>
+;; Time-stamp: <2020-01-27T02:35:00+0100>
 
 ;;; Commentary:
 
@@ -57,8 +57,6 @@
 
 ;; Set coding style.
 (use-package cc-mode
-  :ensure nil                           ; Builtin.
-
   :config
   (c-add-style                          ; Construct own coding style definition.
    "tastytea"
diff --git a/init.d/programming/common.el b/init.d/programming/common.el
index c72419a..74bc475 100644
--- a/init.d/programming/common.el
+++ b/init.d/programming/common.el
@@ -1,6 +1,6 @@
 ;;; common.el --- Common programming settings. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2020-01-27T02:09:18+0100>
+;; Time-stamp: <2020-01-27T02:32:14+0100>
 
 ;;; Commentary:
 
@@ -235,9 +235,7 @@
   (editorconfig-mode 1)
   )
 
-(use-package smerge
-  :ensure nil                           ; Builtin.
-
+(use-package smerge-mode
   :defines (smerge-mode-map)
 
   :bind
diff --git a/init.d/text/common.el b/init.d/text/common.el
index 65f7466..14aeda6 100644
--- a/init.d/text/common.el
+++ b/init.d/text/common.el
@@ -1,6 +1,6 @@
 ;;; common.el --- Common settings for text files. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2020-01-27T02:00:27+0100>
+;; Time-stamp: <2020-01-27T02:39:04+0100>
 
 ;;; Commentary:
 
@@ -18,22 +18,22 @@
   (truncate-line t)                    ; No continuation lines.
   (truncate-lines t)                   ; The same?
 
+  :bind
+  ("C-r" . jump-to-register)            ; Move point to location in register.
+  ("C-S-r" . point-to-register)         ; Store location of point in register.
+
   :hook
   (text-mode . auto-fill-mode)          ; Enable word-wrapping at fill-column.
   )
 
 ;; Save cursor position.
 (use-package saveplace
-  :ensure nil                           ; Builtin.
-
   :config
   (save-place-mode t)
   )
 
 ;; Ruler with fill-column marker.
 (use-package ruler-mode
-  :ensure nil                           ; Builtin.
-
   :config
   (defun my/ruler-on ()
     "Turn `ruler-mode' on."
@@ -290,14 +290,6 @@
   (whitespace-space ((nil :foreground "gray18")))
   )
 
-(use-package register
-  :ensure nil                           ; Builtin.
-
-  :bind
-  ("C-r" . jump-to-register)            ; Move point to location in register.
-  ("C-S-r" . point-to-register)         ; Store location of point in register.
-  )
-
 (use-package ripgrep)
 
 (provide 'text/common)
diff --git a/server/server b/server/server
index a1a56dd..e594166 100644
--- a/server/server
+++ b/server/server
@@ -1,2 +1,2 @@
-127.0.0.1:51313 30672
+127.0.0.1:51313 10169
 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh
\ No newline at end of file