From 8e87db6a9b9f893f8ea039b5dd788aa747e26ad0 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 10 Aug 2015 22:28:35 +0200
Subject: [PATCH] Move window-init from core-ui.el to init.el

---
 core/core-ui.el | 14 ++------------
 core/core.el    |  5 +++++
 init.el         | 13 ++++++++-----
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/core/core-ui.el b/core/core-ui.el
index a237070a4..26abbbbd6 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -1,15 +1,10 @@
 ;;; core-ui.el --- interface settings
 ;; see lib/ui-defuns.el
 
-(load-theme (if window-system narf-default-theme narf-term-theme) t)
 (when window-system
-  (set-frame-font (apply #'font-spec narf-default-font))
-  (scroll-bar-mode -1)        ; no scrollbar
-  (tool-bar-mode -1)          ; no toolbar
-  (menu-bar-mode -1)          ; no menubar
-  (set-frame-parameter nil 'fullscreen 'fullboth)
   (fringe-mode '(2 . 8))
-  (setq frame-title-format '(buffer-file-name "%f" ("%b"))))
+  ;; (setq frame-title-format '(buffer-file-name "%f" ("%b")))
+  )
 
 (setq show-paren-delay 0)
 
@@ -33,11 +28,6 @@
  indicate-empty-lines            nil
  fringes-outside-margins         t)     ; fringes on the other side of line numbers
 
-(add-hook! after-init
-  (defadvice save-buffers-kill-emacs (around no-query-kill-emacs activate)
-    "Prevent annoying \"Active processes exist\" query when you quit Emacs."
-    (flet ((process-list ())) ad-do-it)))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (use-package nlinum ; line numbers
diff --git a/core/core.el b/core/core.el
index 16791bb95..893fa48ae 100644
--- a/core/core.el
+++ b/core/core.el
@@ -179,5 +179,10 @@
   (unless (server-running-p)
     (server-start)))
 
+(add-hook! after-init
+  (defadvice save-buffers-kill-emacs (around no-query-kill-emacs activate)
+    "Prevent annoying \"Active processes exist\" query when you quit Emacs."
+    (flet ((process-list ())) ad-do-it)))
+
 (provide 'core)
 ;;; core.el ends here
diff --git a/init.el b/init.el
index 055ee417e..868cbd2a7 100644
--- a/init.el
+++ b/init.el
@@ -42,12 +42,15 @@
 
 (defconst narf-debug-mode nil)
 
-(defconst narf-default-theme  'narf-dark)
-(defconst narf-term-theme     'wombat)
-(defconst narf-default-font  '(:family "terminus (ttf)" :size 12 :antialias nil))
-(defconst narf-big-font      '(:family "Inconsolata" :size 18 :antialias t))
+(scroll-bar-mode -1)        ; no scrollbar
+(tool-bar-mode -1)          ; no toolbar
+(menu-bar-mode -1)          ; no menubar
+
+(set-frame-font (font-spec :family "terminus (ttf)" :size 12 :antialias nil))
+(set-frame-parameter nil 'fullscreen 'fullboth)
 
 (load (concat user-emacs-directory "init-load-path.el"))
+(load-theme (if window-system 'narf-dark 'wombat) t)
 (mapc 'require
       `(;; benchmark ; records load times in `require-times'; see `list-times'
         core ; core/core.el
@@ -79,7 +82,7 @@
         module-elisp         ;
         module-lua           ; one-based indices? one-based indices.
         module-lb6           ; LaunchBar 6 development
-        module-org           ; for fearless [organized] leader
+        ;; module-org        ; for fearless [organized] leader
         module-php           ; making php less painful to work with
         module-python        ; beautiful is better than ugly
         module-regex         ; /^[^\s](meaning)[^\n]*/