diff --git a/bundle/windows-customs.el b/bundle/windows-customs.el index e7432995..6696d348 100644 --- a/bundle/windows-customs.el +++ b/bundle/windows-customs.el @@ -1,9 +1,6 @@ (when (eq system-type 'windows-nt) - (add-to-list 'default-frame-alist '(font . "Hack NF-12:bold")) - (add-to-list 'default-frame-alist '(height . 55)) - (add-to-list 'default-frame-alist '(width . 80)) (when (display-graphic-p) - ) - (unless (display-graphic-p) - )) + (add-to-list 'default-frame-alist '(font . "Hack NF-12:bold")) + (add-to-list 'default-frame-alist '(height . 55)) + (add-to-list 'default-frame-alist '(width . 80)))) (provide 'windows-customs) diff --git a/init.el b/init.el index 0ba68534..853e370d 100644 --- a/init.el +++ b/init.el @@ -38,13 +38,11 @@ ;; load paths (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle")) -(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/linum-relative")) -(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/markdown-mode")) +(autoload 'fill-column-indicator "~/.emacs.d/bundle/fill-column-indicator.el") +(autoload 'linum-relative "~/.emacs.d/bundle/linum-relative") +(autoload 'markdown-mode "~/.emacs.d/bundle/markdown-mode") ;; required packages -(require 'fill-column-indicator) -(require 'linum-relative) -(require 'markdown-mode) ;; configurations (setq-default indent-tabs-mode nil) @@ -53,7 +51,7 @@ (setq linum-relative-backend 'display-line-numbers-mode) (setq require-final-newline t) (setq font-lock-maximum-decoration t) -(setq inhibit-startup-screen t initial-buffer-choice t) +;;(setq inhibit-startup-screen t initial-buffer-choice t) ;; set modes (line-number-mode -1) @@ -64,12 +62,13 @@ (size-indication-mode -1) ;; UTF-8 FTW -;;(prefer-coding-system 'utf-8) -;;(set-keyboard-coding-system 'utf-8) -;;(set-terminal-coding-system 'utf-8) +(prefer-coding-system 'utf-8) +(set-keyboard-coding-system 'utf-8) +(set-terminal-coding-system 'utf-8) ;; nuke trailing whitespace when writing to a file (add-hook 'write-file-hooks 'delete-trailing-whitespace) +(add-hook 'org-mode-hook 'turn-on-font-lock) ;; I got sick of typing "yes" (defalias 'yes-or-no-p 'y-or-n-p)