Update 2018-07-06

3 files changed, 17 insertions, 15 deletions

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index cf6169d..fd270d5 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -14,6 +14,7 @@
    ["#2e3436" "#a40000" "#4e9a06" "#c4a000"
     "#204a87" "#5c3566" "#729fcf" "#eeeeec"])
  '(column-number-mode t)
+ '(cua-mode t nil (cua-base))
  '(custom-enabled-themes (quote (tango)))
  '(scroll-bar-mode nil)
  '(show-paren-mode t)
@@ -25,27 +26,26 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(default ((t (:family "Space Mono"
-                        :foundry "CF  "
-                        :slant normal
-                        :weight normal
-                        :height 98
-                        :width normal))))
+ '(default ((t (:family "Latin Modern Mono" :foundry "UKWN"
+                :slant normal :weight normal :height 120 :width normal))))
  '(whitespace-space ((t (:foreground "gray")))))
 
 (cua-mode)
 (setq-default inhibit-splash-screen t)
 (setq-default fill-column 80)
 (add-hook 'prog-mode-hook 'ruler-mode)
+(setq-default indent-tabs-mode nil)
+(add-hook 'find-file-hook 'whitespace-mode)
+
 (add-hook 'scheme-mode-hook
           (lambda ()
             (require 'geiser)
+            (setq-default geiser-active-implementations '(guile racket))
             (setq-default geiser-repl-use-other-window nil)
             (setq-default geiser-repl-query-on-kill-p nil)))
 (add-hook 'python-mode-hook
           (lambda ()
             (setq fill-column 79)
             (setq comment-fill-column 72)))
-
-(setq-default indent-tabs-mode nil)
-(add-hook 'find-file-hook 'whitespace-mode)
+; The SBCL binary and command-line arguments
+(setq inferior-lisp-program "/usr/local/bin/sbcl --noinform")
diff --git a/meta/.Xresources b/meta/.Xresources
index 6efc901..0b74d52 100644
--- a/meta/.Xresources
+++ b/meta/.Xresources
@@ -16,9 +16,11 @@
 *color13:     #8f3f71
 *color14:     #427b58
 *color15:     #3c3836
+*loginShell:  true
+*scrollBar:   false
+*saveLines:   1024
+*cursorBlink: false
+*jumpScroll:  true
+URxvt.termName: rxvt
+URxvt.font:   xft:Latin Modern Mono:size=12
 UXTerm*faceName:    Space Mono:size=9.5
-UXTerm*loginShell:  true
-UXTerm*scrollBar:   false
-UXTerm*saveLines:   1024
-UXTerm*cursorBlink: false
-UXTerm*jumpScroll:  true
diff --git a/vim/.vim/gvimrc b/vim/.vim/gvimrc
index 3b5f569..dca5a8e 100755
--- a/vim/.vim/gvimrc
+++ b/vim/.vim/gvimrc
@@ -1,7 +1,7 @@
 runtime ftplugin/man.vim
 nmap K :Man <cword><CR>
 set number relativenumber lazyredraw
-set guifont=Space\ Mono\ 9.5
+set guifont=Latin\ Modern\ Mono\ 12
 set guioptions=Pc
 set guicursor+=a:blinkon0
 if has("patch-7.4.710")