ryuslash/legacy-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into phoenix

Browse source
This commit is contained in:
Tom Willemsen 2012-09-17 20:32:32 +02:00
commit 1a767eeab0
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.config/awesome/rc.lua
View file

@ -285,12 +285,18 @@ globalkeys = awful.util.table.join(
sub({ }, "e", sub({ }, "e",
function () oni.run_or_raise("emacsclient -c -a emacs", function () oni.run_or_raise("emacsclient -c -a emacs",
{ class = "Emacs" }) end), { class = "Emacs" }) end),
sub({ "Shift", }, "e",
function () awful.util.spawn("emacsclient -c -a emacs") end),
sub({ }, "c", sub({ }, "c",
function () oni.run_or_raise("urxvt", function () oni.run_or_raise("urxvt",
{ class = "URxvt" }) end), { class = "URxvt" }) end),
sub({ "Shift", }, "c",
function () awful.util.spawn("urxvt") end),
sub({ }, "w", sub({ }, "w",
function () oni.run_or_raise("conkeror", function () oni.run_or_raise("conkeror",
{ class = "Conkeror" }) end) }), { class = "Conkeror" }) end),
sub({ "Shift", }, "w",
function () awful.util.spawn("conkeror") end) }),
awful.key({ "Control", "Mod1" }, "l", awful.key({ "Control", "Mod1" }, "l",
function () awful.util.spawn("i3lock -c 000000") end), function () awful.util.spawn("i3lock -c 000000") end),
awful.key({ modkey, }, "Left", awful.tag.viewprev ), awful.key({ modkey, }, "Left", awful.tag.viewprev ),

15
.emacs.d/init.el
View file

@ -21,8 +21,6 @@
'("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")) '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))
(add-to-list 'load-path "~/.emacs.d/")) (add-to-list 'load-path "~/.emacs.d/"))
(require 'auto-complete-config)
(autoload 'define-slime-contrib "slime") (autoload 'define-slime-contrib "slime")
(autoload 'gtags-mode "gtags" nil t) (autoload 'gtags-mode "gtags" nil t)
(autoload 'identica-mode "identica-mode" nil t) (autoload 'identica-mode "identica-mode" nil t)
@ -563,7 +561,7 @@ use. If MODE is not nil, open a new buffer with the name
(when (fboundp mode-sym) (when (fboundp mode-sym)
(funcall mode-sym)))) (funcall mode-sym))))
(switch-to-buffer buffer))) (select-window (display-buffer buffer))))
(defun oni:reload-buffer () (defun oni:reload-buffer ()
"Reload current buffer." "Reload current buffer."
@ -807,7 +805,6 @@ for easy selection."
(setq-default tab-width 4) (setq-default tab-width 4)
(setq-default truncate-lines t) (setq-default truncate-lines t)
(setq ac-use-quick-help nil)
(setq appt-display-diary nil) (setq appt-display-diary nil)
(setq auto-mode-case-fold nil) (setq auto-mode-case-fold nil)
(setq auto-save-file-name-transforms (setq auto-save-file-name-transforms
@ -825,12 +822,11 @@ for easy selection."
(vertical-scroll-bars . nil) (vertical-scroll-bars . nil)
(menu-bar-lines . nil) (menu-bar-lines . nil)
(tool-bar-lines . nil) (tool-bar-lines . nil)
(font . "osaka_unicode:pixelsize=18") (font . "Monaco:pixelsize=16")
(left-fringe . 0))) (left-fringe . 0)))
(setq emms-source-file-default-directory "/mnt/music/") (setq emms-source-file-default-directory "/mnt/music/")
(setq erc-autojoin-channels-alist (setq erc-autojoin-channels-alist
'(("freenode.net" "#herbstluftwm" "#ninthfloor" "#emacs" '(("freenode.net" "#ninthfloor" "#emacs" "#dispass")))
"#dispass")))
(setq erc-hide-list '("JOIN" "PART" "QUIT")) (setq erc-hide-list '("JOIN" "PART" "QUIT"))
(setq erc-insert-timestamp-function 'erc-insert-timestamp-left) (setq erc-insert-timestamp-function 'erc-insert-timestamp-left)
(setq erc-nick "ryuslash") (setq erc-nick "ryuslash")
@ -1000,6 +996,7 @@ for easy selection."
(add-hook 'hs-minor-mode-hook 'oni:hs-minor-mode-func) (add-hook 'hs-minor-mode-hook 'oni:hs-minor-mode-func)
(add-hook 'html-mode-hook 'oni:html-mode-func) (add-hook 'html-mode-hook 'oni:html-mode-func)
(add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func) (add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func)
(add-hook 'jabber-roster-mode-hook 'oni:jabber-roster-mode-func)
(add-hook 'java-mode-hook 'oni:java-mode-func) (add-hook 'java-mode-hook 'oni:java-mode-func)
(add-hook 'js-mode-hook 'oni:js-mode-func) (add-hook 'js-mode-hook 'oni:js-mode-func)
(add-hook 'js2-mode-hook 'oni:js2-mode-func) (add-hook 'js2-mode-hook 'oni:js2-mode-func)
@ -1070,6 +1067,9 @@ for easy selection."
(add-to-list 'debug-ignored-errors "^Can't shift all lines enough") (add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
(add-to-list 'display-buffer-alist
'("^\\*.*\\*$" . ((bw-display-in-bottom-window . nil))))
(unless (oni:required-packages-installed-p) (unless (oni:required-packages-installed-p)
(message "%s" "Refreshing package database...") (message "%s" "Refreshing package database...")
(package-refresh-contents) (package-refresh-contents)
@ -1095,7 +1095,6 @@ for easy selection."
(smex-initialize) (smex-initialize)
(help-at-pt-set-timer) (help-at-pt-set-timer)
(ac-config-default)
(load-theme 'naquadah t) (load-theme 'naquadah t)