X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=8ee6f534af3deaba4fcdcab3641ba65f472273aa;hb=f9946de12bd517a6fb0cc79cb45e30002fca4368;hp=046bcb8c876d2bf021b1dfb69c0a26b25c0a304e;hpb=b46c46a41995c3ddc200307e8c9666b9c1ba26a6;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 046bcb8..8ee6f53 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -1260,16 +1260,6 @@ Type =o= to go to the link
 
 #+END_SRC
 
-** Emux
-
-[[https://github.com/re5et/emux][emux]] is 
-
-#+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
-  (el-get-bundle re5et/emux)
-
-#+END_SRC
-
 ** Smart Parens
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
@@ -1382,8 +1372,6 @@ When see function by =C-h f=, and visit the source code, I would like the buffer
 ** TODO Man mode
 Color for Man-mode
 
-** TODO swiper to occur
-
 ** TODO UTF8
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   ;; (set-language-environment "UTF-8")
@@ -1412,7 +1400,7 @@ Color for Man-mode
     (define-key org-tree-slide-mode-map [escape] 'org-tree-slide-move-previous-tree))
 #+END_SRC
 
-* dired
+* Dired
 ** Dired config
 =C-o= is defined as a global key for window operation, here unset it in dired mode
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
@@ -1444,9 +1432,18 @@ Color for Man-mode
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (use-package dired-hacks-utils
     :ensure t)
+
+
+  (defconst my-dired-media-files-extensions '("mp3" "mp4" "MP3" "MP4" "avi" "mpg" "flv" "ogg" "wmv" "mkv" "mov" "wma")
+  "Media file extensions that should launch in VLC.")
+
+    (add-to-list 'dired-guess-shell-alist-user
+                 (list (concat "\\."
+                               (regexp-opt my-dired-media-files-extensions)
+                               "\\'") "mplayer"))
 #+END_SRC
 
-* ibuffer
+* Ibuffer
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (global-set-key (kbd "s-b") 'ibuffer)
 
@@ -2525,17 +2522,17 @@ stolen from [[https://github.com/mariolong/emacs.d/blob/f6a061594ef1b5d1f4750e9d
     (set-mark (line-end-position)))
 
   (defhydra sd/expand-selected (:color red :columns nil
-                                       ;; :post (deactivate-mark)
+                                       :post (deactivate-mark)
                                        )
     "Selected"
     ;; select
     ;; ("e"  er/expand-region "+")
-    ("SPC"  er/expand-region "+")
+    ("SPC" er/expand-region "+")
     ;; ("c"  er/contract-region "-")
-    ("S-SPC"  er/contract-region "-")
-    ("r"  (lambda ()
-            (interactive)
-            (er/contract-region 0))
+    ("S-SPC" er/contract-region "-")
+    ("r" (lambda ()
+           (interactive)
+           (er/contract-region 0))
      "reset")
 
     ("i'" er/mark-inside-quotes "in")
@@ -2548,21 +2545,15 @@ stolen from [[https://github.com/mariolong/emacs.d/blob/f6a061594ef1b5d1f4750e9d
     ("o{" er/mark-inside-pairs nil)
     ("o(" er/mark-inside-pairs nil)
 
-    ("p"  er/mark-paragraph "paragraph")
+    ("p" er/mark-paragraph "paragraph")
 
-    ("l"  sd/mark-line "line")
-    ("u"  er/mark-url "url")
-    ("f"  er/mark-defun "fun")
-    ("n"  er/mark-next-accessor "next")
+    ("l" sd/mark-line "line")
+    ("u" er/mark-url "url")
+    ("f" er/mark-defun "fun")
+    ("n" er/mark-next-accessor "next")
 
     ("x" exchange-point-and-mark "exchange")
-
-    ;; Move
-    ;; ("h" backward-char nil)
-    ;; ("j" next-line nil)
-    ;; ("k" previous-line nil)
-    ;; ("l" foreward-char nil)
-
+  
     ;; Search
     ;; higlight
 
@@ -2570,13 +2561,14 @@ stolen from [[https://github.com/mariolong/emacs.d/blob/f6a061594ef1b5d1f4750e9d
     ("d" kill-region "delete" :exit t)
 
     ("y" kill-ring-save "yank" :exit t)
-    ;; ("M-SPC" nil "quit" :exit t)
-    ("C-SPC" nil "quit" :exit t)
-    ("q" nil "quit" :exit t))
+    ("M-SPC" nil "quit" :exit t)
+    ;; ("C-SPC" "quit" :exit t)
+    ("q" deactivate-mark "quit" :exit t))
 
-  (global-set-key (kbd "C-SPC") (lambda ()
+  (global-set-key (kbd "M-SPC") (lambda ()
                                   (interactive)
                                   (set-mark-command nil)
+                                  ;; (er/expand-region 1)
                                   (er/mark-word)
                                   (sd/expand-selected/body)))
 #+END_SRC