ndwarshuis
/
xman
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH use nix

This commit is contained in:
Nathan Dwarshuis 2022-07-23 00:38:24 -04:00
parent 1b9fa101fa
commit fb8e9fb353
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Main.hs
View File

@ -25,11 +25,10 @@
module Main (main) where module Main (main) where
import Control.Monad (forM_, forever, void, when) import Control.Monad
import Control.Monad.Reader import Control.Monad.Reader
import Control.Monad.State import Control.Monad.State
import Data.List (any)
import Data.Maybe (isJust) import Data.Maybe (isJust)
import Graphics.X11.Types import Graphics.X11.Types
@ -97,6 +96,7 @@ parse ("-t":t:b:rs) = initXMan rs $ mkXcapeProcess (Just t) b
parse (b:rs) = initXMan rs $ mkXcapeProcess Nothing b parse (b:rs) = initXMan rs $ mkXcapeProcess Nothing b
parse _ = usage parse _ = usage
-- | The name of the xcape executable
xcapeExe :: String xcapeExe :: String
xcapeExe = "xcape" xcapeExe = "xcape"
@ -141,11 +141,10 @@ initXMan rs cp = do
updateXCape -- set the initial state before entering main loop updateXCape -- set the initial state before entering main loop
forever $ handle =<< io (nextEvent dpy e >> getEvent e) forever $ handle =<< io (nextEvent dpy e >> getEvent e)
-- | Return true if xcape is installed
checkXcape :: IO Bool checkXcape :: IO Bool
checkXcape = isJust <$> findExecutable xcapeExe checkXcape = isJust <$> findExecutable xcapeExe
-- | Lift an IO monad into the XMan context -- | Lift an IO monad into the XMan context
io :: MonadIO m => IO a -> m a io :: MonadIO m => IO a -> m a
io = liftIO io = liftIO

10
stack.yaml
View File

@ -17,7 +17,7 @@
# #
# resolver: ./custom-snapshot.yaml # resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-14.12 resolver: lts-16.31
# User packages to be built. # User packages to be built.
# Various formats can be used as shown in the example below. # Various formats can be used as shown in the example below.
@ -64,3 +64,11 @@ packages:
# #
# Allow a newer minor version of GHC than the snapshot specifies # Allow a newer minor version of GHC than the snapshot specifies
# compiler-check: newer-minor # compiler-check: newer-minor
nix:
enable: true
packages:
- xorg.libxcb
- xorg.libXrender
- xorg.libXrandr
- xorg.libXScrnSaver
- xorg.libXext