Assimilate scpaste 0.6.5-19-gca95a8d

Now with support for Emacs's htmlfontify library.

3 files changed, 8 insertions, 6 deletions

diff --git a/.gitmodules b/.gitmodules
index 4ffaf5f..4710af9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -65,6 +65,9 @@
 [submodule "s"]
 	path = lib/s
 	url = https://github.com/magnars/s.el.git
+[submodule "scpaste"]
+	path = lib/scpaste
+	url = https://github.com/technomancy/scpaste.git
 [submodule "switch-buffer-functions"]
 	path = lib/switch-buffer-functions
 	url = https://github.com/10sr/switch-buffer-functions-el.git
diff --git a/init.el b/init.el
index 4eb0129..bcde97a 100644
--- a/init.el
+++ b/init.el
@@ -666,6 +666,11 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; IRC (with ERC and ZNC)
 (require 'bandali-erc)
 
+(use-package scpaste
+  :config
+  (setq scpaste-http-destination "https://p.bndl.org"
+        scpaste-scp-destination "p:~"))
+
 
 ;;; Editing
 
@@ -1368,12 +1373,6 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   (eosd-start))
 
-(use-package scpaste
-  :disabled
-  :config
-  (setq scpaste-http-destination "https://p.bndl.org"
-        scpaste-scp-destination "nix:/var/www/p.bndl.org"))
-
 (use-package eww
   :bind ("C-c a e w" . eww)
   :custom
diff --git a/lib/scpaste b/lib/scpaste
new file mode 160000
+Subproject ca95a8dd088e848bd1cab6be207c6a98343ee17