Cullum Smith 2年前
コミット
cee6de662a
3個のファイルの変更21行の追加10行の削除
  1. 1
    0
      .gitignore
  2. 14
    5
      emacs/.emacs.d/init.el
  3. 6
    5
      x11/.Xresources

+ 1
- 0
.gitignore ファイルの表示

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

+ 14
- 5
emacs/.emacs.d/init.el ファイルの表示

@@ -54,7 +54,7 @@
54 54
 (setq-default tab-width 2)                    ; 2-space tabs
55 55
 (setq-default fill-column 80)                 ; 80 character line width
56 56
 (save-place-mode 1)                           ; save cursor location in files
57
-(global-linum-mode t)                         ; show line numbers in left column
57
+(global-display-line-numbers-mode)            ; show line numbers in left column
58 58
 (electric-indent-mode 1)                      ; smart auto-indent
59 59
 (setq-default electric-indent-inhibit t)      ;  ... disable indenting previous line (WHY?!)
60 60
 (setq-default truncate-lines 1)               ; no line wrapping
@@ -92,6 +92,7 @@
92 92
 (unless (file-directory-p (concat user-emacs-directory "autosave"))
93 93
   (make-directory (concat user-emacs-directory "autosave")))
94 94
 (setq save-place-file (concat user-emacs-directory "places"))
95
+(setq abbrev-file-name (concat user-emacs-directory "abbrev_defs"))
95 96
 (setq backup-directory-alist `((".*" . ,(concat user-emacs-directory "backups"))))
96 97
 (setq tramp-backup-directory-alist `((".*" . ,(concat user-emacs-directory "backups"))))
97 98
 (setq auto-save-file-name-transforms `((".*" ,(concat user-emacs-directory "autosave/") t)))
@@ -117,8 +118,8 @@
117 118
 ; replace buffer menu with ibuffer
118 119
 (global-set-key (kbd "C-x C-b") #'ibuffer)
119 120
 
120
-; disable bold/italic fonts on linux (bitmapped fonts)
121
-(cond ((string-equal system-type "gnu/linux") (progn
121
+; disable bold bonts on everything except OSX
122
+(cond ((not (string-equal system-type "darwin")) (progn
122 123
   (defun remap-faces-default-attributes ()
123 124
     (let ((family (face-attribute 'default :family))
124 125
           (height (face-attribute 'default :height)))
@@ -164,7 +165,14 @@
164 165
   :ensure t
165 166
   :config
166 167
   (if (not (display-graphic-p)) (progn (setq linum-format "%d ")))
167
-  :init (load-theme 'zenburn t))
168
+  :init
169
+  (load-theme 'zenburn t)
170
+  ; disable bold bonts on everything except OSX
171
+  (cond ((not (string-equal system-type "darwin")) (progn
172
+    (mapc (lambda (face)
173
+            (when face
174
+            (set-face-bold-p face nil)))
175
+      (face-list))))))
168 176
 
169 177
 ; evil mode
170 178
 (use-package evil
@@ -298,7 +306,8 @@
298 306
   :ensure t
299 307
   :config
300 308
   (setq which-key-idle-delay 0.5)
301
-  (cond ((string-equal system-type "gnu/linux") (progn
309
+  ; disable bold bonts on everything except OSX
310
+  (cond ((not (string-equal system-type "darwin")) (progn
302 311
     (set-face-attribute 'which-key-key-face nil :inherit font-lock-function-name-face)
303 312
     (set-face-attribute 'which-key-note-face nil :inherit font-lock-comment-face :slant 'normal))))
304 313
   (which-key-mode +1))

+ 6
- 5
x11/.Xresources ファイルの表示

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

読み込み中…
キャンセル
保存