fix up emacs

.gitignore

@@ -9,4 +9,5 @@ emacs/.emacs.d/undo
 emacs/.emacs.d/recentf
 emacs/.emacs.d/custom.el
 emacs/.emacs.d/local.el
+emacs/.emacs.d/abbrev_defs
 gtk/.config/gtk-3.0/bookmarks

emacs/.emacs.d/init.el

@@ -54,7 +54,7 @@
 (setq-default tab-width 2)                    ; 2-space tabs
 (setq-default fill-column 80)                 ; 80 character line width
 (save-place-mode 1)                           ; save cursor location in files
-(global-linum-mode t)                         ; show line numbers in left column
+(global-display-line-numbers-mode)            ; show line numbers in left column
 (electric-indent-mode 1)                      ; smart auto-indent
 (setq-default electric-indent-inhibit t)      ;  ... disable indenting previous line (WHY?!)
 (setq-default truncate-lines 1)               ; no line wrapping
@@ -92,6 +92,7 @@
 (unless (file-directory-p (concat user-emacs-directory "autosave"))
   (make-directory (concat user-emacs-directory "autosave")))
 (setq save-place-file (concat user-emacs-directory "places"))
+(setq abbrev-file-name (concat user-emacs-directory "abbrev_defs"))
 (setq backup-directory-alist `((".*" . ,(concat user-emacs-directory "backups"))))
 (setq tramp-backup-directory-alist `((".*" . ,(concat user-emacs-directory "backups"))))
 (setq auto-save-file-name-transforms `((".*" ,(concat user-emacs-directory "autosave/") t)))
@@ -117,8 +118,8 @@
 ; replace buffer menu with ibuffer
 (global-set-key (kbd "C-x C-b") #'ibuffer)
 
-; disable bold/italic fonts on linux (bitmapped fonts)
-(cond ((string-equal system-type "gnu/linux") (progn
+; disable bold bonts on everything except OSX
+(cond ((not (string-equal system-type "darwin")) (progn
   (defun remap-faces-default-attributes ()
     (let ((family (face-attribute 'default :family))
           (height (face-attribute 'default :height)))
@@ -164,7 +165,14 @@
   :ensure t
   :config
   (if (not (display-graphic-p)) (progn (setq linum-format "%d ")))
-  :init (load-theme 'zenburn t))
+  :init
+  (load-theme 'zenburn t)
+  ; disable bold bonts on everything except OSX
+  (cond ((not (string-equal system-type "darwin")) (progn
+    (mapc (lambda (face)
+            (when face
+            (set-face-bold-p face nil)))
+      (face-list))))))
 
 ; evil mode
 (use-package evil
@@ -298,7 +306,8 @@
   :ensure t
   :config
   (setq which-key-idle-delay 0.5)
-  (cond ((string-equal system-type "gnu/linux") (progn
+  ; disable bold bonts on everything except OSX
+  (cond ((not (string-equal system-type "darwin")) (progn
     (set-face-attribute 'which-key-key-face nil :inherit font-lock-function-name-face)
     (set-face-attribute 'which-key-note-face nil :inherit font-lock-comment-face :slant 'normal))))
   (which-key-mode +1))

x11/.Xresources

@@ -49,7 +49,7 @@ XTerm*on2Clicks              : word
 XTerm*on3Clicks              : line
 XTerm*VT100*Translations     : #override Shift <Btn1Up>: exec-formatted("browser '%t'", PRIMARY)
 
-! for ncurses apps that don't play well with themes
+! for ncurses apps that dont play well with themes
 ncurses*termName               : xterm-256color
 ncurses*vt100.metaSendsEscape  : true
 ncurses*vt100.scrollBar        : false
@@ -65,7 +65,8 @@ ncurses*allowBoldFonts         : false
 ncurses*background             : black
 ncurses*foreground             : white
 
-Emacs.fontBackend: xft
-Emacs*popup*font: Sans-9
-Emacs*menubar*font: Sans-9
-Emacs*dialog*font: Sans-9
+Emacs*FontBackend: x
+Emacs*pane*menubar.font: fixed-10:style=semicondensed
+Emacs*menu*font: fixed-10:style=semicondensed
+Emacs*popup*font: fixed-10:style=semicondensed
+Emacs*dialog*font: fixed-10:style=semicondensed