X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=emacs.el;h=ac9782cf6007716999ea316f2408c349208a511f;hp=bf6da94103435024c8e7c21278f3d8242868ee6e;hb=ddf333570e530f70377b80ebe82c3019cd8a8547;hpb=fc2642e34fec0d82c0d8ce6d6bc9e6859fadac7e
diff --git a/emacs.el b/emacs.el
index bf6da94..ac9782c 100644
--- a/emacs.el
+++ b/emacs.el
@@ -31,12 +31,13 @@
;; Xft.antialias: true
;; Xft.rgba: rgb
-;; (set-default-font "Bitstream vera sans mono-12")
+;; (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()
@@ -337,6 +340,7 @@ load-warning buffer in case of failure."
(flyspell-mode))))
(add-hook 'c++-mode-hook 'flyspell-prog-mode)
+(add-hook 'lua-mode-hook 'flyspell-prog-mode)
(add-hook 'log-edit-mode-hook 'flyspell-mode)
;; I am a power-user
@@ -383,14 +387,6 @@ load-warning buffer in case of failure."
;; "tool" bar? Are you kidding?
(when (fboundp 'tool-bar-mode) (tool-bar-mode -1))
-;; ;; If my own letter icon is here, use it and change its color
-;; (when (file-exists-p "~/local/share/emacs/letter.xbm")
-;; (setq-default display-time-mail-icon
-;; (find-image
-;; '((:type xbm
-;; :file "~/local/share/emacs/letter.xbm"
-;; :ascent center)))))
-
;; My funky setting of face colors. Basically, we switch to a sober
;; look and darken a bit the colors which need to (because of the
;; darker background)
@@ -405,76 +401,11 @@ 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)
(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 +451,74 @@ 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/mail-alarm-face :foreground "white" :background "red2")
+ (ff/date-info-face :foreground "white")
+ (ff/battery-info-face :foreground "black")
+ (ff/battery-info-alarm-face :foreground "red")
+ ;; (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 "black")
+ (ff/battery-info-alarm-face :foreground "red")
+ ;; (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")
@@ -608,13 +600,6 @@ load-warning buffer in case of failure."
;; Playing sounds
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; (defun ff/esd-sound (file)
-;; "Plays a sound with the Enlighted sound daemon."
-;; (interactive)
-;; (process-kill-without-query (start-process-shell-command "esdplay"
-;; nil
-;; "esdplay" file)))
-
(defun ff/alsa-sound (file)
"Plays a sound with ALSA."
(interactive)
@@ -854,7 +839,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 +853,54 @@ printer."
(error -1))
)
-(defun ff/temp-and-battery-info-string () (interactive)
+(defun ff/temp-info-string () (interactive)
(condition-case nil
- (concat
-
- ;; The temperature
+ ;; 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)
+ )
+ )
+ )
- (let ((temp (/
- (apply 'max (mapcar
- (lambda (f) (string-to-number (ff/file-first-line f)))
- ff/temperature-files))
- 1000)))
+ (error nil))
+ )
- (if (> temp 50)
- (let ((s (format "%dC " temp)))
- (if (> temp 70)
- (propertize s 'face 'font-lock-warning-face)
- s)
- )
+(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
+ (let ((p (ff/battery-percent)))
+ (if (> p 10)
+ (propertize (format "â%d%%" p) 'face 'ff/battery-info-face)
+ (propertize (format "â%d%%" p) 'face 'ff/battery-info-alarm-face))
)
)
- ;; 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"))
-
- )
+ (`discharging
+ (let ((p (ff/battery-percent)))
+ (if (> p 10)
+ (propertize (format "â%d%%" p) 'face 'ff/battery-info-face)
+ (propertize (format "â%d%%" p) 'face 'ff/battery-info-alarm-face))
+ )
+ )
+ ;; (`unknown "â±")
+ (`unknown "F")
+ (_ "?"))
(error nil))
)
@@ -918,14 +925,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)
@@ -941,52 +948,41 @@ printer."
(set-buffer-modified-p nil)
))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Make a sound when there is new mail
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; I do not like sounds anymore
-
-;; (setq ff/already-boinged-for-mail nil)
-
-;; (defun ff/boing-if-new-mail ()
-;; (if mail (when (not ff/already-boinged-for-mail)
-;; ;; (ff/play-sound-async "~/local/sounds/boing1.wav")
-;; ;; (ff/show-unspooled-mails)
-;; (setq ff/already-boinged-for-mail t))
-;; (setq ff/already-boinged-for-mail nil))
-;; )
-
-;; (add-hook 'display-time-hook 'ff/boing-if-new-mail)
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Display time
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(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) " "))
+ " "
- (propertize (concat 24-hours ":" minutes
- " "
- dayname " "
- monthname " "
- day)
- 'face 'ff/date-info-face)
+ ,@(when (ff/temp-info-string)
+ '((ff/temp-info-string)))
- load
+ ,@(when (ff/battery-info-string)
+ '((ff/battery-info-string)))
+
+ ;; '((propertize
+ ;; (ff/battery-info-string)
+ ;; 'face 'ff/battery-info-face)))
+
+ " "
+
+ (propertize
+ (concat ;;" Ë"
+ 24-hours ":" minutes
+ " "
+ ;; dayname " "
+ monthname " " day
+ ;;"Ë"
+ )
+ 'face 'ff/date-info-face)
)
@@ -1706,7 +1702,7 @@ int main(int argc, char **argv) {
-