diff options
-rw-r--r-- | .config/awesome/rc.lua | 37 | ||||
-rwxr-xr-x | .config/herbstluftwm/autostart | 8 | ||||
-rw-r--r-- | .emacs.d/init.el | 8 | ||||
-rw-r--r-- | .emacs.d/site-lisp/oni.el | 4 | ||||
-rw-r--r-- | .emacs.d/snippets/org-mode/heading | 10 | ||||
-rw-r--r-- | .offlineimaprc | 2 | ||||
-rw-r--r-- | .xbindkeysrc.scm | 8 | ||||
-rw-r--r-- | .zprofile | 5 |
8 files changed, 26 insertions, 56 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/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart index cf9b852..aba65f3 100755 --- a/.config/herbstluftwm/autostart +++ b/.config/herbstluftwm/autostart @@ -49,13 +49,7 @@ hc set window_border_width 1 hc set_layout max -hc add default2 -hc remove_monitor 1 -hc move_monitor 0 1920x1080+0+0 -hc add_monitor 1680x1050+1920+0 default2 - -hc pad 0 20 -5 -5 -5 -hc pad 1 -5 -5 -5 -5 +hc pad 0 -5 -5 -5 -5 hc mousebind $modkey-Button1 move hc mousebind $modkey-Button2 resize diff --git a/.emacs.d/init.el b/.emacs.d/init.el index cd9c9b5..d2d68bc 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -354,6 +354,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 @@ -391,6 +394,7 @@ (savehist-mode) (show-paren-mode) (winner-mode) +(display-battery-mode) (smex-initialize) (help-at-pt-set-timer) @@ -399,10 +403,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 79b5f6e..979e804 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -191,7 +191,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) @@ -400,7 +399,7 @@ When dealing with braces, add another line and indent that too." "Function for `org-mode-hook'." (auto-fill-mode) (yas-minor-mode) - (setq-local comment-auto-fill-only-comments nil)) + (set (make-local-variable 'comment-auto-fill-only-comments) nil)) (defun oni:php-mode-func () "Function for `php-mode-hook'." @@ -422,7 +421,6 @@ length -1. Use the `-' character. WIN is ignored." (rainbow-delimiters-mode) (fci-mode) (pretty-symbols-mode) - (yas-minor-mode) (auto-fill-mode)) (defun oni:python-mode-func () diff --git a/.emacs.d/snippets/org-mode/heading b/.emacs.d/snippets/org-mode/heading index 9d5451e..48dca7f 100644 --- a/.emacs.d/snippets/org-mode/heading +++ b/.emacs.d/snippets/org-mode/heading @@ -2,8 +2,8 @@ # name: Heading # key: * # -- -${1:*} ${2:TODO} $3 -${1:$(make-string (length text) ?\ )} :PROPERTIES: -${1:$(make-string (length text) ?\ )} :CATEGORY: $4 -${1:$(make-string (length text) ?\ )} :END: -${1:$(make-string (length text) ?\ )} $0
\ No newline at end of file +*$1 ${2:TODO} $3 + ${1:$(make-string (length text) ?\ )} :PROPERTIES: + ${1:$(make-string (length text) ?\ )} :CATEGORY: $4 + ${1:$(make-string (length text) ?\ )} :END: + ${1:$(make-string (length text) ?\ )} $0
\ No newline at end of file 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" |