summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--emacs/init.el12
-rwxr-xr-xinstall4
-rw-r--r--zsh/fasdrc3
-rwxr-xr-xzsh/zshrc1
4 files changed, 9 insertions, 11 deletions
diff --git a/emacs/init.el b/emacs/init.el
index af45349..0b92b4e 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -914,11 +914,12 @@ Also returns nil if pid is nil."
 
 (use-package multiple-cursors
   :ensure t
-  :bind (("C-." . mc/mark-next-like-this)
-         ("C-," . mc/mark-previous-like-this)
-         ("M-<f3>" . mc/mark-all-like-this-dwim)
-         ("C-<f3>" . mc/mark-more-like-this-extended)
-         ("C-S-L" . mc/edit-lines)))
+  :config (progn
+            (bind-key "C-." #'mc/mark-next-like-this)
+            (bind-key "C-," #'mc/mark-previous-like-this)
+            (bind-key "M-<f3>" #'mc/mark-all-like-this-dwim)
+            (bind-key "C-<f3>" #'mc/mark-more-like-this-extended)
+            (bind-key "C-S-L" #'mc/edit-lines)))
 
 (use-package eldoc
   :defer t
@@ -1008,7 +1009,6 @@ Also returns nil if pid is nil."
   :config (use-package quack))
 
 (use-package slime
-  :ensure t
   :commands (slime)
   :config (progn
             (let ((ql-slime-helper (expand-file-name "~/quicklisp/slime-helper.el")))
diff --git a/install b/install
index 16d30c5..6eb4591 100755
--- a/install
+++ b/install
@@ -6,7 +6,7 @@ setopt EXTENDED_GLOB
 
 if [[ ! -d dotfiles && ${(L)host} =~ prefect ]]
 then
-	hg clone ssh://alan@home.alanpearce.co.uk:22222/dotfiles
+	git clone ssh://alan@home.alanpearce.co.uk:22222/~/dotfiles.git
 fi
 
 install-dot () {
@@ -35,7 +35,7 @@ install-dot () {
 
 install-dot dotfiles/.git/hooks/ dotfiles/git-hooks/*
 install-dot .emacs.d/ dotfiles/emacs/*
-install-dot . dotfiles/^install(.) dotfiles/zsh/zshrc
+install-dot . dotfiles/^install(.) dotfiles/zsh/zshrc dotfiles/zsh/fasdrc
 install-dot .ssh/ dotfiles/ssh/*
 if [[ -d projects/dwm ]]
 then
diff --git a/zsh/fasdrc b/zsh/fasdrc
index efe6e0a..22259d7 100644
--- a/zsh/fasdrc
+++ b/zsh/fasdrc
@@ -5,5 +5,4 @@ current () {
 	done
 }
 
-# If you want to have this behavior for all fasd queries
-_FASD_BACKENDS="native current"
+alias e="f -t -e $EDITOR -B current"
diff --git a/zsh/zshrc b/zsh/zshrc
index c129e0c..bc336e5 100755
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -304,7 +304,6 @@ alias lsr="${ls} -tld *(m-2)" # mtime < -2days
 alias trans="transmission-remote transmission.home"
 alias bitcoin="bitcoind"
 alias su="smart_sudo "
-alias e="$EDITOR"
 alias E="SUDO_EDITOR=\emacsclient -c -a emacs\" sudoedit"
 alias wprop='xprop |awk '\''
     /^WM_CLASS/{sub(/.* =/, "instance:"); sub(/,/, "\nclass:"); print}