Mercurial > dotfiles
changeset 198:ccab2fe3a256
Merge
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Tue, 06 Apr 2010 15:13:50 -0500 |
parents | 88ba320ffe7d (diff) 5dbff8b65be7 (current diff) |
children | cf3ed4aa3e52 |
files | .elisp/settings/40.modes.el |
diffstat | 6 files changed, 22 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.elisp/settings/40.modes.el +++ b/.elisp/settings/40.modes.el @@ -72,3 +72,5 @@ point." (add-hook 'python-mode-hook 'af-python-mode-hook) (add-hook 'compilation-mode-hook '(lambda () (local-set-key "g" 'recompile))) + +(column-number-mode)
--- a/.elisp/settings/50.preferences.el +++ b/.elisp/settings/50.preferences.el @@ -25,6 +25,10 @@ (background-color . "black") ) ) + +;; tell ipython we have a dark background +(setq py-python-command-args (quote ("-i"))) + ; always highlight matching paren (show-paren-mode 1) @@ -70,3 +74,8 @@ ;; use y or n instead of yes or no (fset 'yes-or-no-p 'y-or-n-p) + +;; customized theme faces +(custom-set-faces + '(magit-diff-add ((t (:foreground "DarkGreen"))) 'now) + '(magit-item-highlight ((t (:background "grey19"))) 'now))
--- a/.hgignore +++ b/.hgignore @@ -4,9 +4,10 @@ syntax:re ^\.(?!bashrc$|best_unicode|elisp|emacs$|gitconfig$|hg|inputrc$|ipython|irbrc$|pdbrc\.py$|python|screenrc$|shell\.d|vim|zfun|zsh) # above RE fails to exclude viminfo -\.viminfo +^\.viminfo$ ^\.hg\. -\.ipython/db +^\.ipython/db$ +^\.python-eggs$ # above RE fails to exclude history or machine-specific files ^\..*(?=history|machine).*
--- a/.shell.d/50.vcs_functions.sh +++ b/.shell.d/50.vcs_functions.sh @@ -204,7 +204,7 @@ function vcs_current_branch() { } function git_next_unmerged_file() { - git status | grep unmerged | head -n 1 | sed 's/.*: //' + git status | egrep '(unmerged|both modified)' | head -n 1 | sed 's/.*: //' } alias git-next-unmerged-file=git_next_unmerged_file
--- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -1,10 +1,12 @@ import XMonad import XMonad +import XMonad.Hooks.ManageDocks import XMonad.Layout import XMonad.Layout.Column import XMonad.Layout.LayoutBuilder import XMonad.Util.EZConfig +import XMonad.Util.Run(spawnPipe) myLayout = augie2 ||| augie1 ||| Full where augie2 = ((layoutN 2 (relBox 0 0 1 0.75) (Just $ relBox 0 0 1 1) $ (Tall 1 0.03 0.75)) @@ -14,10 +16,12 @@ myLayout = augie2 ||| augie1 ||| Full main :: IO () -main = xmonad $ defaultConfig +main = do + xmobar <- spawnPipe "xmobar" + xmonad $ defaultConfig { terminal = "urxvt -sr -bg Black -fg White" , modMask = mod4Mask - , layoutHook = myLayout + , layoutHook = avoidStruts myLayout } `additionalKeys` [ ((mod4Mask, xK_a), spawn "gnome-screensaver-command --lock") ]