Merge branch 'master' of gitlab.com:marcus-kammer/emacs.d

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "bundle/linum-relative"]
 	path = bundle/linum-relative
 	url = https://github.com/coldnew/linum-relative.git
+[submodule "bundle/markdown-mode"]
+	path = bundle/markdown-mode
+	url = https://github.com/jrblevin/markdown-mode.git

bundle/darwin-customs.el

@@ -1,4 +1,4 @@
-(if (eq system-type 'darwin)
+(when (eq system-type 'darwin)
     (add-to-list 'default-frame-alist '(font . "Hack Nerd Font Mono-13"))
     (add-to-list 'default-frame-alist '(height . 100))
     (add-to-list 'default-frame-alist '(width . 80))

bundle/markdown-mode

@@ -0,0 +1 @@
+Subproject commit 115f77df9755c6a453f3e5d9623ff885d207ea82

bundle/windows-customs.el

@@ -1,5 +1,9 @@
-(if (eq system-type 'windows-nt)
-    (add-to-list 'default-frame-alist '(font . "Hack NF-10:bold"))
-    (add-to-list 'default-frame-alist '(height . 60))
-    (add-to-list 'default-frame-alist '(width . 80)))
+(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)
+      ))
 (provide 'windows-customs)

init.el

@@ -12,7 +12,16 @@
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
    (quote
-    ("4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))))
+    ("4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default)))
+ '(display-time-world-list
+   (quote
+    (
+     ("UTC+7" "San Francisco")
+     ("UTC+4" "New York")
+     ("UTC-1" "London")
+     ("UTC-2" "Central Europe")
+     ("UTC-9" "Tokyo")
+     ))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -23,21 +32,57 @@
 (add-to-list 'custom-theme-load-path (expand-file-name "~/.emacs.d/bundle/nord-theme/"))
 (load-theme 'nord t)
 
+;; 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"))
+
+;; required packages
 (require 'rst)
 (require 'fill-column-indicator)
-(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/linum-relative"))
 (require 'linum-relative)
-(setq linum-relative-backend 'display-line-numbers-mode)
+(require 'markdown-mode)
 
-(menu-bar-mode -1)
-(tool-bar-mode -1)
-(scroll-bar-mode -1)
-(blink-cursor-mode -1)
+;; configurations
+(setq-default fill-column 72)
 (setq visible-bell 1)
+(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)
+
+;; set modes
+(line-number-mode 1)
+(column-number-mode 1)
+(display-time-mode 1)
+(display-battery-mode 1)
+(blink-cursor-mode -1)
+
+;; UTF-8 FTW
+(set-terminal-coding-system 'utf-8)
+(set-keyboard-coding-system 'utf-8)
 (prefer-coding-system 'utf-8)
 (display-battery-mode 1)
 (display-time-mode 1)
 
-(require 'windows-customs)
+;; nuke trailing whitespace when writing to a file
+(add-hook 'write-file-hooks 'delete-trailing-whitespace)
+
+;; I got sick of typing "yes"
+(defalias 'yes-or-no-p 'y-or-n-p)
+
+;; Turn off chrome
+(dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode))
+  (when (fboundp mode) (funcall mode -1)))
+
+;; start a server, unless one is already running
+(when (require 'server nil t)
+  (unless (server-running-p)
+    (server-start)))
+
+;; always highlight syntax
+(global-font-lock-mode t)
+
+;; custom packages
 (require 'darwin-customs)
+(require 'windows-customs)