Merge branch 'master' of gitlab.com:chriscochrun/dotemacs
This commit is contained in:
commit
40442953c4
11
README.org
11
README.org
|
@ -72,7 +72,7 @@ Let's start by making some basic ui changes like turning off the scrollbar, tool
|
||||||
|
|
||||||
In order to have this config work on both my desktop with regular joe-schmoe monitors and my laptop with new-hotness HiDPI monitor, I will set the font size if my system is the laptop to much higher.
|
In order to have this config work on both my desktop with regular joe-schmoe monitors and my laptop with new-hotness HiDPI monitor, I will set the font size if my system is the laptop to much higher.
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(if (string-equal (system-name) "chris-linuxlaptop")
|
(if (string-equal (system-name) "syl")
|
||||||
(defvar chris/default-font-size 240)
|
(defvar chris/default-font-size 240)
|
||||||
(defvar chris/default-font-size 120))
|
(defvar chris/default-font-size 120))
|
||||||
|
|
||||||
|
@ -833,7 +833,7 @@ We are also going to make our config auto-tangle. This is so helpful on saving t
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(defun chris/org-babel-tangle-config ()
|
(defun chris/org-babel-tangle-config ()
|
||||||
(when (string-equal (buffer-file-name)
|
(when (string-equal (buffer-file-name)
|
||||||
(expand-file-name "~/.dotemacs/README.org"))
|
(expand-file-name "~/.emacs.d/README.org"))
|
||||||
(let ((org-confirm-babel-evaluate nil))
|
(let ((org-confirm-babel-evaluate nil))
|
||||||
(org-babel-tangle))))
|
(org-babel-tangle))))
|
||||||
|
|
||||||
|
@ -1227,6 +1227,11 @@ If on a:
|
||||||
(:from . 22)
|
(:from . 22)
|
||||||
(:subject)))
|
(:subject)))
|
||||||
|
|
||||||
|
(setq mu4e-view-actions
|
||||||
|
'(("capture message" . mu4e-action-capture-message)
|
||||||
|
("view in browser" . mu4e-action-view-in-browser)
|
||||||
|
("show this thread" . mu4e-action-show-thread)))
|
||||||
|
|
||||||
(defun chris/setup-mu4e-headers ()
|
(defun chris/setup-mu4e-headers ()
|
||||||
(toggle-truncate-lines +1)
|
(toggle-truncate-lines +1)
|
||||||
(display-line-numbers-mode -1))
|
(display-line-numbers-mode -1))
|
||||||
|
@ -1358,7 +1363,7 @@ Let's add our own eshell prompt. and set the password cache to a significantly h
|
||||||
(lambda nil
|
(lambda nil
|
||||||
(let ((path (abbreviate-file-name (eshell/pwd))))
|
(let ((path (abbreviate-file-name (eshell/pwd))))
|
||||||
(concat
|
(concat
|
||||||
(if (or (string= system-name "archdesktop") (string= system-name "chris-linuxlaptop"))
|
(if (or (string= system-name "archdesktop") (string= system-name "syl"))
|
||||||
nil
|
nil
|
||||||
(format
|
(format
|
||||||
(propertize "\n(%s@%s)" 'face '(:foreground "#606580"))
|
(propertize "\n(%s@%s)" 'face '(:foreground "#606580"))
|
||||||
|
|
11
init.el
11
init.el
|
@ -18,7 +18,7 @@
|
||||||
(blink-cursor-mode -1)
|
(blink-cursor-mode -1)
|
||||||
(column-number-mode +1)
|
(column-number-mode +1)
|
||||||
|
|
||||||
(if (string-equal (system-name) "chris-linuxlaptop")
|
(if (string-equal (system-name) "syl")
|
||||||
(defvar chris/default-font-size 240)
|
(defvar chris/default-font-size 240)
|
||||||
(defvar chris/default-font-size 120))
|
(defvar chris/default-font-size 120))
|
||||||
|
|
||||||
|
@ -550,7 +550,7 @@ vertically."
|
||||||
|
|
||||||
(defun chris/org-babel-tangle-config ()
|
(defun chris/org-babel-tangle-config ()
|
||||||
(when (string-equal (buffer-file-name)
|
(when (string-equal (buffer-file-name)
|
||||||
(expand-file-name "~/.dotemacs/README.org"))
|
(expand-file-name "~/.emacs.d/README.org"))
|
||||||
(let ((org-confirm-babel-evaluate nil))
|
(let ((org-confirm-babel-evaluate nil))
|
||||||
(org-babel-tangle))))
|
(org-babel-tangle))))
|
||||||
|
|
||||||
|
@ -914,6 +914,11 @@ If on a:
|
||||||
(:from . 22)
|
(:from . 22)
|
||||||
(:subject)))
|
(:subject)))
|
||||||
|
|
||||||
|
(setq mu4e-view-actions
|
||||||
|
'(("capture message" . mu4e-action-capture-message)
|
||||||
|
("view in browser" . mu4e-action-view-in-browser)
|
||||||
|
("show this thread" . mu4e-action-show-thread)))
|
||||||
|
|
||||||
(defun chris/setup-mu4e-headers ()
|
(defun chris/setup-mu4e-headers ()
|
||||||
(toggle-truncate-lines +1)
|
(toggle-truncate-lines +1)
|
||||||
(display-line-numbers-mode -1))
|
(display-line-numbers-mode -1))
|
||||||
|
@ -1024,7 +1029,7 @@ If on a:
|
||||||
(lambda nil
|
(lambda nil
|
||||||
(let ((path (abbreviate-file-name (eshell/pwd))))
|
(let ((path (abbreviate-file-name (eshell/pwd))))
|
||||||
(concat
|
(concat
|
||||||
(if (or (string= system-name "archdesktop") (string= system-name "chris-linuxlaptop"))
|
(if (or (string= system-name "archdesktop") (string= system-name "syl"))
|
||||||
nil
|
nil
|
||||||
(format
|
(format
|
||||||
(propertize "\n(%s@%s)" 'face '(:foreground "#606580"))
|
(propertize "\n(%s@%s)" 'face '(:foreground "#606580"))
|
||||||
|
|
Loading…
Reference in a new issue