summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-10-28 21:21:27 +0100
committertv <tv@shackspace.de>2015-10-28 21:21:27 +0100
commit00d03622d187397fd0cb46c17fe1f6750883d774 (patch)
treecb828f05b6095e6c2eb5d2107304bf851d3585ff /tv/2configs
parent057c4836c10eebf3141d7b20a9e942518357606c (diff)
tv xmonad: print stuff to stderr everywhere
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/xserver/xmonad/Main.hs10
-rw-r--r--tv/2configs/xserver/xmonad/Util/Debunk.hs16
-rw-r--r--tv/2configs/xserver/xmonad/Util/Rhombus.hs1
3 files changed, 5 insertions, 22 deletions
diff --git a/tv/2configs/xserver/xmonad/Main.hs b/tv/2configs/xserver/xmonad/Main.hs
index fe7304904..2cc48efa3 100644
--- a/tv/2configs/xserver/xmonad/Main.hs
+++ b/tv/2configs/xserver/xmonad/Main.hs
@@ -9,6 +9,7 @@ module Main where
import Control.Exception
import Text.Read (readEither)
import XMonad
+import System.IO (hPutStrLn, stderr)
import System.Environment (getArgs, withArgs, getEnv, getEnvironment)
import System.Posix.Process (executeFile)
import XMonad.Prompt (defaultXPConfig)
@@ -36,7 +37,6 @@ import XMonad.Layout.PerWorkspace (onWorkspace)
--import XMonad.Actions.Submap
import Util.Pager
import Util.Rhombus
-import Util.Debunk
import Util.Shutdown
@@ -88,10 +88,10 @@ xmonad' conf = do
path <- getEnv "XMONAD_STATE"
try (readFile path) >>= \case
Right content -> do
- putStrLn ("resuming from " ++ path)
+ hPutStrLn stderr ("resuming from " ++ path)
withArgs ("--resume" : lines content) (xmonad conf)
Left e -> do
- putStrLn (displaySomeException e)
+ hPutStrLn stderr (displaySomeException e)
xmonad conf
getWorkspaces0 :: IO [String]
@@ -104,7 +104,7 @@ getWorkspaces0 =
Left e -> warn e
Right y -> return y
where
- warn msg = putStrLn ("getWorkspaces0: " ++ msg) >> return []
+ warn msg = hPutStrLn stderr ("getWorkspaces0: " ++ msg) >> return []
displaySomeException :: SomeException -> String
displaySomeException = displayException
@@ -135,7 +135,7 @@ myKeys conf = Map.fromList $
, ((0 , xK_Menu ), gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.view) )
, ((_S , xK_Menu ), gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.shift) )
, ((_C , xK_Menu ), toggleWS)
- , ((_4 , xK_Menu ), rhombus horseConfig (liftIO . printToErrors) ["Correct", "Horse", "Battery", "Staple", "Stuhl", "Tisch"] )
+ , ((_4 , xK_Menu ), rhombus horseConfig (liftIO . hPutStrLn stderr) ["Correct", "Horse", "Battery", "Staple", "Stuhl", "Tisch"] )
-- %! Rotate through the available layout algorithms
, ((_4 , xK_space ), sendMessage NextLayout)
diff --git a/tv/2configs/xserver/xmonad/Util/Debunk.hs b/tv/2configs/xserver/xmonad/Util/Debunk.hs
deleted file mode 100644
index b4772e582..000000000
--- a/tv/2configs/xserver/xmonad/Util/Debunk.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-module Util.Debunk
- ( printToErrors
- ) where
-
-import XMonad
-import System.FilePath ( (</>) )
-import Control.Exception ( bracket )
-import System.IO ( hPrint, stderr, openFile, hClose, IOMode( AppendMode ) )
-
-
-printToErrors x = do
- dir <- getXMonadDir
- let base = dir </> "xmonad"
- err = base ++ ".errors"
- bracket (openFile err AppendMode) hClose $ \h -> hPrint h x
-
diff --git a/tv/2configs/xserver/xmonad/Util/Rhombus.hs b/tv/2configs/xserver/xmonad/Util/Rhombus.hs
index 5f43cb28a..9d46e4127 100644
--- a/tv/2configs/xserver/xmonad/Util/Rhombus.hs
+++ b/tv/2configs/xserver/xmonad/Util/Rhombus.hs
@@ -18,7 +18,6 @@ import XMonad.Util.Font
import XMonad.Util.Image ( drawIcon )
import XMonad.Util.XUtils
-import Util.Debunk
import Util.Submap
import Util.XUtils
import Util.Font