Initial commit

4 files changed, 429 insertions, 0 deletions

diff --git a/basic.el b/basic.el
new file mode 100644
index 0000000..e8c083d
--- /dev/null
+++ b/basic.el
@@ -0,0 +1,300 @@
+;;; disable some default modes
+
+(tool-bar-mode -1)
+(menu-bar-mode -1)
+(scroll-bar-mode -1)
+(blink-cursor-mode -1)
+
+;;; no title on the frame
+
+(setq frame-title-format ""
+      icon-title-format "")
+
+;;; echo quickly
+
+(setq echo-keystrokes 0.002)
+
+;;; Scroll conservatively please
+
+(setq scroll-conservatively 30)
+
+;;; don't make backup files
+
+(setq make-backup-files nil)
+
+;;; don't use a GUI dialog box as that is distracting to me
+
+(setq use-dialog-box nil)
+
+;;; don't make noise
+;;; and when two buffers have the same base name, include more parts to distinguish them
+
+(setq uniquify-buffer-name-style 'forward
+      ring-bell-function #'ignore
+      visible-bell nil)
+
+;;; mac specific settings
+
+(setq ns-right-alternate-modifier 'none
+      ns-pop-up-frames nil
+      ns-use-native-fullscreen nil
+      ns-use-proxy-icon nil)
+
+;;; where to find the C source code of Emacs.
+
+(setq find-function-C-source-directory "/Users/durand/w.emacs.d/emacs/src/")
+
+;;; frame parameters
+
+(setq initial-frame-alist
+      '((width . 118)))
+(set-frame-width nil 118)
+(add-to-list 'default-frame-alist '(width . 118))
+(add-to-list 'default-frame-alist '(font . "Droid Sans Mono for Powerline-20"))
+(add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
+(add-to-list 'default-frame-alist '(ns-appearance . dark))
+(add-to-list 'default-frame-alist '(fullscreen . maximized))
+(setq frame-resize-pixelwise t)
+(setq revert-without-query '(".*"))
+(set-face-attribute 'variable-pitch nil :family "Avenir" :height 1.0)
+
+;;; disable line numbers, as that is a performace killer for me.
+
+(setq-default display-line-numbers-type nil)
+(global-display-line-numbers-mode -1)
+
+;;; package dir
+
+(defvar package-dir "/Users/durand/elisp_packages/"
+  "The directory containing packages.")
+
+;;; fontification of extra keywords in emacs lisp files
+
+(require 'advice)
+
+(font-lock-add-keywords
+ 'emacs-lisp-mode
+ `(("^;;;###\\(autoload\\)[ \n]" (1 font-lock-warning-face t))
+   (emacs-lisp-highlight-vars-and-faces . emacs-lisp-face)
+   ("\\(\\(?:#'\\|['`]\\)\\)\\(?:[[:space:]]*\\(\\(?:\\sw\\|\\s_\\)+\\)\\)?"
+     (1 font-lock-keyword-face)
+     (2 font-lock-constant-face nil t))))
+
+;;;###autoload
+(defvar emacs-lisp-face nil
+  "The face used to highlight extra emacs lisp keywords.")
+
+;;;###autoload
+(defun emacs-lisp-highlight-vars-and-faces (end)
+  (catch 'matcher
+    (while (re-search-forward "\\(?:\\sw\\|\\s_\\)+" end t)
+      (let ((ppss (save-excursion (syntax-ppss))))
+        (cond ((nth 3 ppss)  ; strings
+               (search-forward "\"" end t))
+              ((nth 4 ppss)  ; comments
+               (forward-line +1))
+              ((let ((symbol (intern-soft (match-string-no-properties 0))))
+                 (and (cond ((null symbol) nil)
+                            ((eq symbol t) nil)
+                            ((keywordp symbol) nil)
+                            ((special-variable-p symbol)
+                             (setq emacs-lisp-face 'font-lock-variable-name-face))
+                            ((and (fboundp symbol)
+                                  (eq (char-before (match-beginning 0)) ?\()
+                                  (not (memq (char-before (1- (match-beginning 0)))
+                                             (list ?\' ?\`))))
+                             (let ((unaliased (indirect-function symbol)))
+                               (cond ((or (macrop unaliased)
+                                          (special-form-p unaliased))
+				      (setq emacs-lisp-face 'font-lock-keyword-face))
+				     (t
+				      (let (unadvised)
+					(while (not (eq (setq unadvised (ad-get-orig-definition unaliased))
+							(setq unaliased (indirect-function unadvised)))))
+					unaliased)
+				      (setq emacs-lisp-face
+					    (if (subrp unaliased)
+						'font-lock-constant-face
+					      'font-lock-function-name-face)))))))
+                      (throw 'matcher t)))))))
+    nil))
+
+;;; a better indentation
+
+(advice-add #'calculate-lisp-indent :override #'better-calculate-lisp-indent)
+
+;;;###autoload
+(defun better-calculate-lisp-indent (&optional parse-start)
+  "Add better indentation for quoted and backquoted lists."
+  ;; This line because `calculate-lisp-indent-last-sexp` was defined with `defvar` 
+  ;; with it's value ommited, marking it special and only defining it locally. So  
+  ;; if you don't have this, you'll get a void variable error.
+  (defvar calculate-lisp-indent-last-sexp)
+  (save-excursion
+    (beginning-of-line)
+    (let ((indent-point (point))
+          state
+          ;; setting this to a number inhibits calling hook
+          (desired-indent nil)
+          (retry t)
+          calculate-lisp-indent-last-sexp containing-sexp)
+      (cond ((or (markerp parse-start) (integerp parse-start))
+             (goto-char parse-start))
+            ((null parse-start) (beginning-of-defun))
+            (t (setq state parse-start)))
+      (unless state
+        ;; Find outermost containing sexp
+        (while (< (point) indent-point)
+          (setq state (parse-partial-sexp (point) indent-point 0))))
+      ;; Find innermost containing sexp
+      (while (and retry
+                  state
+                  (> (elt state 0) 0))
+        (setq retry nil)
+        (setq calculate-lisp-indent-last-sexp (elt state 2))
+        (setq containing-sexp (elt state 1))
+        ;; Position following last unclosed open.
+        (goto-char (1+ containing-sexp))
+        ;; Is there a complete sexp since then?
+        (if (and calculate-lisp-indent-last-sexp
+                 (> calculate-lisp-indent-last-sexp (point)))
+            ;; Yes, but is there a containing sexp after that?
+            (let ((peek (parse-partial-sexp calculate-lisp-indent-last-sexp
+                                            indent-point 0)))
+              (if (setq retry (car (cdr peek))) (setq state peek)))))
+      (if retry
+          nil
+        ;; Innermost containing sexp found
+        (goto-char (1+ containing-sexp))
+        (if (not calculate-lisp-indent-last-sexp)
+            ;; indent-point immediately follows open paren.
+            ;; Don't call hook.
+            (setq desired-indent (current-column))
+          ;; Find the start of first element of containing sexp.
+          (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
+          (cond ((looking-at "\\s(")
+                 ;; First element of containing sexp is a list.
+                 ;; Indent under that list.
+                 )
+                ((> (save-excursion (forward-line 1) (point))
+                    calculate-lisp-indent-last-sexp)
+                 ;; This is the first line to start within the containing sexp.
+                 ;; It's almost certainly a function call.
+                 (if (or
+                      ;; Containing sexp has nothing before this line
+                      ;; except the first element. Indent under that element.
+                      (= (point) calculate-lisp-indent-last-sexp)
+
+                      ;; First sexp after `containing-sexp' is a keyword. This
+                      ;; condition is more debatable. It's so that I can have
+                      ;; unquoted plists in macros. It assumes that you won't
+                      ;; make a function whose name is a keyword.
+                      ;; (when-let (char-after (char-after (1+ containing-sexp)))
+                      ;;   (char-equal char-after ?:))
+
+                      ;; Check for quotes or backquotes around.
+                      (let* ((positions (elt state 9))
+                             (last (car (last positions)))
+                             (rest (reverse (butlast positions)))
+                             (any-quoted-p nil)
+                             (point nil))
+                        (or
+                         (when-let (char (char-before last))
+                           (or (char-equal char ?')
+                               (char-equal char ?`)))
+                         (progn
+                           (while (and rest (not any-quoted-p))
+                             (setq point (pop rest))
+                             (setq any-quoted-p
+                                   (or
+                                    (when-let (char (char-before point))
+                                      (or (char-equal char ?')
+                                          (char-equal char ?`)))
+                                    (save-excursion
+                                      (goto-char (1+ point))
+                                      (looking-at-p
+                                       "\\(?:back\\)?quote[\t\n\f\s]+(")))))
+                           any-quoted-p))))
+                     ;; Containing sexp has nothing before this line
+                     ;; except the first element.  Indent under that element.
+                     nil
+                   ;; Skip the first element, find start of second (the first
+                   ;; argument of the function call) and indent under.
+                   (progn (forward-sexp 1)
+                          (parse-partial-sexp (point)
+                                              calculate-lisp-indent-last-sexp
+                                              0 t)))
+                 (backward-prefix-chars))
+                (t
+                 ;; Indent beneath first sexp on same line as
+                 ;; `calculate-lisp-indent-last-sexp'.  Again, it's
+                 ;; almost certainly a function call.
+                 (goto-char calculate-lisp-indent-last-sexp)
+                 (beginning-of-line)
+                 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp
+                                     0 t)
+                 (backward-prefix-chars)))))
+      ;; Point is at the point to indent under unless we are inside a string.
+      ;; Call indentation hook except when overridden by lisp-indent-offset
+      ;; or if the desired indentation has already been computed.
+      (let ((normal-indent (current-column)))
+        (cond ((elt state 3)
+               ;; Inside a string, don't change indentation.
+               nil)
+              ((and (integerp lisp-indent-offset) containing-sexp)
+               ;; Indent by constant offset
+               (goto-char containing-sexp)
+               (+ (current-column) lisp-indent-offset))
+              ;; in this case calculate-lisp-indent-last-sexp is not nil
+              (calculate-lisp-indent-last-sexp
+               (or
+                ;; try to align the parameters of a known function
+                (and lisp-indent-function
+                     (not retry)
+                     (funcall lisp-indent-function indent-point state))
+                ;; If the function has no special alignment
+                ;; or it does not apply to this argument,
+                ;; try to align a constant-symbol under the last
+                ;; preceding constant symbol, if there is such one of
+                ;; the last 2 preceding symbols, in the previous
+                ;; uncommented line.
+                (and (save-excursion
+                       (goto-char indent-point)
+                       (skip-chars-forward " \t")
+                       (looking-at ":"))
+                     ;; The last sexp may not be at the indentation
+                     ;; where it begins, so find that one, instead.
+                     (save-excursion
+                       (goto-char calculate-lisp-indent-last-sexp)
+                       ;; Handle prefix characters and whitespace
+                       ;; following an open paren.  (Bug#1012)
+                       (backward-prefix-chars)
+                       (while (not (or (looking-back "^[ \t]*\\|([ \t]+"
+                                                     (line-beginning-position))
+                                       (and containing-sexp
+                                            (>= (1+ containing-sexp) (point)))))
+                         (forward-sexp -1)
+                         (backward-prefix-chars))
+                       (setq calculate-lisp-indent-last-sexp (point)))
+                     (> calculate-lisp-indent-last-sexp
+                        (save-excursion
+                          (goto-char (1+ containing-sexp))
+                          (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
+                          (point)))
+                     (let ((parse-sexp-ignore-comments t)
+                           indent)
+                       (goto-char calculate-lisp-indent-last-sexp)
+                       (or (and (looking-at ":")
+                                (setq indent (current-column)))
+                           (and (< (line-beginning-position)
+                                   (prog2 (backward-sexp) (point)))
+                                (looking-at ":")
+                                (setq indent (current-column))))
+                       indent))
+                ;; another symbols or constants not preceded by a constant
+                ;; as defined above.
+                normal-indent))
+              ;; in this case calculate-lisp-indent-last-sexp is nil
+              (desired-indent)
+              (t
+               normal-indent))))))
diff --git a/init.el b/init.el
new file mode 100644
index 0000000..3e10d19
--- /dev/null
+++ b/init.el
@@ -0,0 +1,19 @@
+;;; macro to conveniently load files
+
+;;;###autoload
+(defvar load-file-directory (cond ((stringp load-file-name)
+				   (file-name-directory load-file-name))
+				  (t default-directory))
+  "The directory to load files")
+
+(defun load-config (file-name)
+  "Conviently load configuration files in the same directory as this file."
+  (load-file (expand-file-name file-name load-file-directory)))
+
+(load-config "basic.el")
+
+(load-config "theme.el")
+
+;; (load-config "modeline.el")
+
+
diff --git a/modeline.el b/modeline.el
new file mode 100644
index 0000000..a564a10
--- /dev/null
+++ b/modeline.el
@@ -0,0 +1,66 @@
+;;;###autoload
+(defun modeline-format-main ()
+  "The main mode line format."
+  (let ((left (modeline-format-left))
+	(right (modeline-format-right))
+	(left-len (length left))
+	(right-len (length right))
+	(middle (propertize " " 'display
+			    (make-string (- (window-width)
+					    left-len
+					    right-len)
+					 32))))
+    (concat left middle right)))
+
+;;;###autoload
+(defun modeline-format-left ()
+  "The left mode line format."
+  )
+
+;;;###autoload
+(defvar modeline-bar-width 3
+  "The width of the mode line bar")
+
+;;;###autoload
+(defvar modeline-bar-height 27
+  "The height of the mode line bar")
+
+;;;###autoload
+(defun modeline-format-bar ()
+  "We need a bar to ensure the mode line has the specified height."
+  (cond
+   ((and (display-graphic-p)
+         (image-type-available-p 'xpm))
+    (propertize
+     " " 'display
+     (let ((data (make-list modeline-bar-height
+			    (make-list modeline-bar-width 97)))
+	   (color (face-background 'modus-theme-active-blue nil t)))
+       (ignore-errors
+	 (create-image
+	  (concat
+	   "/* XPM */\nstatic char * bar[]={\n"
+	   (format "\"%d %d 1 1\",\n\"a c %s\",\n"
+		   modeline-bar-width modeline-bar-height
+		   color)
+	   (mapconcat
+	    (lambda (row)
+	      (format "\"%s\""
+		      (apply #'string row)))
+	    data ",\n")
+	   "\n};")
+	  'xpm t :ascent 'center)))))))
+
+;;;###autoload
+(defun modeline-format-right ()
+  "The right mode line format.")
+
+
+
+
+
+
+
+(setq mode-line-format '("%e" (:eval (modeline-format-main))))
+
+
diff --git a/theme.el b/theme.el
new file mode 100644
index 0000000..0428059
--- /dev/null
+++ b/theme.el
@@ -0,0 +1,44 @@
+;;; theme
+
+(setq modus-vivendi-theme-slanted-constructs t
+      modus-vivendi-theme-bold-constructs t
+      ;; modus-vivendi-theme-3d-modeline t
+      modus-vivendi-theme-mode-line '3d
+      modus-vivendi-theme-diffs nil
+      modus-vivendi-theme-completions nil
+      modus-vivendi-theme-org-blocks 'rainbow
+      modus-vivendi-theme-rainbow-org-src-blocks t
+      modus-vivendi-theme-variable-pitch-headings t
+      modus-vivendi-theme-headings '((t . rainbow))
+      ;; modus-vivendi-theme-rainbow-headings t
+      ;; modus-vivendi-theme-section-headings t
+      modus-vivendi-theme-scale-headings t
+      modus-vivendi-theme-scale-1 1.05
+      modus-vivendi-theme-scale-2 1.1
+      modus-vivendi-theme-scale-3 1.15
+      modus-vivendi-theme-scale-4 1.2
+      modus-vivendi-theme-scale-5 1.3)
+
+(setq modus-operandi-theme-slanted-constructs t
+      modus-operandi-theme-bold-constructs t
+      ;; modus-operandi-theme-3d-modeline t
+      modus-operandi-theme-mode-line '3d
+      modus-operandi-theme-diffs nil
+      modus-operandi-theme-completions nil
+      modus-operandi-theme-org-blocks 'rainbow
+      modus-operandi-theme-rainbow-org-src-blocks t
+      modus-operandi-theme-variable-pitch-headings t
+      modus-operandi-theme-headings '((t . rainbow))
+      ;; modus-operandi-theme-rainbow-headings t
+      ;; modus-operandi-theme-section-headings t
+      modus-operandi-theme-scale-headings t
+      modus-operandi-theme-scale-1 1.05
+      modus-operandi-theme-scale-2 1.1
+      modus-operandi-theme-scale-3 1.15
+      modus-operandi-theme-scale-4 1.2
+      modus-operandi-theme-scale-5 1.3)
+
+(add-to-list 'load-path (expand-file-name "protesilaos/modus-themes" package-dir))
+
+(require 'modus-vivendi-theme)
+(load-theme 'modus-vivendi t)