[XMonad] Make stack build actually work

This commit is contained in:
Ivan Malison 2016-10-29 10:16:41 -07:00
parent 277cc22ec4
commit 7a4d3a3575
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
3 changed files with 20 additions and 13 deletions

View File

@ -1,16 +1,11 @@
-- Initial imalison-xmonad.cabal generated by cabal init. For further
-- documentation, see http://haskell.org/cabal/users-guide/
name: imalison-xmonad name: imalison-xmonad
version: 0.1.0.0 version: 0.1.0.0
synopsis: Ivan Malison's xmonad configuration. synopsis: Ivan Malison's xmonad configuration.
-- description:
homepage: https://github.com/IvanMalison/dotfiles/tree/master/dotfiles/xmonad homepage: https://github.com/IvanMalison/dotfiles/tree/master/dotfiles/xmonad
license: GPL-3 license: GPL-3
license-file: LICENSE license-file: LICENSE
author: Ivan Malison author: Ivan Malison
maintainer: IvanMalison@gmail.com maintainer: IvanMalison@gmail.com
-- copyright:
category: System category: System
build-type: Simple build-type: Simple
extra-source-files: ChangeLog.md extra-source-files: ChangeLog.md
@ -18,12 +13,19 @@ cabal-version: >=1.10
executable imalison-xmonad executable imalison-xmonad
main-is: xmonad.hs main-is: xmonad.hs
-- other-modules:
-- other-extensions:
build-depends: base >=4.9 && <4.10, build-depends: base >=4.9 && <4.10,
-- I use a custom version
xmonad-contrib>=0.12, xmonad-contrib>=0.12,
X11>=1.6.1.2, X11>=1.6.1.2,
gtk-traymanager>=0.1.6,
xmonad>=0.12, xmonad>=0.12,
taffybar>=0.4.6 -- I use a custom version
taffybar>=0.4.6,
transformers>=0.5.2.0,
aeson>=0.11.2.1,
bytestring>=0.10.8.1,
containers>=0.5.7.1,
directory>=1.2.6.2,
filepath>=1.4.1.0
hs-source-dirs: . hs-source-dirs: .
default-language: Haskell2010 default-language: Haskell2010

View File

@ -2,9 +2,13 @@ flags: {}
extra-package-dbs: [] extra-package-dbs: []
packages: packages:
- '.' - '.'
- location:
git: git@github.com:IvanMalison/xmonad-contrib.git
commit: e43579f80fc189eacabf73cbec7db61eab681219
- location:
git: git@github.com:IvanMalison/taffybar.git
commit: 39e3a95e9c2eae37ff8b67eaa31bbd18503859b1
extra-deps: extra-deps:
- xmonad-contrib-0.12
- taffybar-0.4.6
- gtk-traymanager-0.1.6 - gtk-traymanager-0.1.6
resolver: lts-7.0 resolver: lts-7.0
# For advanced use and comprehensive documentation of the format, please see: # For advanced use and comprehensive documentation of the format, please see:
@ -13,7 +17,6 @@ resolver: lts-7.0
# Resolver to choose a 'specific' stackage snapshot or a compiler version. # Resolver to choose a 'specific' stackage snapshot or a compiler version.
# A snapshot resolver dictates the compiler version and the set of packages # A snapshot resolver dictates the compiler version and the set of packages
# to be used for project dependencies. For example: # to be used for project dependencies. For example:
#
# resolver: lts-3.5 # resolver: lts-3.5
# resolver: nightly-2015-09-21 # resolver: nightly-2015-09-21
# resolver: ghc-7.10.2 # resolver: ghc-7.10.2

View File

@ -1,4 +1,6 @@
{-# LANGUAGE TypeSynonymInstances, MultiParamTypeClasses #-} {-# LANGUAGE TypeSynonymInstances, MultiParamTypeClasses #-}
module Main where
import Control.Monad import Control.Monad
import Control.Monad.Trans.Maybe import Control.Monad.Trans.Maybe
import Data.Aeson import Data.Aeson
@ -36,6 +38,7 @@ import XMonad.Util.CustomKeys
import qualified XMonad.Util.ExtensibleState as XS import qualified XMonad.Util.ExtensibleState as XS
import XMonad.Util.NamedWindows (getName) import XMonad.Util.NamedWindows (getName)
main = xmonad $ def main = xmonad $ def
{ modMask = mod4Mask { modMask = mod4Mask
, terminal = "urxvt" , terminal = "urxvt"
@ -183,8 +186,7 @@ toggleFadingForActiveWindow = withWindowSet $ \windowSet -> do
greedyFocusWindow w ws = W.focusWindow w $ W.greedyView greedyFocusWindow w ws = W.focusWindow w $ W.greedyView
(fromMaybe (W.currentTag ws) $ W.findTag w ws) ws (fromMaybe (W.currentTag ws) $ W.findTag w ws) ws
shiftToEmptyAndView = doTo Next EmptyWS DWO.getSortByOrder shiftToEmptyAndView = doTo Next EmptyWS DWO.getSortByOrder (windows . shiftThenView)
(windows . shiftThenView)
myRaiseNextMaybe = raiseNextMaybeCustomFocus greedyFocusWindow myRaiseNextMaybe = raiseNextMaybeCustomFocus greedyFocusWindow
myBringNextMaybe = raiseNextMaybeCustomFocus bringWindow myBringNextMaybe = raiseNextMaybeCustomFocus bringWindow