summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/awesome/rc.lua2
-rwxr-xr-x.config/herbstluftwm/autostart8
-rw-r--r--.emacs.d/init.el5
-rw-r--r--.emacs.d/site-lisp/oni.el2
-rw-r--r--.emacs.d/snippets/org-mode/heading10
-rw-r--r--.offlineimaprc2
-rw-r--r--.xbindkeysrc.scm8
-rw-r--r--.zprofile5
8 files changed, 24 insertions, 18 deletions
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 745721d..4056944 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -98,6 +98,7 @@ modkey = "Mod4"
-- Table of layouts to cover with awful.layout.inc, order matters.
local layouts =
{
+ awful.layout.suit.magnifier,
awful.layout.suit.tile,
awful.layout.suit.tile.left,
awful.layout.suit.tile.bottom,
@@ -108,7 +109,6 @@ local layouts =
awful.layout.suit.spiral.dwindle,
awful.layout.suit.max,
awful.layout.suit.max.fullscreen,
- awful.layout.suit.magnifier,
awful.layout.suit.floating
}
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 232f9cf..21ecce6 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -261,6 +261,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
@@ -289,6 +292,7 @@
(savehist-mode)
(show-paren-mode)
(winner-mode)
+(display-battery-mode)
(smex-initialize)
(help-at-pt-set-timer)
@@ -297,7 +301,6 @@
(load custom-file)
;; (load "rudel-loaddefs.el")
-(load (expand-file-name "~/quicklisp/slime-helper.el"))
(unless (server-running-p)
(server-start))
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index 1afe1d6..ea64d3f 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -358,7 +358,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'."
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"))
diff --git a/.zprofile b/.zprofile
index 631e8a0..5d4d30e 100644
--- a/.zprofile
+++ b/.zprofile
@@ -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"