diff options
| -rw-r--r-- | .config/awesome/rc.lua | 78 | ||||
| -rw-r--r-- | .emacs.d/init.el | 14 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .offlineimaprc | 2 | ||||
| -rw-r--r-- | .xbindkeysrc.scm | 8 |
5 files changed, 23 insertions, 80 deletions
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 5e07a09..38e9a72 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -9,8 +9,6 @@ require("naughty") oni = { } -- Container for custom functions. -oni.maildirfmt = "/home/slash/documents/mail/%s/inbox/new/" - --- Error handling -- Check if awesome encountered an error during startup and fell back to -- another config (This code will only ever execute for the fallback config) @@ -41,44 +39,6 @@ function oni.focus_raise(direction) if client.focus then client.focus:raise() end end -function oni.mailcount(account) - local i = 0 - local dir = string.format(oni.maildirfmt, account) - - for file in lfs.dir(dir) do - if file ~= "." and file ~= ".." then - i = i + 1 - end - end - - return i -end - -function oni.mailcount_text() - return string.format(" ryu: %d aet: %d gmail: %d 9f: %d --", - oni.mailcount("ryuslash.org"), - oni.mailcount("aethon"), - oni.mailcount("gmail"), - oni.mailcount("ninthfloor")) -end - -function oni.mailcount_widgets(label, account, name) - widgets = {} - widgets.label = widget({ type = "textbox" }) - widgets.label.text = string.format(" %s: ", label) - widgets.count = widget({ type = "textbox" }) - widgets.count.text = string.format(" %d ", oni.mailcount(account)) - widgets.count.bg = beautiful.bg_focus - widgets.count:buttons( - awful.util.table.join( - awful.button({ }, 1, - function (c) - awful.util.spawn("emacsclient -e '(oni:view-mail \"" .. name .. "\")'") - end))) - - return widgets -end - -- Returns true if all pairs in table1 are present in table2 function oni.match(table1, table2) for k, v in pairs(table1) do @@ -139,7 +99,6 @@ function oni.run_or_raise(cmd, properties) end awful.util.spawn(cmd) end - -- {{{ Variable definitions -- Themes define colours, icons, and wallpapers beautiful.init("/home/slash/.config/awesome/themes/custom/theme.lua") @@ -167,6 +126,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, @@ -175,7 +135,6 @@ layouts = awful.layout.suit.fair.horizontal, awful.layout.suit.max, awful.layout.suit.max.fullscreen, - awful.layout.suit.magnifier, awful.layout.suit.floating } -- }}} @@ -214,23 +173,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 = {} @@ -308,14 +250,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 } @@ -495,15 +429,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 662facf..75c52e7 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -145,6 +145,13 @@ DOT are intentionally being skipped." (interactive) (server-save-buffers-kill-terminal nil)) +(defun oni:compilation-finish-function (buffer str) + "Don't show compilation window if everything went OK." + (unless (string-match-p "exited abnormally" str) + ;;(run-at-time 0.5 nil 'delete-windows-on buffer) + (delete-windows-on buffer) + (message "Compilation successful"))) + (defun oni:compile-el () "Compile the current buffer file if it is an .el file." (let* ((full-file-name (buffer-file-name)) @@ -1034,6 +1041,9 @@ for easy selection." (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 @@ -1072,10 +1082,6 @@ for easy selection." (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) @@ -100,6 +100,7 @@ var/ xhtml-loader.rnc .unison/ .pencil/ +.emacs.d/ .cuyo .lgames .beetsmusic.blb 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")) |