diff options
-rw-r--r-- | .config/awesome/rc.lua | 37 | ||||
-rw-r--r-- | .emacs.d/init.el | 12 | ||||
-rw-r--r-- | .emacs.d/site-lisp/oni.el | 13 | ||||
-rw-r--r-- | .offlineimaprc | 2 | ||||
-rw-r--r-- | .xbindkeysrc.scm | 8 | ||||
-rwxr-xr-x | .xinitrc | 4 | ||||
-rw-r--r-- | .zprofile | 12 |
7 files changed, 28 insertions, 60 deletions
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 6132386..1c6e4fe 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -59,6 +59,7 @@ modkey = "Mod4" -- Table of layouts to cover with awful.layout.inc, order matters. layouts = { + awful.layout.suit.magnifier, awful.layout.suit.tile, awful.layout.suit.tile.left, awful.layout.suit.tile.bottom, @@ -67,7 +68,6 @@ layouts = awful.layout.suit.fair.horizontal, awful.layout.suit.max, awful.layout.suit.max.fullscreen, - awful.layout.suit.magnifier, awful.layout.suit.floating } -- }}} @@ -106,23 +106,6 @@ mytextclock = awful.widget.textclock({ align = "right" }) -- Create a systray mysystray = widget({ type = "systray" }) --- Create a mailbox widget -myryumailbox = oni.mailcount_widgets("ryu", "ryuslash.org", "ryuslash") -myaethonmailbox = oni.mailcount_widgets("aet", "aethon", "aethon") -mygmailmailbox = oni.mailcount_widgets("gmail", "gmail", "gmail") -my9fmailbox = oni.mailcount_widgets("9f", "ninthfloor", "ninthfloor") - -mymailboxtimer = timer({ timeout = 60 }) -mymailboxtimer:add_signal( - "timeout", - function () - myryumailbox.count.text = string.format(" %d ", oni.mailcount("ryuslash.org")) - myaethonmailbox.count.text = string.format(" %d ", oni.mailcount("aethon")) - mygmailmailbox.count.text = string.format(" %d ", oni.mailcount("gmail")) - my9fmailbox.count.text = string.format(" %d ", oni.mailcount("ninthfloor")) - end) -mymailboxtimer:start() - -- Create a wibox for each screen and add it mywibox = {} mypromptbox = {} @@ -200,14 +183,6 @@ for s = 1, screen.count() do mylayoutbox[s], mytextclock, s == 1 and mysystray or nil, - s == 1 and my9fmailbox.count or nil, - s == 1 and my9fmailbox.label or nil, - s == 1 and mygmailmailbox.count or nil, - s == 1 and mygmailmailbox.label or nil, - s == 1 and myaethonmailbox.count or nil, - s == 1 and myaethonmailbox.label or nil, - s == 1 and myryumailbox.count or nil, - s == 1 and myryumailbox.label or nil, mytasklist[s], layout = awful.widget.layout.horizontal.rightleft } @@ -370,15 +345,9 @@ awful.rules.rules = { properties = { floating = true } }, { rule = { class = "gimp" }, properties = { floating = true } }, - { rule = { class = "Emacs" }, - properties = { tag = tags[1][1] } }, -- Set Firefox to always map on tags number 2 of screen 1. - { rule = { class = "Firefox" }, - properties = { tag = tags[2][1] } }, - { rule = { class = "Conkeror" }, - properties = { tag = tags[2][1] } }, - { rule = { class = "URxvt" }, - properties = { tag = tags[2][1] } }, + -- { rule = { class = "Firefox" }, + -- properties = { tag = tags[1][2] } }, } -- }}} diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 4f78780..11a390d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -40,9 +40,6 @@ (load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el")) -(define-key key-translation-map (kbd "C-j") (kbd "C-l")) -(define-key key-translation-map (kbd "C-l") (kbd "C-j")) - (defalias 'yes-or-no-p 'y-or-n-p) (eval-after-load "ebuff-menu" @@ -334,7 +331,6 @@ (setq user-full-name "Tom Willemsen") (setq whitespace-style '(face trailing)) (setq window-combination-resize t) -(setq yas-prompt-functions '(yas-ido-prompt)) (add-hook 'after-save-hook 'oni:after-save-func t) (add-hook 'before-save-hook 'oni:before-save-func) @@ -366,7 +362,6 @@ (add-hook 'term-mode-hook 'oni:term-mode-func) (add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func) (add-hook 'write-file-hooks 'oni:write-file-func) -(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func) (global-set-key (kbd "'") 'oni:self-insert-dwim) (global-set-key (kbd "<XF86AudioNext>") 'emms-next) @@ -420,6 +415,9 @@ (add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode)) (add-to-list 'auto-mode-alist '("^\\.Xmodmap$" . xmodmap-mode)) +(add-to-list 'compilation-finish-functions + 'oni:compilation-finish-function) + (add-to-list 'debug-ignored-errors "^Can't shift all lines enough") (add-to-list 'display-buffer-alist @@ -465,10 +463,6 @@ (load custom-file) (load "rudel-loaddefs.el") -(load (expand-file-name "~/quicklisp/slime-helper.el")) - -(load "quick-edit-mode") -(global-set-key (kbd "C-z") 'quick-edit-mode) (provide 'init) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index c483278..a480282 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -59,7 +59,7 @@ DOT are intentionally being skipped." (defvar oni:required-packages '(graphviz-dot-mode htmlize magit rainbow-delimiters - rainbow-mode yasnippet markdown-mode flymake + rainbow-mode markdown-mode flymake flymake-cursor pony-mode sauron dispass expand-region fill-column-indicator git-auto-commit-mode idomenu magit smex) @@ -175,7 +175,6 @@ DOT are intentionally being skipped." (defun oni:html-mode-func () "Function for `html-mode-hook'." - (yas-minor-mode) (fci-mode)) (defun oni:indent-shift-left (start end &optional count) @@ -379,8 +378,7 @@ When dealing with braces, add another line and indent that too." (defun oni:org-mode-func () "Function for `org-mode-hook'." - (auto-fill-mode) - (yas-minor-mode)) + (auto-fill-mode)) (defun oni:php-mode-func () "Function for `php-mode-hook'." @@ -395,8 +393,7 @@ When dealing with braces, add another line and indent that too." "Function for `prog-mode-hook'." (rainbow-delimiters-mode) (fci-mode) - (pretty-symbols-mode) - (yas-minor-mode)) + (pretty-symbols-mode)) (defun oni:python-mode-func () "Function for `python-mode-hook'." @@ -552,9 +549,5 @@ for easy selection." "Function for `write-file-hooks'." (time-stamp)) -(defun oni:yas-minor-mode-func () - "Function for `yas-minor-mode-hook'." - (yas-load-directory (car yas-snippet-dirs))) - (provide 'oni) ;;; oni.el ends here diff --git a/.offlineimaprc b/.offlineimaprc index 91b3612..ff4aeed 100644 --- a/.offlineimaprc +++ b/.offlineimaprc @@ -3,7 +3,7 @@ [general] # NOTE: cronjob calls the quiet UI with -u ui = TTYUI -accounts = ryuslash.org,gmail,arch,aethon,ninthfloor +accounts = ryuslash.org,gmail,aethon,ninthfloor pythonfile = ~/.offlineimap.py [Account arch] diff --git a/.xbindkeysrc.scm b/.xbindkeysrc.scm index c8e4633..16fcf09 100644 --- a/.xbindkeysrc.scm +++ b/.xbindkeysrc.scm @@ -127,6 +127,12 @@ (close-pipe dzen-pipe) (set! dzen-pipe '()))) +(define (kill-mouse) + (run-command "synclient TouchpadOff=1; xte 'mousemove 1500 1500'")) + +(define (revive-mouse) + (run-command "synclient TouchpadOff=0")) + (define (notify msg) (run-command (string-append "notify-send \"" msg "\""))) @@ -197,6 +203,8 @@ (xbindkey '(XF86AudioRaiseVolume) "mcp volume +5") (xbindkey '(XF86AudioPrev) "mpc prev") (xbindkey '(XF86AudioNext) "mpc next") + (xbindkey-function '(XF86TouchpadOff) kill-mouse) + (xbindkey-function '(XF86TouchpadOn) revive-mouse) (xbindkey `(,modkey k) "herbstclient close") (xbindkey `(,modkey Escape) "~/.config/herbstluftwm/panel.sh")) @@ -1,6 +1,9 @@ #!/bin/bash xmodmap ~/.Xmodmap +<<<<<<< HEAD +emacs --daemon & +======= # Source scripts in /etc/X11/xinit/xinitrc.d/ if [ -d /etc/X11/xinit/xinitrc.d ]; then for f in /etc/X11/xinit/xinitrc.d/*; do @@ -10,6 +13,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then fi { emacs --daemon & } && sleep 1 +>>>>>>> origin/master pidof mpdscribble >& /dev/null if [ $? -ne 0 ] @@ -1,8 +1,8 @@ -export BROWSER=conkeror +# -*- eval: (git-auto-commit-mode 1) -*- +export BROWSER=firefox export EDITOR="emacsclient -c -a emacs" -export INFOPATH="${HOME}/documents/info:/usr/local/emacs/share/info:/usr/share/info:/usr/local/stumpwm/share/info" +export INFOPATH="${HOME}/documents/info:${INFOPATH}" -PATH="${HOME}/usr/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin" -PATH="/usr/local/scwm/bin:$PATH" -PATH="/usr/local/clfswm/bin:$PATH" -export PATH="/usr/local/emacs/bin:$PATH" +PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin" +PATH="$HOME/code/ext/emacs/trunk/lib-src:$PATH" +export PATH="$HOME/code/ext/emacs/trunk/src:$PATH" |