Merge branch 'xmonad-rejoice'

.config/taffybar/taffybar.hs

@@ -0,0 +1,24 @@
import System.Taffybar
import System.Taffybar.Systray
import System.Taffybar.XMonadLog
import System.Taffybar.SimpleClock
import System.Taffybar.Widgets.PollingGraph
import System.Information.CPU
cpuCallback = do
    (_, systemLoad, totalLoad) <- cpuLoad
    return [ totalLoad, systemLoad ]
main = do
    let cpuCfg = defaultGraphConfig {
            graphDataColors = [(0, 1, 0, 1), (1, 0, 1, 0.5)]
        }
        clock = textClockNew Nothing "<span fgcolor='orange'>%a %b %_d %H:%M</span>" 1
        log = xmonadLogNew
        tray = systrayNew
        cpu = pollingGraphNew cpuCfg 3 cpuCallback
    defaultTaffybar defaultTaffybarConfig {
        barHeight = 15,
        startWidgets = [log],
        endWidgets = [tray, clock, cpu]
    }

.tmux.conf

@@ -9,7 +9,7 @@
set -g default-terminal "screen-256color"
set -g status-utf8 on
set-option -g set-titles on
set-option -g set-titles-string "tmux(#I): #W"
set-option -g set-titles-string "tmux(#I): #W #T"
set -g status-bg black
set -g status-fg white
@@ -20,6 +20,7 @@ set -g status-right '#[fg=colour235]lu #[fg=yellow]#(ls ~/.mails/lu/INBOX/new |
setw -g window-status-format '#[fg=green]#I #[fg=white]#W#[default]  '
setw -g window-status-current-format '#[bg=white,fg=black]⮀ #W #[bg=black,fg=white]⮀'
set -g status off
bind-key f set -g status
bind-key -n F1 select-window -t 0

.vimrc

@@ -63,6 +63,12 @@ set directory=~/.vim/tmp/
set undodir=~/.vim/tmp/
set undofile
let &t_ts = "\e]2;"
let &t_fs = "\007"
set title
set titleold=
au BufEnter * let &titlestring=substitute(expand('%:p'), '^' . $HOME, '~', '')
" Wrap lines in textfiles automatically.
" (Any way to enable in comments?)
set textwidth=72

.xinitrc

@@ -5,6 +5,7 @@ xsetroot -cursor_name left_ptr
xrdb -merge ~/.Xresources
#feh -bg-scale /usr/share/themes/Adwaita/backgrounds/stripes.jpg
eval `dbus-launch --auto-syntax`
start-pulseaudio-x11
pactl set-sink-volume 0 1.0
nm-applet&
@@ -13,6 +14,6 @@ nm-applet&
#xmodmap ~/.swap-esc-capslock
synclient TouchpadOff=1
exec awesome
#exec xmonad
#exec awesome
exec xmonad
#exec gnome-session

.xmonad/xmonad.hs

@@ -1,16 +1,20 @@
import XMonad
import XMonad.Hooks.DynamicLog
import XMonad.Actions.SpawnOn (manageSpawn, spawnHere)
import DBus.Client (connectSession)
import System.Taffybar.XMonadLog (dbusLog)
import XMonad.Hooks.ManageDocks (manageDocks, avoidStruts)
import XMonad.Hooks.ManageHelpers
import XMonad.Layout.Tabbed (simpleTabbed)
import XMonad.Layout.NoBorders (smartBorders)
import XMonad.Layout.Fullscreen (fullscreenEventHook, fullscreenManageHook)
import XMonad.Util.Run (spawnPipe)
import XMonad.Util.EZConfig (additionalKeys)
import Graphics.X11.ExtraTypes.XF86
import qualified XMonad.StackSet as W
import System.IO (hPutStrLn)
import Data.IORef.MonadIO (newIORef, readIORef, modifyIORef)
import Control.Monad (when)
import Data.Monoid (All (All))
import qualified XMonad.StackSet as W
-- My XMonad config (right now it's mostly copied from elsewhere...
--
@@ -18,60 +22,37 @@ import qualified XMonad.StackSet as W
--  * Some kind of launcher
--  * Logging framework (like reading urls from Firefox and the like)
(??) :: Query a -> (a -> Bool) -> Query Bool
(??) = flip fmap
main = do
    kbMap <- newIORef "us"
    xmobar <- spawnPipe "xmobar"
    dbusClient <- connectSession
    xmonad $ defaultConfig {
        modMask  = mod4Mask,
        terminal = "urxvt",
        terminal = "sakura -x tmux",
        -- Ignore docks (via some WM_* attribute?)
        manageHook = composeAll [
                        className ?? (\cn -> any (cn ==) ["Skype", "Pidgin", "Geary"]) --> doF (W.shift "3"),
                        className =? "Exe" --> doFullFloat,
                        manageSpawn,
                        manageDocks,
                        -- Allow fullscreen
                        composeOne [ isFullscreen -?> doFullFloat ]
                        fullscreenManageHook
                     ] <+> manageHook defaultConfig,
        -- Don't overwrite the section used by docks
        layoutHook = avoidStruts $ layoutHook defaultConfig ||| simpleTabbed,
        logHook = dynamicLogWithPP xmobarPP {
            ppOutput = hPutStrLn xmobar,
            ppTitle = xmobarColor "green" ""
        },
        handleEventHook = evHook
        layoutHook = avoidStruts $ smartBorders $ layoutHook defaultConfig,
        handleEventHook = fullscreenEventHook,
        logHook = dbusLog dbusClient
     } `additionalKeys` [
        ((mod4Mask, xK_l), changeKbMap kbMap)
     ]
  where changeKbMap kbMap = do
          kb <- readIORef kbMap
          let switchLang cur = if cur == "us" then "de" else "us"
          spawn $ "setxkbmap " ++ switchLang kb
          modifyIORef kbMap switchLang
        ((mod4Mask, xK_b), spawnHere "chromium --allow-file-access-from-files"),
        ((mod4Mask .|. shiftMask, xK_b), spawnHere "chromium --incognito --allow-file-access-from-files"),
evHook :: Event -> X All
evHook (ClientMessageEvent _ _ _ dpy win typ dat) = do
    state <- getAtom "_NET_WM_STATE"
    fullsc <- getAtom "_NET_WM_STATE_FULLSCREEN"
    isFull <- runQuery isFullscreen win
        ((0, xF86XK_AudioMute), spawn "amixer set Master toggle"),
        ((0, xF86XK_AudioLowerVolume), spawn "amixer set Master 5%-"),
        ((0, xF86XK_AudioRaiseVolume), spawn "amixer set Master 5%+"),
        ((mod4Mask .|. shiftMask, xK_m), spawnHere "quodlibet"),
    let remove = 0
        add = 1
        toggle = 2
        ((mod4Mask .|. shiftMask, xK_Tab), spawn "xkbswap"),
        ((mod4Mask .|. shiftMask, xK_l), spawn "slock"),
        ptype = 4
        action = head dat
    when (typ == state && (fromIntegral fullsc) `elem` tail dat) $ do
        when (action == add || (action == toggle && not isFull)) $ do
            io $ changeProperty32 dpy win state ptype propModeReplace [fromIntegral fullsc]
            fullFloat win
        when (head dat == remove || (action == toggle && isFull)) $ do
            io $ changeProperty32 dpy win state ptype propModeReplace []
            tileWin win
    return $ All False
evHook _ = return $ All True
fullFloat, tileWin :: Window -> X () 
fullFloat w = windows $ W.float w (W.RationalRect 0 0 1 1)
tileWin   w = windows $ W.sink w
        ((mod4Mask, xK_q), restart "xmonad" True)
     ]

.zshrc

@@ -29,6 +29,7 @@ function repo_branch {
autoload colors && colors
function precmd {
	echo -ne "\033]0;\007"
	user="%{$fg[red]%}%n%{$reset_color%}"
	dir="%{$fg[cyan]%}%~%{$reset_color%}"
	lastcmd="$history[$(($HISTCMD-1))]"