about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--awesome/.config/awesome/rc.lua7
-rw-r--r--emacs/.emacs.d/init.el2
-rwxr-xr-xvim/.vim/vimrc2
3 files changed, 7 insertions, 4 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 8bede30..6aa7f73 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -216,7 +216,7 @@ local function cmus_spawn(command)
 end
 local function cmus() cmus_spawn"x-terminal-emulator -e cmus" end
 local function cmus_pause() cmus_spawn"cmus-remote --pause" end
-local function cmus_one() cmus_spawn"cmus-remote -C'toggle repeat_current'" end
+local function cmus_one() cmus_spawn"cmus-remote -C 'toggle repeat_current'" end
 local function cmus_prev() cmus_spawn"cmus-remote --prev" end
 local function cmus_next() cmus_spawn"cmus-remote --next" end
 
@@ -435,7 +435,10 @@ globalkeys = awful.util.table.join(
             {description = "lock screen then suspend", group = "launcher"}),
   awful.key({modkey}, "c", cmus,
             {description = "open cmus music player", group = "launcher"}),
-
+  awful.key({modkey, "Shift"}, "c", cmus_one,
+            {description = "cmus: toggle repeat current", group = "multimedia"}),
+  awful.key({modkey, "Control"}, "c", cmus_pause,
+            {description = "cmus: play/pause", group = "multimedia"}),
   awful.key({}, "XF86AudioPlay", cmus_pause,
             {description = "cmus: play/pause", group = "multimedia"}),
   awful.key({}, "XF86AudioPrev", cmus_prev,
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 3d9101d..d8acde6 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -31,7 +31,7 @@
  '(erc-nick "cnx")
  '(package-selected-packages
    (quote
-    (lua-mode markdown-mode smart-tabs-mode auctex wordnut magit geiser slime pdf-tools)))
+    (fireplace lua-mode markdown-mode smart-tabs-mode auctex wordnut magit geiser slime pdf-tools)))
  '(scroll-bar-mode nil)
  '(show-paren-mode t)
  '(tool-bar-mode nil)
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index a0f9965..7829623 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -16,7 +16,7 @@ autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1)
 autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal
 autocmd FileType c,h,go setlocal cindent noexpandtab shiftwidth=8
 autocmd FileType rst setlocal shiftwidth=3
-autocmd FileType css,javascript,python setlocal shiftwidth=4
+autocmd FileType css,javascript,python,perl6 setlocal shiftwidth=4
 autocmd FileType python,tex setlocal indentexpr=
 let g:jedi#popup_on_dot = 0
 let g:jedi#popup_select_first = 0