aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--XMonad/Config/Droundy.hs21
-rw-r--r--XMonad/Config/Sjanssen.hs2
-rw-r--r--XMonadContrib.cabal5
3 files changed, 17 insertions, 11 deletions
diff --git a/XMonad/Config/Droundy.hs b/XMonad/Config/Droundy.hs
index deab5b9..38f009b 100644
--- a/XMonad/Config/Droundy.hs
+++ b/XMonad/Config/Droundy.hs
@@ -1,6 +1,5 @@
-----------------------------------------------------------------------------
-- |
--- Module : DefaultConfig.hs
-- Copyright : (c) Spencer Janssen 2007
-- License : BSD3-style (see LICENSE)
--
@@ -14,14 +13,18 @@
--
------------------------------------------------------------------------
-module Main (main) where
+module XMonad.Config.Droundy where
--
-- Useful imports
--
import Control.Monad.Reader ( asks )
-import XMonad hiding (workspaces, manageHook, numlockMask)
-import qualified XMonad (workspaces, manageHook, numlockMask)
+
+import XMonad hiding
+ (workspaces,manageHook,numlockMask,keys,mouseBindings)
+import qualified XMonad
+ (workspaces,manageHook,numlockMask,keys,mouseBindings)
+
import XMonad.Layouts hiding ( (|||) )
import XMonad.Operations
import qualified XMonad.StackSet as W
@@ -29,7 +32,7 @@ import Data.Bits ((.|.))
import qualified Data.Map as M
import System.Exit
import Graphics.X11.Xlib
-import XMonad.EventLoop
+import XMonad.Core
-- % Extension-provided imports
@@ -293,8 +296,8 @@ defaultConfig = XConfig { borderWidth = 1 -- Width of the window border in pixel
, normalBorderColor = "#dddddd" -- Border color for unfocused windows.
, focusedBorderColor = "#00ff00" -- Border color for focused windows.
, XMonad.numlockMask = numlockMask
- , XMonad.keys = Main.keys
- , XMonad.mouseBindings = Main.mouseBindings
+ , XMonad.keys = keys
+ , XMonad.mouseBindings = mouseBindings
-- | Perform an arbitrary action on each internal state change or X event.
-- Examples include:
-- * do nothing
@@ -305,5 +308,5 @@ defaultConfig = XConfig { borderWidth = 1 -- Width of the window border in pixel
, XMonad.manageHook = manageHook
}
-main :: IO ()
-main = makeMain defaultConfig
+-- main :: IO ()
+-- main = makeMain defaultConfig
diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs
index 81adec8..8fb7695 100644
--- a/XMonad/Config/Sjanssen.hs
+++ b/XMonad/Config/Sjanssen.hs
@@ -5,7 +5,7 @@ import qualified XMonad.StackSet as W
import XMonad.Layouts
import XMonad.Layout.Tabbed
import XMonad.Operations
-import XMonad.DefaultConfig (defaultConfig)
+import XMonad.Config (defaultConfig)
import XMonad.Layout.NoBorders
import XMonad.Hooks.DynamicLog
import XMonad.Prompt
diff --git a/XMonadContrib.cabal b/XMonadContrib.cabal
index 9a09254..eb5ce52 100644
--- a/XMonadContrib.cabal
+++ b/XMonadContrib.cabal
@@ -10,11 +10,12 @@ license-file: LICENSE
author: Spencer Janssen
maintainer: sjanssen@cse.unl.edu
build-depends: base>=2.0, mtl, unix, X11==1.3.0, xmonad==0.4
+ghc-options: -funbox-strict-fields -O2 -fasm -Wall -optl-Wl,-s
+ghc-prof-options: -prof -auto-all
extra-source-files: README scripts/generate-configs scripts/run-xmonad.sh
scripts/xinitrc scripts/xmonad-acpi.c
scripts/xmonad-clock.c tests/test_SwapWorkspaces.hs
tests/tests_XPrompt.hs
- configs/droundy.hs
exposed-modules: XMonad.Actions.Commands
XMonad.Actions.ConstrainedResize
XMonad.Actions.CopyWindow
@@ -39,6 +40,8 @@ exposed-modules: XMonad.Actions.Commands
XMonad.Actions.WindowBringer
XMonad.Actions.WmiiActions
XMonad.Config.Sjanssen
+ XMonad.Config.Dons
+ -- XMonad.Config.Droundy
XMonad.Hooks.DynamicLog
-- XMonad.Hooks.ManageDocks
XMonad.Hooks.SetWMName