xmonad-vanessa 0.2.0.3 → 0.2.0.4

raw patch · 5 files changed

+13/−14 lines, 5 files

Files

• cabal.project.local +0/−1
• src/XMonad/Config/Vanessa.hs +8/−6
• src/XMonad/Util/MediaKeys.hs +2/−3
• src/XMonad/Util/Volume.hs +2/−3
• xmonad-vanessa.cabal +1/−1

@@ -1,2 +1,1 @@-with-compiler: ghc-8.2.2 optimization: 2

@@ -12,7 +12,6 @@ import           XMonad.Actions.GridSelect import           XMonad.Hooks.DynamicLog import           XMonad.Hooks.ManageDocks-import           XMonad.Layout.Fullscreen import           XMonad.Layout.Hidden import           XMonad.Layout.Mosaic import           XMonad.Layout.Reflect@@ -33,19 +32,20 @@     where config' = myConfig  -- | Custom configuration taking in one pipe to xmobar-myConfig xmproc = fullscreenSupport $ docks $ def { terminal   = "alacritty"+myConfig xmproc = docks $ def { terminal   = "alacritty"                               , keys       = newKeys                               , layoutHook = myLayout                               , logHook    = vLogHook xmproc                               , manageHook = myManageHook <+> manageDocks                               , handleEventHook = docksEventHook-                              , startupHook = docksStartupHook }+                              , startupHook = docksStartupHook+                              }  -- | get the current music playing (assumed to be in number 5) musicString :: X String musicString = do     winset <- gets windowset-    wt <- maybe (pure "") (fmap show . getName) . fmap snd . listToMaybe $ zip ((map tag . workspaces) winset) (allWindows winset)+    wt <- maybe (pure "") (fmap show . getName) . fmap snd . listToMaybe $ zip ((fmap tag . workspaces) winset) (allWindows winset)     pure . xmobarColor "green" "black" . take 40 $ wt  -- | Provides custom hooks to xmonad. This disables printing the window title/connects xmobar and xmonad.@@ -86,16 +86,18 @@              [ --volume control                ((modm, xK_Up), raiseVolume (5 :: Word))              , ((modm, xK_Down), lowerVolume (5 :: Word))-             , ((modm, xK_Delete), toggleMute)+             , ((modm, xK_BackSpace), toggleMute)              --personal (extra) media keys              , ((modm, xK_Page_Down), audioNext)              , ((modm, xK_Page_Up), audioPrev)              , ((modm, xK_Home), audioPlayPause)+             , ((modm, xK_Return), audioPlayPause)              --brightness              , ((modm, xK_Left), brighten (-100))              , ((modm, xK_Right), brighten 100)              --program shortcuts              , ((modm, xK_q), spawn "spotify")+             , ((modm .|. shiftMask, xK_t), spawn "thunderbird")              , ((modm .|. shiftMask, xK_n), spawn "firefox")              , ((modm .|. controlMask, xK_Return), spawn "gnome-terminal")              --launch bar@@ -131,7 +133,7 @@  -- | Function giving keybindings to undo keysToRemove :: XConfig Layout -> M.Map (KeyMask, KeySym) (X ())-keysToRemove XConfig {XMonad.modMask = modm} = M.fromList+keysToRemove XConfig { XMonad.modMask = modm } = M.fromList         [ ((modm, xK_p), pure ()) ]  -- | Gives a better ratio for the master pane and lets us spiral windows

@@ -9,7 +9,6 @@                              ) where  import qualified Data.Map                     as M-import           Data.Semigroup import           Graphics.X11.ExtraTypes.XF86 import           Graphics.X11.Types import           XMonad.Core@@ -17,7 +16,7 @@  -- | Given your keymaps, add the media keybindings mediaKeys :: M.Map (KeyMask, KeySym) (X ()) -> M.Map (KeyMask, KeySym) (X ())-mediaKeys = M.fromList . (<>) mediaKeyList . M.toList+mediaKeys = M.fromList . (++) mediaKeyList . M.toList  mediaKeyList :: [((KeyMask, KeySym), X ())] mediaKeyList = [ ((0, xF86XK_AudioNext), audioNext)@@ -30,7 +29,7 @@  -- | Helper function for use with dbus sp :: String -> X ()-sp = spawn . (<>) "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."+sp = spawn . (++) "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."  -- | Action in the 'X' monad to go to next audioNext :: X ()

@@ -1,7 +1,6 @@ -- | Utils to use to control volume via amixer module XMonad.Util.Volume where -import           Data.Semigroup import           XMonad  -- | Generate action in the X monad to@@ -14,8 +13,8 @@  -- | Raise volume raiseVolume :: (Integral a, Show a) => a -> X ()-raiseVolume n = vol $ show n <> "%+"+raiseVolume n = vol $ show n ++ "%+"  -- | Lower volume lowerVolume :: (Integral a, Show a) => a -> X ()-lowerVolume n = vol $ show n <> "%-"+lowerVolume n = vol $ show n ++ "%-"

@@ -1,6 +1,6 @@ cabal-version: >=1.10 name: xmonad-vanessa-version: 0.2.0.3+version: 0.2.0.4 license: BSD3 license-file: LICENSE copyright: 2017-2018 Vanessa McHale