diff options
author | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
---|---|---|
committer | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
commit | 6278e2e634b05027d31220afd328a9f7fe77c6f1 (patch) | |
tree | 3dbec6a3880ca980694def0d737a477b68254691 /.sawfish | |
parent | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (diff) | |
parent | 15adc911da3f5b527c74b6bb67d677898d6a173e (diff) | |
download | dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.tar.gz dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.zip |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.sawfish')
-rw-r--r-- | .sawfish/Makefile | 4 | ||||
-rw-r--r-- | .sawfish/rc | 42 |
2 files changed, 35 insertions, 11 deletions
diff --git a/.sawfish/Makefile b/.sawfish/Makefile new file mode 100644 index 0000000..b680366 --- /dev/null +++ b/.sawfish/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/.sawfish +objects=rc + +include ../dotfiles.mk diff --git a/.sawfish/rc b/.sawfish/rc index 684ce1d..cfb3a16 100644 --- a/.sawfish/rc +++ b/.sawfish/rc @@ -2,11 +2,12 @@ (require 'rep.regexp) (require 'sawfish.wm.commands.grow-pack) (require 'sawfish.wm.commands.shrink-yank) +(require 'sawfish.wm.commands.x-cycle) (require 'sawfish.wm.ext.match-window) (require 'sawfish.wm.util.display-window) (require 'sawfish.wm.util.prompt) (require 'sawfish.wm.util.window-order) -(require 'sawfish.wm.commands.x-cycle) +(require 'sawfish.wm.util.stacking) (define oni:window-packing-keymap (make-keymap)) (define oni:window-growing-keymap (make-keymap)) @@ -60,7 +61,10 @@ raise it." (if w (display-window w) (call-command `(run-shell-command ,command))))) +(setq custom-show-symbols t) (setq default-frame-style 'naquadah) +(setq default-font (get-font-typed "Xft" "Monaco-10")) +(setq grow-is-maximize nil) (setq prompt-color (cons (get-color "#eeeeec") (get-color "#111113"))) (setq user-apps-menu @@ -115,23 +119,39 @@ raise it." ;; (ungrab-keymap global-keymap) (bind-keys global-keymap - "Super-!" '(run-shell-command (prompt-for-string "Run: ")) "C-M-l" '(run-shell-command "i3lock -c \"#000000\"") - "Super-e" '(oni:run-or-raise (getenv "EDITOR") #:class "Emacs") + "C-Super-B" 'shrink-window-left + "C-Super-F" 'shrink-window-right + "C-Super-N" 'shrink-window-down + "C-Super-P" 'shrink-window-up + "C-Super-TAB" 'cycle-class + "C-Super-`" 'popup-window-menu + "C-Super-b" 'grow-window-left + "C-Super-f" 'grow-window-right + "C-Super-n" 'grow-window-down + "C-Super-p" 'grow-window-up + "Menu" 'popup-root-menu + "Super-!" '(run-shell-command (prompt-for-string "Run: ")) + "Super-:" 'call-command + "Super-B" 'yank-window-left + "Super-C" '(run-shell-command "urxvt") "Super-E" '(run-shell-command (getenv "EDITOR")) - "Super-w" '(oni:run-or-raise (getenv "BROWSER") #:class "Conkeror") + "Super-F" 'yank-window-right + "Super-M" 'maximize-window-toggle + "Super-N" 'yank-window-down + "Super-P" 'yank-window-up + "Super-TAB" 'cycle-windows "Super-W" '(run-shell-command (getenv "BROWSER")) + "Super-`" 'popup-root-menu + "Super-b" 'pack-window-left "Super-c" '(oni:run-or-raise "urxvt" #:class "URxvt") - "Super-C" '(run-shell-command "urxvt") - "Super-TAB" 'cycle-windows - "C-Super-TAB" 'cycle-class - "Super-x" oni:extended-keymap + "Super-e" '(oni:run-or-raise (getenv "EDITOR") #:class "Emacs") "Super-f" 'pack-window-right - "Super-b" 'pack-window-left "Super-n" 'pack-window-down "Super-p" 'pack-window-up - "Menu" 'popup-root-menu - "Super-M" 'maximize-window-toggle) + "Super-w" '(oni:run-or-raise (getenv "BROWSER") #:class "Conkeror") + "Super-x" oni:extended-keymap + ) ;; (grab-keymap global-keymap) (add-window-matcher '((WM_CLASS . "^(Firefox|Conkeror)/Navigator$")) |