X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=emacs.el;h=fa38ffd55a00a4be80779fd11ff60729a319e2aa;hb=f5316890bfd66584aa3d285d28b73cef836c39db;hp=bf6da94103435024c8e7c21278f3d8242868ee6e;hpb=fc2642e34fec0d82c0d8ce6d6bc9e6859fadac7e;p=elisp.git diff --git a/emacs.el b/emacs.el index bf6da94..fa38ffd 100644 --- a/emacs.el +++ b/emacs.el @@ -31,12 +31,13 @@ ;; Xft.antialias: true ;; Xft.rgba: rgb +(set-default-font "Inconsolata 15") + ;; (set-default-font "Bitstream vera sans mono-12") ;; (set-default-font "Liberation Mono-13") -(set-default-font "Inconsolata 15") -;;(set-default-font "DejaVu sans mono 11") -;;(set-default-font "Droid sans mono 13") -;;(set-default-font "Opensans 10") +;; (set-default-font "DejaVu sans mono 15") +;; (set-default-font "Droid sans mono 13") +;; (set-default-font "Opensans 10") (when (fboundp 'horizontal-scroll-bar-mode) (horizontal-scroll-bar-mode -1)) @@ -328,6 +329,8 @@ load-warning buffer in case of failure." ;; What modes for what file extentions (add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode)) +(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode)) + (require 'org-table) (add-to-list 'auto-mode-alist '("\\.txt\\'" . (lambda() @@ -405,68 +408,6 @@ load-warning buffer in case of failure." ;; Not the same in xterm (which is gray in my case) and in ;; X-window -(unless window-system - ;; (xterm-mouse-mode 1) - (ff/configure-faces - '((italic :underline nil) - (info-title-2 :foreground "green") - (font-lock-comment-delimiter-face :foreground "green") - (font-lock-comment-face :foreground "green") - (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold) - (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold) - (diff-added :background "gray90" :foreground "green4" :weight 'bold) - (diff-removed :background "gray90" :foreground "red2" :weight 'bold) - (diff-changed :background "gray90" :foreground "blue" :weight 'bold) - (diff-file-header-face :background "white" :foreground "black" - :weight 'bold) - (diff-header-face :background "white" :foreground "black") - (diff-hunk-header-face :background "white" :foreground "black") - (diff-indicator-removed :foreground "red" :weight 'bold) - (diff-removed :foreground "red" :weight 'bold) - (diff-indicator-added :foreground "blue" :weight 'bold) - (diff-added :foreground "blue" :weight 'bold) - (font-lock-string-face :foreground "green") - (font-lock-variable-name-face :foreground "blue") - (font-lock-constant-face :foreground "blue") - (font-lock-preprocessor-face :foreground "green") - (font-lock-function-name-face :foreground "cyan") - (flyspell-incorrect :foreground "red2") - (flyspell-duplicate :foreground "OrangeRed2") - (hl-line :background "white") - (sh-heredoc :foreground "black" :background "#fff0f0") - (sh-heredoc-face :foreground "black" :background "#fff0f0") - (font-lock-keyword-face :foreground "blue") - (highlight :background "darkseagreen3") - (isearch :background "orange" :foreground "black") - (isearch-lazy-highlight-face' :background "yellow" :foreground "black") - ;; (display-time-mail-face :background "white") - (show-paren-match-face :background "gold" :foreground "black") - (show-paren-mismatch-face :background "red" :foreground "black") - (trailing-whitespace :background "white") - (mode-line :background "cornflowerblue" :foreground "black" :box nil - :inverse-video nil) - (header-line :background "cornflowerblue" :foreground "black" :box nil - :inverse-video nil) - (mode-line-inactive :background "gray60" :foreground "black" :box nil - :inverse-video nil) - (region :background "white" :foreground "black") - (ff/date-info-face :foreground "white" :weight 'bold) - (ff/mail-alarm-face :foreground "red" :weight 'bold) - (selector/selection :background "yellow") - (gui-button-face :background "green" :foreground "white") - (enotes/information-face :foreground "cyan") - - (file-name-shadow :foreground "black") - (shadow :foreground "black") - (warning :foreground "black" :background "red") - )) - ) - -;; (list-colors-display (mapcar 'car color-name-rgb-alist)) - -;; (ff/configure-faces '((default :background "black" :foreground "gray80"))) -;; (ff/configure-faces '((default :background "gray80" :foreground "black"))) - (when window-system ;; (setq ;; display-time-use-mail-icon t) @@ -474,7 +415,6 @@ load-warning buffer in case of failure." (ff/configure-faces '( ;; (escape-glyph :foreground "#c0c0c0" :weight 'bold) - (escape-glyph :foreground "green3" :weight 'bold) (default :background "gray90" :foreground "black") (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold) @@ -520,13 +460,72 @@ load-warning buffer in case of failure." :inverse-video nil) ;; (fringe :background "black" :foreground "gray90") (fringe :background "gray80") - (ff/date-info-face :foreground "white" :weight 'bold) + (ff/date-info-face :foreground "white") + (ff/battery-info-face :foreground "white") (ff/mail-alarm-face :foreground "white" :background "red2") ;; (alarm-vc-face :foreground "black" :background "yellow" :weight 'normal) (gui-button-face :background "green" :foreground "black") )) ) +(unless window-system + ;; (xterm-mouse-mode 1) + (ff/configure-faces + '((italic :underline nil) + (info-title-2 :foreground "green") + (font-lock-comment-delimiter-face :foreground "green") + (font-lock-comment-face :foreground "green") + (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold) + (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold) + (diff-added :background "gray90" :foreground "green4" :weight 'bold) + (diff-removed :background "gray90" :foreground "red2" :weight 'bold) + (diff-changed :background "gray90" :foreground "blue" :weight 'bold) + (diff-file-header-face :background "white" :foreground "black" + :weight 'bold) + (diff-header-face :background "white" :foreground "black") + (diff-hunk-header-face :background "white" :foreground "black") + (diff-indicator-removed :foreground "red" :weight 'bold) + (diff-removed :foreground "red" :weight 'bold) + (diff-indicator-added :foreground "blue" :weight 'bold) + (diff-added :foreground "blue" :weight 'bold) + (font-lock-string-face :foreground "green") + (font-lock-variable-name-face :foreground "blue") + (font-lock-constant-face :foreground "blue") + (font-lock-preprocessor-face :foreground "green") + (font-lock-function-name-face :foreground "cyan") + (flyspell-incorrect :foreground "red2") + (flyspell-duplicate :foreground "OrangeRed2") + (hl-line :background "white") + (sh-heredoc :foreground "black" :background "#fff0f0") + (sh-heredoc-face :foreground "black" :background "#fff0f0") + (font-lock-keyword-face :foreground "blue") + (highlight :background "darkseagreen3") + (isearch :background "orange" :foreground "black") + (isearch-lazy-highlight-face' :background "yellow" :foreground "black") + ;; (display-time-mail-face :background "white") + (show-paren-match-face :background "gold" :foreground "black") + (show-paren-mismatch-face :background "red" :foreground "black") + (trailing-whitespace :background "white") + (mode-line :background "cornflowerblue" :foreground "black" :box nil + :inverse-video nil) + (header-line :background "cornflowerblue" :foreground "black" :box nil + :inverse-video nil) + (mode-line-inactive :background "gray60" :foreground "black" :box nil + :inverse-video nil) + (region :background "white" :foreground "black") + (ff/date-info-face :foreground "white" :weight 'bold) + (ff/battery-info-face :foreground "white") + (ff/mail-alarm-face :foreground "red" :weight 'bold) + (selector/selection :background "yellow") + (gui-button-face :background "green" :foreground "white") + (enotes/information-face :foreground "cyan") + + (file-name-shadow :foreground "black") + (shadow :foreground "black") + (warning :foreground "black" :background "red") + )) + ) + ;; When we are root, put the modeline in red (when (string= (user-real-login-name) "root") @@ -854,7 +853,11 @@ printer." (defun ff/sum-values-from-files (list-files prefix) (apply '+ (mapcar - (lambda (f) (string-to-number (ff/file-first-line (format "%s/%s" f prefix)))) + (lambda (f) + (condition-case nil + (string-to-number (ff/file-first-line (format "%s/%s" f prefix))) + (error 0)) + ) list-files))) (defun ff/battery-percent () @@ -864,36 +867,38 @@ printer." (error -1)) ) -(defun ff/temp-and-battery-info-string () (interactive) +(defun ff/temp-info-string () (interactive) (condition-case nil - (concat - - ;; The temperature - - (let ((temp (/ - (apply 'max (mapcar - (lambda (f) (string-to-number (ff/file-first-line f))) - ff/temperature-files)) - 1000))) - - (if (> temp 50) - (let ((s (format "%dC " temp))) - (if (> temp 70) - (propertize s 'face 'font-lock-warning-face) - s) - ) - ) - ) - - ;; The battery - - (pcase (ff/battery-state ff/battery-dirs) - (`charging (format "c%d%%" (ff/battery-percent))) - (`discharging (format "d%d%%" (ff/battery-percent))) - (code "f")) + ;; The temperature + + (let ((temp (/ + (apply 'max (mapcar + (lambda (f) (string-to-number (ff/file-first-line f))) + ff/temperature-files)) + 1000))) + + (if (> temp 50) + (let ((s (format "%dC " temp))) + (if (> temp 70) + (propertize s 'face 'font-lock-warning-face) + s) + ) + ) + ) - ) + (error nil)) + ) +(defun ff/battery-info-string () (interactive) + (condition-case nil + (pcase (ff/battery-state ff/battery-dirs) + ;; (`charging (format "c%d%%" (ff/battery-percent))) + ;; (`discharging (format "d%d%%" (ff/battery-percent))) + ;; (`unknown "f") + (`charging (format "â%d%%" (ff/battery-percent))) + (`discharging (format "â%d%%" (ff/battery-percent))) + (`unknown "â±") + (_ "?")) (error nil)) ) @@ -918,14 +923,14 @@ printer." (propertize (with-temp-buffer (apply 'call-process x) (buffer-string)) - 'face '(:background "#c0c0ff")) + 'face '(:background "#d0d0ff")) (with-temp-buffer (apply 'call-process x) (buffer-string)) )) ) '( - ("hostname" nil t nil "-v") + ("hostname" nil t nil "-f") ("acpi" nil t) ("df" nil t nil "-h") ;; ("mount" nil t) @@ -965,30 +970,32 @@ printer." (setq - display-time-interval 15 ;; Check every 15s + display-time-interval 10 ;; Check every 10s display-time-string-forms `( - ;; (if mail - ;; (concat " " - ;; (propertize " mail " - ;; 'face 'ff/mail-alarm-face) - ;; " ") - ;; ) + load " " - ,(if (ff/temp-and-battery-info-string) - '(concat (ff/temp-and-battery-info-string) " ")) + (ff/temp-info-string) - (propertize (concat 24-hours ":" minutes - " " - dayname " " - monthname " " - day) - 'face 'ff/date-info-face) + ,@(when (ff/battery-info-string) + '((propertize + (ff/battery-info-string) + 'face 'ff/battery-info-face))) - load + " " - ) + (propertize + (concat ;;" Ë" + 24-hours ":" minutes + " " + ;; dayname " " + monthname " " day + ;;"Ë" + ) + 'face 'ff/date-info-face) + + ) ;; display-time-format "%b %a %e %H:%M" ;; display-time-mail-face nil @@ -1706,7 +1713,7 @@ int main(int argc, char **argv) {