diff --git a/config.el b/config.el
index 83925a2..75362ac 100644
--- a/config.el
+++ b/config.el
@@ -61,6 +61,10 @@
(nginx-indent-level 2)
:config (add-to-list 'auto-mode-alist '("/nginx/sites-\\(?:available\\|enabled\\)/" . nginx-mode)))
+(defun manx/lisp-keys ()
+ (local-set-key (kbd "C-c e") 'slime-eval-defun)
+ (define-key slime-mode-indirect-map (kbd "C-c x") nil))
+
(use-package slime
:defer t
:custom
@@ -71,6 +75,9 @@
:init
(use-package slime-company)
(add-hook 'lisp-mode-hook 'slime-mode)
+ (add-hook 'slime-mode 'manx/lisp-keys)
+ (unbind-key "C-c x" slime-mode-map)
+ (unbind-key "C-c x" slime-mode-indirect-map)
(slime-setup '(slime-fancy slime-company)))
(use-package htmlize)
@@ -158,6 +165,7 @@
(global-set-key (kbd "C-c x e") (lambdainteractive () (find-file manx/emacs-org)))
(setq org-src-window-setup 'current-window)
+(setq org-html-doctype "html5")
;; I read somewhere that Company breaks things?
(add-hook 'org-mode-hook 'company-mode)
@@ -177,66 +185,6 @@
org-src-preserve-indentation nil
org-agenda-files '("~/todo.org"))
-(setq org-html-doctype "html5")
-
-(defun manx/eval-these (lang body)
- (not (string-equal "\"\\n\"" body)))
-
-(setq org-confirm-babel-evaluate 'manx/eval-these)
-
-(defun manx-publish/local-dir (dir)
- (concat "~/Documents/org/" dir))
-
-(defun manx-publish/remote-dir (dir)
- (concat "/ssh:plum@plum.moe|sudo:78:" dir))
-
-(defvar manx-publish/html-head "")
-
-(defun sitemap (title list)
- (concat "#+title:" title "\n"
- "#+setupfile:~/Documents/org/includes/setup.org\n\n"
- (format "@@html:%s
@@" title)
- "@@html:@@"
- (string-join (mapcar #'car (cdr list)))
- "@@html:@@"))
-
-(setq org-publish-project-alist
- `(("plum"
- :base-directory ,(manx-publish/local-dir "plum")
- :publishing-directory ,(manx-publish/remote-dir "/var/www/plum.moe")
- :publishing-function ox-slimhtml-publish-to-html
- :html-head ,manx-publish/html-head
- :recursive t)
- ("words"
- :base-directory ,(manx-publish/local-dir "words")
- :publishing-directory ,(manx-publish/remote-dir "/var/www/words.plum.moe")
- :publishing-function ox-slimhtml-publish-to-html
- :auto-sitemap t
- :sitemap-filename "index.html"
- :sitemap-title "Words by Manx"
- :sitemap-sort-files anti-chronologically
- :sitemap-file-entry-format "%d - %t"
- :sitemap-function sitemap
- :author-info t
- :creator-info t
- :html-head ,manx-publish/html-head)
- ("flags"
- :base-directory ,(manx-publish/local-dir "flags")
- :publishing-directory ,(manx-publish/remote-dir "/var/www/flags")
- :publishing-function ox-slimhtml-publish-to-html
- :html-head ,manx-publish/html-head)
- ("static"
- :base-directory ,(manx-publish/local-dir "static")
- :base-extension "css\\|js\\|svg"
- :publishing-function org-publish-attachment
- :recursive t
- :publishing-directory ,(manx-publish/remote-dir "/var/www/plum.moe/static"))))
-
-(definteractive manx/blog ()
- (load-theme 'spacemacs-light)
- (org-publish-project "words")
- (load-theme 'spacemacs-dark))
-
(definteractive manx/delete-org-link ()
(when (org-in-regexp org-bracket-link-regexp 1)
(apply 'delete-region (list (match-beginning 0) (match-end 0)))))
@@ -388,7 +336,6 @@ Null prefix argument turns off the mode."
(setq-local make-backup-files t)
(auto-save-mode 1)))
-
;; Regexps of sensitive files.
(setq auto-minor-mode-alist
(append
diff --git a/custom.el b/custom.el
index 5d3bb59..8948aed 100644
--- a/custom.el
+++ b/custom.el
@@ -4,32 +4,9 @@
;; 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.
- '(company-idle-delay 0)
- '(company-minimum-prefix-length 3)
'(custom-safe-themes
(quote
- ("fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" default)))
- '(dashboard-banner-logo-title "Komacs")
- '(dashboard-center-content t)
- '(dashboard-items (quote ((recents . 5))))
- '(dashboard-set-init-info t)
- '(dashboard-show-shortcuts nil)
- '(dashboard-startup-banner "~/.emacs.d/Komacs.png")
- '(ido-vertical-define-keys (quote C-n-and-C-p-only))
- '(nginx-indent-level 2)
- '(nginx-indent-tabs-mode t)
- '(package-selected-packages
- (quote
- (rust-mode cargo flycheck-rust yasnippet-snippets which-key use-package transpose-frame switch-window spacemacs-theme spaceline slime-company projectile popup-kill-ring ox-slimhtml omnisharp nginx-mode keychain-environment ido-vertical-mode hungry-delete htmlize diminish dashboard company-auctex beacon avy auto-minor-mode alchemist)))
- '(slime-lisp-implementations
- (quote
- ((sbcl
- ("sbcl" "--core" "/usr/lib64/sbcl/sbcl.core")
- :env
- ("SBCL_HOME=/usr/lib64/sbcl/")))) t)
- '(switch-window-increase 4 t)
- '(switch-window-input-style (quote minibuffer))
- '(switch-window-threshold 2))
+ ("bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" default))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/init.el b/init.el
index 8c17952..8af4f80 100644
--- a/init.el
+++ b/init.el
@@ -24,7 +24,7 @@
(defconst manx/emacs-el (in-emacs-home "config.el"))
(defconst manx/emacs-org (in-emacs-home "config.org"))
(defconst manx/emacs-email (in-emacs-home "email.el"))
-(defconst manx/org-export (in-emacs-home "export.el"))
+(defconst manx/org-export (in-emacs-home "org-export.el"))
(when (and manx/emacs-el manx/emacs-org)
(if (file-newer-than-file-p manx/emacs-org manx/emacs-el)
@@ -34,4 +34,4 @@
(mapc (lambda (file)
(when file
(load file 'noerror)))
- '(manx/emacs-email manx/org-export custom-file))
+ (list manx/emacs-email manx/org-export custom-file))