diff options
author | Stefan Ritter <xeno@thehappy.de> | 2013-01-06 16:32:50 +0100 |
---|---|---|
committer | Stefan Ritter <xeno@thehappy.de> | 2013-01-06 16:32:50 +0100 |
commit | 0eb06ba89af67ade0e4f29e8ee3ce9d632aff53c (patch) | |
tree | 9b0302aa7dc7922d87acd23136508ce0ba00f9da /xmonad | |
parent | bd2bb5d2835d8637e28b4d9839c9a0427a4647db (diff) |
Diffstat (limited to 'xmonad')
-rw-r--r-- | xmonad/xmonad-0.7.hs | 87 | ||||
-rw-r--r-- | xmonad/xmonad-0.8.hs | 70 |
2 files changed, 0 insertions, 157 deletions
diff --git a/xmonad/xmonad-0.7.hs b/xmonad/xmonad-0.7.hs deleted file mode 100644 index 4a8443a..0000000 --- a/xmonad/xmonad-0.7.hs +++ /dev/null @@ -1,87 +0,0 @@ -import XMonad -import System.Exit - -import qualified XMonad.StackSet as W -import qualified Data.Map as M - -myTerminal = "x-terminal-emulator" -myBorderWidth = 1 -myModMask = mod1Mask -myNumlockMask = mod2Mask -myWorkspaces = ["1","2","3","4","5","6","7","8","9"] -myNormalBorderColor = "#dddddd" -myFocusedBorderColor = "#ff0000" - -myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ - [ ((modMask, xK_Return), spawn $ XMonad.terminal conf) - , ((modMask, xK_q ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") - , ((modMask, xK_l ), spawn "xscreensaver-command -lock") - , ((modMask .|. shiftMask, xK_c ), kill) - , ((modMask, xK_space ), sendMessage NextLayout) - , ((modMask .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf) - , ((modMask, xK_r ), windows W.focusDown) - , ((modMask, xK_g ), windows W.focusUp ) - , ((modMask, xK_m ), windows W.focusMaster ) - , ((modMask .|. shiftMask, xK_r ), windows W.swapDown ) - , ((modMask .|. shiftMask, xK_g ), windows W.swapUp ) - , ((modMask, xK_n ), sendMessage Shrink) - , ((modMask, xK_t ), sendMessage Expand) - , ((modMask, xK_h ), withFocused $ windows . W.sink) - , ((modMask, xK_comma ), sendMessage (IncMasterN 1)) - , ((modMask, xK_period), sendMessage (IncMasterN (-1))) - , ((modMask, xK_k ), spawn "amixer -c 0 set PCM 2dB+") - , ((modMask, xK_s ), spawn "amixer -c 0 set PCM 2dB-") - ] - ++ - - [((m .|. modMask, k), windows $ f i) - | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9] - , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] - -myMouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $ - [ ((modMask, button1), (\w -> focus w >> mouseMoveWindow w)) - , ((modMask, button2), (\w -> focus w >> windows W.swapMaster)) - , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w)) - ] - -myLayout = tiled ||| Mirror tiled ||| Full - where - tiled = Tall nmaster delta ratio - nmaster = 1 - ratio = 55/100 - delta = 1/100 - -myManageHook = composeAll - [ className =? "MPlayer" --> doFloat - , className =? "Skype" --> doFloat - , className =? "Twinkle" --> doFloat - , className =? "VirtualBox" --> doFloat - , className =? "Gimp" --> doFloat - , className =? "Qemu-launcher" --> doFloat - , className =? "Default - Wine desktop" --> doFloat - ] - -myFocusFollowsMouse :: Bool -myFocusFollowsMouse = True - -myLogHook = return () - -main = xmonad defaults - -defaults = defaultConfig { - terminal = myTerminal, - focusFollowsMouse = myFocusFollowsMouse, - borderWidth = myBorderWidth, - modMask = myModMask, - numlockMask = myNumlockMask, - workspaces = myWorkspaces, - normalBorderColor = myNormalBorderColor, - focusedBorderColor = myFocusedBorderColor, - - keys = myKeys, - mouseBindings = myMouseBindings, - - layoutHook = myLayout, - manageHook = myManageHook, - logHook = myLogHook - } diff --git a/xmonad/xmonad-0.8.hs b/xmonad/xmonad-0.8.hs deleted file mode 100644 index 1d3664b..0000000 --- a/xmonad/xmonad-0.8.hs +++ /dev/null @@ -1,70 +0,0 @@ -import XMonad -import XMonad.Hooks.DynamicLog -import XMonad.Hooks.ManageDocks -import XMonad.Hooks.EwmhDesktops -import XMonad.Actions.CycleWS -import System.Exit -import System.IO - -import qualified XMonad.StackSet as W -import qualified Data.Map as M - -myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ - [ ((modMask, xK_Return), spawn $ XMonad.terminal conf) - , ((modMask, xK_q ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") - , ((modMask, xK_l ), spawn "slock") - , ((modMask .|. shiftMask, xK_c ), kill) - , ((modMask, xK_space ), sendMessage NextLayout) - , ((modMask .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf) - , ((modMask, xK_r ), windows W.focusDown) - , ((modMask, xK_g ), windows W.focusUp ) - , ((modMask, xK_m ), windows W.focusMaster ) - , ((modMask .|. shiftMask, xK_r ), windows W.swapDown ) - , ((modMask .|. shiftMask, xK_g ), windows W.swapUp ) - , ((modMask, xK_h ), prevWS) - , ((modMask, xK_f ), nextWS) - , ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) - , ((modMask , xK_n ), sendMessage (IncMasterN 1)) - , ((modMask , xK_t ), sendMessage (IncMasterN (-1))) - ] - ++ - - [((m .|. modMask, k), windows $ f i) - | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9] - , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] - -myMouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $ - [ ((modMask, button1), (\w -> focus w >> mouseMoveWindow w)) - , ((modMask, button2), (\w -> focus w >> windows W.swapMaster)) - , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w)) - ] - -myManageHook = composeAll - [ className =? "MPlayer" --> doFloat - , className =? "Gimp" --> doFloat - , className =? "PacketTracer5" --> doFloat - ] - -myFocusFollowsMouse :: Bool -myFocusFollowsMouse = True - -myConfig = defaultConfig - -main = do -xmonad $ defaultConfig { - manageHook = manageDocks <+> manageHook defaultConfig, - terminal = "x-terminal-emulator", - focusFollowsMouse = myFocusFollowsMouse, - borderWidth = 1, - modMask = mod1Mask, - numlockMask = mod2Mask, - workspaces = ["0","1","2","3","4","5","6","7","8","9"], - normalBorderColor = "#dddddd", - focusedBorderColor = "#ff0000", - keys = myKeys, - mouseBindings = myMouseBindings, - logHook = ewmhDesktopsLogHook, - --logHook = dynamicLog, - layoutHook = avoidStruts $ layoutHook defaultConfig, - startupHook = return() - } |