diff options
| -rw-r--r-- | .config/awesome/rc.lua | 37 | ||||
| -rw-r--r-- | .emacs.d/init.el | 14 | ||||
| -rw-r--r-- | .emacs.d/site-lisp/oni.el | 4 | ||||
| -rw-r--r-- | .offlineimaprc | 2 | ||||
| -rw-r--r-- | .xbindkeysrc.scm | 8 | ||||
| -rw-r--r-- | .zprofile | 5 |
6 files changed, 22 insertions, 48 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 793ac7d..d1c7355 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -25,6 +25,8 @@ (require 'mode-icons) (require 'oni) +(defalias 'dabbrev-expand 'hippie-expand) + (autoload 'define-slime-contrib "slime") (autoload 'gtags-mode "gtags" nil t) (autoload 'identica-mode "identica-mode" nil t) @@ -40,9 +42,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) (defalias 'list-buffers 'ibuffer) @@ -283,7 +282,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) @@ -365,6 +363,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 @@ -402,6 +403,7 @@ (ido-ubiquitous-mode) (savehist-mode) (show-paren-mode) +(display-battery-mode) (smex-initialize) (help-at-pt-set-timer) @@ -410,10 +412,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) (unless (server-running-p) (server-start) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 2a27e45..9b02dc1 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) @@ -398,7 +397,6 @@ When dealing with braces, add another line and indent that too." (rainbow-delimiters-mode) (fci-mode) (pretty-symbols-mode) - (yas-minor-mode) (auto-fill-mode)) (defun oni:python-mode-func () diff --git a/.offlineimaprc b/.offlineimaprc index 443e83e..0afd94d 100644 --- a/.offlineimaprc +++ b/.offlineimaprc @@ -2,7 +2,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 ryuslash.org] diff --git a/.xbindkeysrc.scm b/.xbindkeysrc.scm index 509a130..fcfd33e 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,7 @@ -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" |