X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=emacs.el;h=0d565f14c3b14c4e417f04e44bbce7b8c56ffc0e;hb=afc6c7f7b111f1c31bc3707ff7aaf4ce11e50e2c;hp=eb01f9b68e030744ab17944ffb36943d9841fee1;hpb=7365475809e717d78377bf1c848b23d2681763ea;p=elisp.git

diff --git a/emacs.el b/emacs.el
index eb01f9b..0d565f1 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()
@@ -854,7 +857,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 ()
@@ -887,10 +894,17 @@ printer."
 
             ;; 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"))
+            (propertize
+             (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 "◉")
+               ;; (`unknown "⚡")
+               (_ "?"))
+             'face '(:foreground "#ffffe0"))
 
             )
 
@@ -918,14 +932,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)
@@ -976,6 +990,9 @@ printer."
                              ;;             " ")
                              ;;   )
 
+                             ,(if (ff/temp-and-battery-info-string)
+                                  '(concat (ff/temp-and-battery-info-string) " "))
+
                              (propertize (concat 24-hours ":" minutes
                                                  " "
                                                  dayname " "
@@ -985,9 +1002,6 @@ printer."
 
                              load
 
-                             ,(if (ff/temp-and-battery-info-string)
-                                  '(concat " " (ff/temp-and-battery-info-string)))
-
                              )
 
  ;; display-time-format "%b %a %e %H:%M"
@@ -1023,8 +1037,11 @@ printer."
 
 ;; (define-key global-map [?\C-x right] 'ff/next-buffer)
 ;; (define-key global-map [?\C-x left] 'ff/prev-buffer)
-(define-key global-map [?\M-\]] 'ff/next-buffer)
-(define-key global-map [?\M-\[] 'ff/prev-buffer)
+;; (define-key global-map [?\M-\]] 'ff/next-buffer)
+;; (define-key global-map [?\M-\[] 'ff/prev-buffer)
+
+(define-key global-map [(meta right)] 'ff/next-buffer)
+(define-key global-map [(meta left)] 'ff/prev-buffer)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; There is actually a decent terminal emulator in emacs!
@@ -1470,9 +1487,9 @@ universal argument starts xfig even if the .fig does not exist"
        (let ((start (condition-case nil (region-beginning) (error (point))))
              (end (condition-case nil (region-end) (error (point)))))
          (goto-char end)
-         (insert "---------------------------- snip snip -------------------------------\n")
+         (insert "----------------------------- snip snip -----------------------------\n")
          (goto-char start)
-         (insert "---------------------------- snip snip -------------------------------\n")
+         (insert "----------------------------- snip snip -----------------------------\n")
          ))
 
 (defun ff/start-latex ()
@@ -1481,7 +1498,7 @@ universal argument starts xfig even if the .fig does not exist"
   (goto-char (point-min))
   (insert "%% -*- mode: latex; mode: reftex; mode: flyspell; coding: utf-8; tex-command: \"pdflatex.sh\" -*-
 
-\\documentclass[12pt]{article}
+\\documentclass[12pt,a4paper,twoside]{article}
 \\usepackage[a4paper,top=2.5cm,bottom=2cm,left=2.5cm,right=2.5cm]{geometry}
 \\usepackage[utf8]{inputenc}
 \\usepackage{amsmath}
@@ -1703,7 +1720,7 @@ int main(int argc, char **argv) {
 <head>
 <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />
 <title></title>
-<style>
+<style type=\"text/css\">
 p {
  color:#009900;
 }
@@ -2199,19 +2216,19 @@ This may be a useful alternative binding for \\[delete-other-windows]
 ;; (define-key global-map [(control shift next)] 'previous-multiframe-window)
 
 ;; I have two screens sometime!
+;; (define-key global-map [(meta next)] 'other-frame)
+;; (define-key global-map [(meta prior)] (lambda () (interactive) (other-frame -1)))
 
-(define-key global-map [(meta next)] 'other-frame)
-(define-key global-map [(meta prior)] (lambda () (interactive) (other-frame -1)))
-
-(define-key global-map [(shift home)] 'delete-other-windows-vertically)
+;; (load "winner")
+(winner-mode 1)
+;; (define-key global-map [(shift backspace)] 'winner-undo)
 
+;; (define-key global-map [(shift home)] 'delete-other-windows-vertically)
 ;; (define-key global-map [(control +)] 'enlarge-window)
 ;; (define-key global-map [(control -)] 'shrink-window)
-
 ;; Goes to next/previous buffer
-
-(define-key global-map [(control prior)] 'ff/next-buffer)
-(define-key global-map [(control next)] 'ff/prev-buffer)
+;; (define-key global-map [(control prior)] 'ff/next-buffer)
+;; (define-key global-map [(control next)] 'ff/prev-buffer)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; If M-. on a symbol, show where it is defined in another window
@@ -2259,7 +2276,7 @@ next one. With universal argument, kill all killable buffers."
     (if (string-match ff/kill-this-buffer-and-delete-window-exceptions (buffer-name))
         (ff/next-buffer)
       (kill-this-buffer)))
-  ;; (unless (one-window-p t) (delete-window))
+  (unless (one-window-p t) (delete-window))
   )
 
 (define-key global-map [(control backspace)] 'ff/kill-this-buffer-and-delete-window)