Adapt to the new el-get

init.el

@@ -22,16 +22,11 @@
 
 ;; now either el-get is `require'd already, or have been `load'ed by the
 ;; el-get installer.
+
+;; set local recipes
 (setq
  el-get-sources
- '(el-get				; el-get is self-hosting
-   escreen            			; screen for emacs, C-\ C-h
-   php-mode-improved			; if you're into php...
-   switch-window			; takes over C-x o
-   auto-complete			; complete as you type with overlays
-   zencoding-mode			; http://www.emacswiki.org/emacs/ZenCoding
-
-   (:name buffer-move			; have to add your own keys
+ '((:name buffer-move			; have to add your own keys
 	  :after (lambda ()
 		   (global-set-key (kbd "<C-S-up>")     'buf-move-up)
 		   (global-set-key (kbd "<C-S-down>")   'buf-move-down)
@@ -53,28 +48,39 @@
 		   ;; when using AZERTY keyboard, consider C-x C-_
 		   (global-set-key (kbd "C-x C-/") 'goto-last-change)))))
 
-(unless (string-match "apple-darwin" system-configuration)
-  (loop for p in '(color-theme		; nice looking emacs
-		   color-theme-tango	; check out color-theme-solarized
-		   )
-	do (add-to-list 'el-get-sources p)))
+;; now set our own packages
+(setq
+ my:el-get-packages
+ '(el-get				; el-get is self-hosting
+   escreen            			; screen for emacs, C-\ C-h
+   php-mode-improved			; if you're into php...
+   switch-window			; takes over C-x o
+   auto-complete			; complete as you type with overlays
+   zencoding-mode			; http://www.emacswiki.org/emacs/ZenCoding
+   color-theme		                ; nice looking emacs
+   color-theme-tango))	                ; check out color-theme-solarized
 
 ;;
 ;; Some recipes require extra tools to be installed
 ;;
 ;; Note: el-get-install requires git, so we know we have at least that.
 ;;
 (when (el-get-executable-find "cvs")
-  (add-to-list 'el-get-sources 'emacs-goodies-el)) ; the debian addons for emacs
+  (add-to-list 'my:el-get-packages 'emacs-goodies-el)) ; the debian addons for emacs
 
 (when (el-get-executable-find "svn")
   (loop for p in '(psvn    		; M-x svn-status
 		   yasnippet		; powerful snippet mode
 		   )
-	do (add-to-list 'el-get-sources p)))
+	do (add-to-list 'my:el-get-packages p)))
+
+(setq my:el-get-packages
+      (append
+       my:el-get-packages
+       (loop for src in el-get-sources collect (el-get-source-name src))))
 
 ;; install new packages and init already installed packages
-(el-get 'sync)
+(el-get 'sync my:el-get-packages)
 
 ;; on to the visual settings
 (setq inhibit-splash-screen t)		; no splash screen, thanks