* moved switch-window and iy-go-to-char to package.el installs

* changed 'custom-clone-git and 'custom-download-script to place things in special folders
* added those folders and some other things to .gitignore
* changed binding for iy-go-to-char to C-c f

4 files changed, 16 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index e0336e08dea0..2456e9d97e77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
-scripts/
-init-local.el
-init-irc.el
+.smex-items
+*token*
+auto-save-list/
+clones/
 elpa/
-themes/
+init-irc.el
+init-local.el
 other/
-*token*
\ No newline at end of file
+scripts/
+themes/
\ No newline at end of file
diff --git a/init-bindings.el b/init-bindings.el
index 23917802fef2..d4026f157b50 100644
--- a/init-bindings.el
+++ b/init-bindings.el
@@ -19,7 +19,7 @@
 (global-set-key (kbd "M-j") 'ace-jump-word-mode)
 
 ;; Jump to next occurence of char
-(global-set-key (kbd "M-m") 'iy-go-to-char)
+(global-set-key (kbd "C-c f") 'iy-go-to-char)
 
 ;; Window switching. (C-x o goes to the next window)
 (windmove-default-keybindings) ;; Shift+direction
diff --git a/init-functions.el b/init-functions.el
index 1fdf64ed59a7..4814cee5d322 100644
--- a/init-functions.el
+++ b/init-functions.el
@@ -20,7 +20,7 @@
     (unless (file-exists-p file)
       (url-copy-file url file))))
 
-(defun custom-download-script (url filename)
+ (defun custom-download-script (url filename)
   "Downloads an Elisp script, places it in ~/.emacs/other and then loads it"
 
   ;; Ensure the directory exists
@@ -29,7 +29,7 @@
 
   ;; Download file if it doesn't exist.
   (let ((file
-         (concat "~/.emacs.d/" filename)))
+         (concat "~/.emacs.d/other/" filename)))
     (unless (file-exists-p file)
       (url-copy-file url file))
 
@@ -39,10 +39,9 @@
 ;; if there isn't already a folder with that name
 (defun custom-clone-git (url foldername)
   "Clones a git repository to .emacs.d/foldername"
-  (let ((fullpath (concat "~/.emacs.d/" foldername)))
+  (let ((fullpath (concat "~/.emacs.d/clones/" foldername)))
     (unless (file-exists-p fullpath)
-      (async-shell-command (concat "git clone " url " " fullpath))))
-  )
+      (async-shell-command (concat "git clone " url " " fullpath)))))
 
 ;; These come from magnars, he's got some awesome things.
 
diff --git a/init.el b/init.el
index 73f680546153..a85e4c4b49de 100644
--- a/init.el
+++ b/init.el
@@ -23,17 +23,20 @@
     hi2
     idle-highlight-mode
     ido-ubiquitous
+    iy-go-to-char
     leuven-theme
     magit
     magit
     markdown-mode
     multiple-cursors
     nrepl
+    nyan-mode
     paredit
     projectile
     rainbow-delimiters
     rainbow-mode
     smex
+    switch-window
     undo-tree
     geiser
     quack)
@@ -51,16 +54,6 @@
 (setq custom-file "~/.emacs.d/init-custom.el")
 (load custom-file)
 
-;; Other packages that need manual installation
-(custom-download-script "https://raw.github.com/dimitri/switch-window/master/switch-window.el"
-                        "switch-window.el")
-
-(custom-download-script "https://raw.github.com/doitian/iy-go-to-char/master/iy-go-to-char.el"
-                        "goto-char.el")
-
-;; NYAN CAT!
-(custom-clone-git "https://github.com/TeMPOraL/nyan-mode" "nyan-mode")
-(load "~/.emacs.d/nyan-mode/nyan-mode.el")
 
 (load "~/.emacs.d/init-settings.el")
 (load "~/.emacs.d/init-modes.el")