diff options
| author | Alan Pearce | 2015-12-07 08:41:56 +0100 |
|---|---|---|
| committer | Alan Pearce | 2015-12-07 08:41:56 +0100 |
| commit | 6062344d20ae6a28f24cc0278d1b74d1a6e7d37a (patch) | |
| tree | fdc4e0b61445a6fae2941c900f47fde7f98ad60c | |
| parent | d575c29219d71338be4575bacb5711383455c2ed (diff) | |
| parent | 1efcbaeba314c7c737881499a0c21126928b29e6 (diff) | |
| download | nixfiles-6062344d20ae6a28f24cc0278d1b74d1a6e7d37a.tar.lz nixfiles-6062344d20ae6a28f24cc0278d1b74d1a6e7d37a.tar.zst nixfiles-6062344d20ae6a28f24cc0278d1b74d1a6e7d37a.zip | |
Merge branch 'master' of github.com:alanpearce/dotfiles
| -rw-r--r-- | tag-emacs/emacs.d/init.org | 13 | ||||
| -rw-r--r-- | tag-xresources/xresources/main | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index c4749599..00f06f53 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -141,11 +141,12 @@ it needs hooking into projectile and a key bound to switch between projects. #+BEGIN_SRC emacs-lisp (use-package perspective - :bind (("s-p" . persp-switch)) + :bind* ("s-p" . persp-switch) :init (progn (persp-mode))) - (use-package persp-projectile) + (use-package persp-projectile + :ensure nil) #+END_SRC ** vc @@ -249,6 +250,8 @@ lot of modes. #+BEGIN_SRC emacs-lisp (use-package solarized-theme :config (progn + (setq solarized-distinct-fringe-background t) + (setq solarized-high-contrast-mode-line t) (load-theme 'solarized-light t))) #+END_SRC @@ -304,10 +307,10 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource Allow font-lock-mode to do background parsing. I’m not really sure if these settings are particularly useful #+BEGIN_SRC emacs-lisp - (setq jit-lock-stealth-time 1 + (setq jit-lock-stealth-time nil jit-lock-stealth-load 100 - jit-lock-chunk-size 1000 - jit-lock-defer-time 0.01 + jit-lock-chunk-size 300 + jit-lock-defer-time nil font-lock-maximum-decoration '((dired-mode . 1) (t . t))) #+END_SRC diff --git a/tag-xresources/xresources/main b/tag-xresources/xresources/main index 82a58a5d..7c805bd4 100644 --- a/tag-xresources/xresources/main +++ b/tag-xresources/xresources/main @@ -28,6 +28,6 @@ Emacs.MenuBar: off Emacs.ScrollBars: off Emacs.CursorBlink: off -Emacs.Font: -*-Hack-normal-*-*-*-16-*-*-*-*-*-*-* -Emacs.fixed-pitch.attributeFont: -*-Hack-normal-*-*-*-16-*-*-*-*-*-*-* +Emacs.Font: -*-Fira Mono-normal-*-*-*-16-*-*-*-*-*-*-* +Emacs.fixed-pitch.attributeFont: -*-Fira Mono-normal-*-*-*-16-*-*-*-*-*-*-* Emacs.variable-pitch.attributeFont: -*-Fira Sans-medium-r-*-*-16-*-*-*-*-*-*-* |