diff --git a/emacs.d/10-settings.el b/emacs.d/10-settings.el
index 5253cd1..8dab61d 100644
--- a/emacs.d/10-settings.el
+++ b/emacs.d/10-settings.el
@@ -1,22 +1,25 @@
 (add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10:antialias=true"))
 
-(setq inhibit-startup-message t)        ; don't show welcome screen
-(setq require-final-newline t)          ; always append a newline to a
-					;   file, if it doesn't have one
-(setq font-lock-maximum-decoration t)   ; denotes my interest in maximum
-					;   possible fontification
-(setq inhibit-default-init t)           ; don't load default init
-(setq-default indent-tabs-mode nil)     ; spaces, no tabs
-(setq scroll-conservatively 10000)      ; scroll only one line
-(setq whitespace-style '(face trailing))
-
-(setq backup-directory-alist            ; backup file location
+(setq-default indent-tabs-mode nil)   ; spaces, no tabs
+(setq inhibit-startup-message t       ; don't show welcome screen
+      require-final-newline t         ; always append a newline to a
+                                        ; file, if it doesn't have one
+      font-lock-maximum-decoration t  ; denotes my interest in maximum
+                                        ; possible fontification
+      inhibit-default-init t            ; don't load default init
+      scroll-conservatively 10000       ; scroll only one line
+      whitespace-style '(face trailing)
+      backup-directory-alist            ; backup file location
       `((".*" .
-         ,temporary-file-directory)))
-(setq auto-save-file-name-transforms    ; autosave file location
+         ,temporary-file-directory))
+      auto-save-file-name-transforms    ; autosave file location
       `((".*" ,temporary-file-directory
          t)))
 
+(if (not window-system)
+    (setq linum-format "%d "))          ; add a space if we're in text
+                                        ; mode
+
 (fset 'yes-or-no-p 'y-or-n-p)           ; switch yes or no to y or n
 
 (tool-bar-mode -1)                      ; no toolbar