From b0c80b14be706b836789447e8f4bf17645705ee3 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Sun, 29 Nov 2020 13:41:14 +0100
Subject: [PATCH] Emacs: Server: Move conditions into use-package block.

---
 init.d/net/server.el | 59 ++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/init.d/net/server.el b/init.d/net/server.el
index 9b1315f..ead4076 100644
--- a/init.d/net/server.el
+++ b/init.d/net/server.el
@@ -1,6 +1,6 @@
 ;;; server.el --- Set up network stuff.. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2020-11-29T10:32:03+0100>
+;; Time-stamp: <2020-11-29T13:41:06+0100>
 
 ;;; Commentary:
 
@@ -37,36 +37,37 @@
 ;; - Our EUID is not 0,
 ;; - We are not logged in via SSH,
 ;; - It is not already running.
-(when (not (or (equal (user-real-uid) 0)
+(use-package server
+  :straight (:type built-in)
+  :defer 2
+  :if (not (or (equal (user-real-uid) 0)
                (getenv "SSH_CONNECTION")))
-  (use-package server
-    :defer 2
-    :functions (server-running-p)
-    :init (setq
-           server-use-tcp t
-           server-port 51313
-           server-auth-key ; 64 chars, saved in ~/.emacs.d/server/server.
-           "phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh")
-    :config (unless (eq (server-running-p) t)
-              (server-start)))
+  :functions (server-running-p)
+  :init (setq
+         server-use-tcp t
+         server-port 51313
+         server-auth-key ; 64 chars, saved in ~/.emacs.d/server/server.
+         "phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh")
+  :config (unless (eq (server-running-p) t)
+            (server-start)))
 
-  ;; Server for Firefox-extension that allows to use Emacs to edit textareas.
-  ;; https://addons.mozilla.org/en-US/firefox/addon/ghosttext/
-  (use-package atomic-chrome
-    :defer 2
-    :if (or (executable-find "firefox")
-            (executable-find "firefox-bin"))
-    :config (atomic-chrome-start-server)
-    ;; “url” is actually the hostname.
-    :custom ((atomic-chrome-url-major-mode-alist
-              '(("^likeable\\.space$" . markdown-mode)
-                ("^schlomp\\.space$" . gfm-mode)
-                ("^wiki\\.gentoo\\.org$" . mediawiki-mode)
-                ("^github\\.com$" . gfm-mode)
-                ("^gitlab\\.com$" . gfm-mode)
-                ("^gitlab\\.gnome\\.org$" . gfm-mode)))
-             (atomic-chrome-buffer-open-style 'frame))
-    :hook (atomic-chrome-edit-mode . (lambda () (set-fill-column 400)))))
+;; Server for Firefox-extension that allows to use Emacs to edit textareas.
+;; https://addons.mozilla.org/en-US/firefox/addon/ghosttext/
+(use-package atomic-chrome
+  :defer 2
+  :if (or (executable-find "firefox")
+          (executable-find "firefox-bin"))
+  :config (atomic-chrome-start-server)
+  ;; “url” is actually the hostname.
+  :custom ((atomic-chrome-url-major-mode-alist
+            '(("^likeable\\.space$" . markdown-mode)
+              ("^schlomp\\.space$" . gfm-mode)
+              ("^wiki\\.gentoo\\.org$" . mediawiki-mode)
+              ("^github\\.com$" . gfm-mode)
+              ("^gitlab\\.com$" . gfm-mode)
+              ("^gitlab\\.gnome\\.org$" . gfm-mode)))
+           (atomic-chrome-buffer-open-style 'frame))
+  :hook (atomic-chrome-edit-mode . (lambda () (set-fill-column 400))))
 
 (provide 'net/server)
 ;;; server.el ends here