Rewrote initfiles

init/core-ui.el

@@ -1,54 +1,55 @@
+;; User interface layout & behavior
 (provide 'core-ui)
 
+;;;; Load Theme ;;;;;;;;;;;;;;;;;;;;;;;;
+(when window-system
+  ;; No transparency!
+  (set-frame-parameter nil 'alpha 100)
+
+  (unless (member *default-font (font-family-list))
+    (error "Font %s isn't installed" *default-font))
+
+  (let ((font-str (concat *default-font "-" (number-to-string *default-font-size))))
+    (add-to-list 'default-frame-alist `(font . ,font-str))
+    (add-to-list 'initial-frame-alist `(font . ,font-str))))
+
+(add-to-list 'custom-theme-load-path my-themes-dir)
+(load-dark-theme)
+
+
 ;;;; GUI Settings ;;;;;;;;;;;;;;;;;;;;;;
-(setq ring-bell-function 'ignore)
-(add-to-list 'default-frame-alist `(font . ,*font))
-(add-to-list 'default-frame-alist '(alpha . 100))   ; *slightly* transparent window
-
-(when (functionp 'scroll-bar-mode) (scroll-bar-mode -1))    ; no scrollbar
-(when (functionp 'tool-bar-mode) (tool-bar-mode -1))        ; no toolbar
-(when (functionp 'menu-bar-mode) (menu-bar-mode -1))        ; no menubar
-(when (fboundp 'fringe-mode) (fringe-mode '(5 . 10)))       ; no nonsense
-
-(defun toggle-transparency ()
-  (interactive)
-  (let ((frame (selected-frame)))
-    (if (= (frame-parameter frame 'alpha) 0)
-        (set-frame-parameter frame 'alpha 100)
-      (set-frame-parameter frame 'alpha 0))))
-
-
-;;;; Other Settings ;;;;;;;;;;;;;;;;;;;;
-(blink-cursor-mode 1)       ; blink cursor
-(global-hl-line-mode -1)    ; highlight line
-(line-number-mode 1)        ; hide line no in modeline
-(column-number-mode 1)      ; hide col no in modeline
-(show-paren-mode -1)         ; highlight matching delimiters
-(setq show-paren-delay 0)
-
-(setq linum-format (quote "%4d "))
-;; (add-hook 'text-mode-hook 'linum-mode)
-;; (add-hook 'prog-mode-hook 'linum-mode)
-
-;; Show full path in window title
-(setq frame-title-format
-      '(:eval (if (buffer-file-name) (abbreviate-file-name (buffer-file-name)) "%b")))
+(tooltip-mode -1)
+(blink-cursor-mode 1)        ; blink cursor
+;; (global-hl-line-mode 1)   ; highlight line
 
 ;; Multiple cursors across buffers cause a strange redraw delay for
 ;; some things, like auto-complete or evil-mode's cursor color
 ;; switching.
 (setq-default cursor-in-non-selected-windows nil)
 
-;; do not soft-wrap lines
-(setq-default truncate-lines t)
-(setq truncate-partial-width-windows nil)
-(add-hook! 'help-mode-hook (setq truncate-lines nil))
-
-(setq ediff-window-setup-function 'ediff-setup-windows-plain)
-(setq indicate-buffer-boundaries nil)
-(setq indicate-empty-lines nil)
 (setq-default visible-bell nil)   ; silence of the bells
 (setq-default use-dialog-box nil) ; avoid GUI
+(setq-default redisplay-dont-pause t)
+
+;; do not soft-wrap lines
+(setq-default truncate-lines t)
+(setq-default truncate-partial-width-windows nil)
+(setq-default indicate-buffer-boundaries nil)
+(setq-default indicate-empty-lines nil)
+
+(when (functionp 'scroll-bar-mode) (scroll-bar-mode -1))    ; no scrollbar
+(when (functionp 'tool-bar-mode)   (tool-bar-mode -1))      ; no toolbar
+(when (functionp 'menu-bar-mode)   (menu-bar-mode -1))      ; no menubar
+(when (fboundp 'fringe-mode) (fringe-mode '(5 . 10)))       ; no nonsense
+
+(when window-system
+  (setq frame-title-format '(buffer-file-name "%f" ("%b")))
+  (tooltip-mode -1)
+  (blink-cursor-mode 1))
+
+;; Show full path in window title
+(setq frame-title-format
+      '(:eval (if (buffer-file-name) (abbreviate-file-name (buffer-file-name)) "%b")))
 
 
 ;;;; Modeline ;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -69,16 +70,16 @@
                      " Abbrev"
                      " WS"
                      " GitGutter"
-                     " Anzu"
                      " Undo-Tree"
-                     " AC"
                      " Projectile\\[.+\\]"
+                     " hs"
+                     " ElDoc"
                      ) "\\|"))
   :init
   (progn
     (setq sml/no-confirm-load-theme t
           sml/mode-width      'full
-          sml/extra-filler    2
+          sml/extra-filler    (if window-system 1 0)
           sml/show-remote     nil
           sml/modified-char   "*"
           sml/encoding-format nil)
@@ -86,7 +87,7 @@
     (setq sml/replacer-regexp-list '(("^~/Dropbox/Projects/" "PROJECTS:")
                                      ("^~/.emacs.d/" "EMACS.D:")))
 
-    (after evil (setq evil-mode-line-format nil))
+    (after "evil" (setq evil-mode-line-format nil))
 
     (setq-default mode-line-misc-info
       '((which-func-mode ("" which-func-format ""))
@@ -94,9 +95,8 @@
 
     (add-hook! 'after-change-major-mode-hook
                (setq mode-line-format
-                     '(" "
+                     '((if window-system " ")
                        "%e"
-                       ;; anzu--mode-line-format
                        mode-line-mule-info
                        mode-line-client
                        mode-line-remote