From 5c6cd059e8395d7f24d4b199e59c8c2f562dc438 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 3 Nov 2013 21:21:21 +0100
Subject: New stow hierarchy

---
 xmonad/.gitignore         |  3 ---
 xmonad/.xmonad/.gitignore |  3 +++
 xmonad/.xmonad/xmonad.hs  | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 xmonad/Makefile           | 10 --------
 xmonad/xmonad.hs          | 59 -----------------------------------------------
 5 files changed, 62 insertions(+), 72 deletions(-)
 delete mode 100644 xmonad/.gitignore
 create mode 100644 xmonad/.xmonad/.gitignore
 create mode 100644 xmonad/.xmonad/xmonad.hs
 delete mode 100644 xmonad/Makefile
 delete mode 100644 xmonad/xmonad.hs

(limited to 'xmonad')

diff --git a/xmonad/.gitignore b/xmonad/.gitignore
deleted file mode 100644
index 11a024e..0000000
--- a/xmonad/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.o
-xmonad-x86_64-linux
-xmonad.hi
diff --git a/xmonad/.xmonad/.gitignore b/xmonad/.xmonad/.gitignore
new file mode 100644
index 0000000..11a024e
--- /dev/null
+++ b/xmonad/.xmonad/.gitignore
@@ -0,0 +1,3 @@
+*.o
+xmonad-x86_64-linux
+xmonad.hi
diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
new file mode 100644
index 0000000..617ab53
--- /dev/null
+++ b/xmonad/.xmonad/xmonad.hs
@@ -0,0 +1,59 @@
+--
+-- It overrides a few basic settings, reusing all other defaults.
+--
+
+import XMonad
+import XMonad.Actions.WindowGo
+import XMonad.Hooks.FadeInactive
+import XMonad.Hooks.ManageDocks
+import XMonad.Hooks.ManageHelpers
+import XMonad.Util.EZConfig
+
+import qualified XMonad.StackSet as W
+
+myLogHook :: X ()
+myLogHook = fadeOutLogHook fadeRules
+
+fadeRules :: Query Rational
+fadeRules = do
+  fullscreen <- isFullscreen
+  conkeror <- className =? "Conkeror"
+  chromium <- className =? "Chromium"
+  mplayer <- className =? "MPlayer"
+  return $ case () of _ | fullscreen -> 1
+                        | conkeror -> 0.95
+                        | chromium -> 1
+                        | mplayer -> 1
+                        | otherwise -> 0.9
+
+main = xmonad $ defaultConfig
+       { terminal = "urxvt"
+       , focusFollowsMouse = False
+       , clickJustFocuses = False
+       , modMask = mod4Mask
+       , layoutHook = avoidStruts $ layoutHook defaultConfig
+       , logHook = myLogHook
+       , manageHook = manageHook defaultConfig <+> manageDocks }
+       `additionalKeysP`
+       [
+         ("C-z ,", screenWorkspace 0 >>= flip whenJust (windows . W.view)),
+         ("C-z .", screenWorkspace 1 >>= flip whenJust (windows . W.view)),
+         ("C-z S-c", spawn "urxvt"),
+         ("C-z S-e", spawn "editor"),
+         ("C-z c", runOrRaiseNext "urxvt" (className =? "URxvt")),
+         ("C-z e", runOrRaiseNext "editor" (className =? "Emacs")),
+         ("C-z w", runOrRaiseNext "conkeror" (className =? "Conkeror")),
+         ("M-S-1", spawn "dmenu_run"),
+         ("M-n", windows W.focusDown),
+         ("M-p", windows W.focusUp),
+         ("M1-C-l", spawn "i3lock -c 000000"),
+         ("<XF86AudioPlay>", spawn "mpc toggle"),
+         ("<XF86AudioStop>", spawn "mcp stop"),
+         ("<XF86AudioMute>", spawn "amixer sset Master toggle"),
+         ("<XF86AudioLowerVolume>", spawn "mpc volume -5"),
+         ("<XF86AudioRaiseVolume>", spawn "mpc volume +5"),
+         ("<XF86AudioPrev>", spawn "mpc prev"),
+         ("<XF86AudioNext>", spawn "mpc next")
+       ]
+       `removeKeysP`
+       [ ("M-j"), ("M-k") ]
diff --git a/xmonad/Makefile b/xmonad/Makefile
deleted file mode 100644
index 9b8d3c3..0000000
--- a/xmonad/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-DESTDIR := $(DESTDIR)/.xmonad
-objects=xmonad-x86_64-linux xmonad.hs
-
-GHC := ghc
-
-include ../dotfiles.mk
-
-xmonad-x86_64-linux: xmonad.hs
-	$(GHC) --make $^ -i -ilib -fforce-recomp -main-is main  -v0 -o $@
-install-xmonad-x86_64-linux: MODE=744
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
deleted file mode 100644
index 617ab53..0000000
--- a/xmonad/xmonad.hs
+++ /dev/null
@@ -1,59 +0,0 @@
---
--- It overrides a few basic settings, reusing all other defaults.
---
-
-import XMonad
-import XMonad.Actions.WindowGo
-import XMonad.Hooks.FadeInactive
-import XMonad.Hooks.ManageDocks
-import XMonad.Hooks.ManageHelpers
-import XMonad.Util.EZConfig
-
-import qualified XMonad.StackSet as W
-
-myLogHook :: X ()
-myLogHook = fadeOutLogHook fadeRules
-
-fadeRules :: Query Rational
-fadeRules = do
-  fullscreen <- isFullscreen
-  conkeror <- className =? "Conkeror"
-  chromium <- className =? "Chromium"
-  mplayer <- className =? "MPlayer"
-  return $ case () of _ | fullscreen -> 1
-                        | conkeror -> 0.95
-                        | chromium -> 1
-                        | mplayer -> 1
-                        | otherwise -> 0.9
-
-main = xmonad $ defaultConfig
-       { terminal = "urxvt"
-       , focusFollowsMouse = False
-       , clickJustFocuses = False
-       , modMask = mod4Mask
-       , layoutHook = avoidStruts $ layoutHook defaultConfig
-       , logHook = myLogHook
-       , manageHook = manageHook defaultConfig <+> manageDocks }
-       `additionalKeysP`
-       [
-         ("C-z ,", screenWorkspace 0 >>= flip whenJust (windows . W.view)),
-         ("C-z .", screenWorkspace 1 >>= flip whenJust (windows . W.view)),
-         ("C-z S-c", spawn "urxvt"),
-         ("C-z S-e", spawn "editor"),
-         ("C-z c", runOrRaiseNext "urxvt" (className =? "URxvt")),
-         ("C-z e", runOrRaiseNext "editor" (className =? "Emacs")),
-         ("C-z w", runOrRaiseNext "conkeror" (className =? "Conkeror")),
-         ("M-S-1", spawn "dmenu_run"),
-         ("M-n", windows W.focusDown),
-         ("M-p", windows W.focusUp),
-         ("M1-C-l", spawn "i3lock -c 000000"),
-         ("<XF86AudioPlay>", spawn "mpc toggle"),
-         ("<XF86AudioStop>", spawn "mcp stop"),
-         ("<XF86AudioMute>", spawn "amixer sset Master toggle"),
-         ("<XF86AudioLowerVolume>", spawn "mpc volume -5"),
-         ("<XF86AudioRaiseVolume>", spawn "mpc volume +5"),
-         ("<XF86AudioPrev>", spawn "mpc prev"),
-         ("<XF86AudioNext>", spawn "mpc next")
-       ]
-       `removeKeysP`
-       [ ("M-j"), ("M-k") ]
-- 
cgit v1.3-2-g0d8e