xmonad-vanessa 0.2.0.1 → 0.2.0.2
raw patch · 9 files changed
+17/−43 lines, 9 filesdep ~xmonaddep ~xmonad-contribsetup-changed
Dependency ranges changed: xmonad, xmonad-contrib
Files
- Setup.hs +0/−2
- app/Main.hs +1/−1
- app/ParseKBLayout.hs +1/−1
- cabal.project.local +0/−3
- src/XMonad/Config/Vanessa.hs +1/−1
- src/XMonad/Util/Keyboard.hs +3/−5
- src/XMonad/Util/MediaKeys.hs +2/−7
- test/Spec.hs +6/−10
- xmonad-vanessa.cabal +3/−13
− Setup.hs
@@ -1,2 +0,0 @@-import Distribution.Simple-main = defaultMain
app/Main.hs view
@@ -1,3 +1,3 @@-import XMonad.Config.Vanessa+import XMonad.Config.Vanessa main = vConfig
app/ParseKBLayout.hs view
@@ -1,3 +1,3 @@-import XMonad.Util.Keyboard (showKBLayout)+import XMonad.Util.Keyboard (showKBLayout) main = show <$> showKBLayout
cabal.project.local view
@@ -1,5 +1,2 @@-constraints: xmonad-vanessa -library with-compiler: ghc-8.2.2 optimization: 2-tests: true-documentation: true
src/XMonad/Config/Vanessa.hs view
@@ -25,7 +25,7 @@ import XMonad.Util.Run import XMonad.Util.Volume --- TODO screenshot/wallpaper?+-- TODO wallpaper? -- | IO action of the whole thing vConfig :: IO ()
src/XMonad/Util/Keyboard.hs view
@@ -12,8 +12,6 @@ , dzongkha ) where --- TODO module for battery- import Control.Composition import System.Process import XMonad@@ -51,10 +49,10 @@ out <- lines <$> readCreateProcess (shell "setxkbmap -query") "" let strip = dropWhile (==' ') . drop 1 . dropWhile (/=':') .* (!!) let line = strip out- if length out == 3 then- pure (Simple (line 2))+ if length out /= 3 then+ pure (Simple (line 1)) else- pure (Regional (line 2) (line 3))+ pure (Regional (line 1) (line 2)) -- | Tibetan keyboard layout tibetan :: KbLayout
src/XMonad/Util/MediaKeys.hs view
@@ -8,15 +8,12 @@ , audioPlayPause ) where ---gives us media keys+import qualified Data.Map as M+import Data.Semigroup import Graphics.X11.ExtraTypes.XF86 import Graphics.X11.Types---XMonad stuff import XMonad.Core import XMonad.Util.Volume---monads and all that-import qualified Data.Map as M-import Data.Monoid -- | Given your keymaps, add the media keybindings mediaKeys :: M.Map (KeyMask, KeySym) (X ()) -> M.Map (KeyMask, KeySym) (X ())@@ -46,5 +43,3 @@ -- | Action in the 'X' monad to play/pause audioPlayPause :: X () audioPlayPause = sp "PlayPause"---- lana = sp "OpenUri string:6QOU3FhUkPeA2RtaXcvgi7"
test/Spec.hs view
@@ -1,12 +1,8 @@-import Test.Hspec-import XMonad.Util.Keyboard-import XMonad hiding (liftX)-import Control.Monad+import Control.Monad+import Test.Hspec+import XMonad.Util.Keyboard -main = hspec $ do- --describe "setLang" $ do- -- it "sets current keyboard layout" $ do- -- (liftX $ setLang (Simple "us")) >>= ((`shouldBe` ()))- describe "parseKB" $ do- it "gets current keyboard" $ do+main = hspec $+ describe "parseKB" $+ it "gets current keyboard" $ (show <$> parseKB) >>= (`shouldBe` "US")
xmonad-vanessa.cabal view
@@ -1,6 +1,6 @@ cabal-version: >=1.10 name: xmonad-vanessa-version: 0.2.0.1+version: 0.2.0.2 license: BSD3 license-file: LICENSE copyright: 2017-2018 Vanessa McHale@@ -20,10 +20,6 @@ type: darcs location: https://hub.darcs.net/vmchale/xmonad-vanessa -flag library- description:- Don't build an executable- library exposed-modules: XMonad.Config.Vanessa@@ -36,8 +32,8 @@ ghc-options: -Wall build-depends: base >=4.8 && <5,- xmonad >=0.13,- xmonad-contrib >=0.13,+ xmonad >=0.5,+ xmonad-contrib >=0.5, composition-prelude -any, containers -any, process -any,@@ -56,9 +52,6 @@ build-depends: base -any, xmonad-vanessa -any- - if flag(library)- buildable: False executable getkb main-is: ParseKBLayout.hs@@ -68,9 +61,6 @@ build-depends: base -any, xmonad-vanessa -any- - if flag(library)- buildable: False test-suite xmonad-test type: exitcode-stdio-1.0