Use XDG directories for user configuration and user data files

src/Idris/Info.hs

@@ -17,6 +17,7 @@ module Idris.Info
  , getIdrisCC
  , getIdrisVersion
  , getIdrisVersionNoGit
+ , getIdrisUserConfigDir
  , getIdrisUserDataDir
  , getIdrisInitScript
  , getIdrisHistoryFile
@@ -68,9 +69,13 @@ getIdrisVersion = showVersion S.version ++ suffix
 getIdrisVersionNoGit = S.version
 
 
--- | Get the platform-specific, user-specific Idris dir
+-- | Get the platform-specific, user-specific Idris configuration dir
+getIdrisUserConfigDir :: IO FilePath
+getIdrisUserConfigDir = getXdgDirectory XdgConfig "idris"
+
+-- | Get the platform-specific, user-specific Idris data dir
 getIdrisUserDataDir :: IO FilePath
-getIdrisUserDataDir = getAppUserDataDirectory "idris"
+getIdrisUserDataDir = getXdgDirectory XdgData "idris"
 
 -- | Locate the platform-specific location for the init script
 getIdrisInitScript :: IO FilePath

src/Idris/Info/Show.hs

@@ -107,6 +107,7 @@ showIdrisInfo = do
 
  putStrLn "Paths:"
  ldir <- getIdrisLibDir
+ cdir <- getIdrisUserConfigDir
  udir <- getIdrisUserDataDir
  ddir <- getIdrisDocDir
  idir <- getIdrisDataDir
@@ -116,7 +117,8 @@ showIdrisInfo = do
  putStrLn $ unwords ["-", "Library Dir:", ldir]
  putStrLn $ unwords ["-", "C RTS Dir:", crdir]
  putStrLn $ unwords ["-", "JS RTS Dir:", jrdir]
- putStrLn $ unwords ["-", "User Dir:", udir]
+ putStrLn $ unwords ["-", "User Data Config:", cdir]
+ putStrLn $ unwords ["-", "User Data Dir:", udir]
  putStrLn $ unwords ["-", "Documentation Dir:", ddir]
 
  putStrLn "Flags:"

src/Idris/Main.hs

@@ -188,11 +188,12 @@ idrisMain opts =
  Just expr -> execScript expr
 
  -- Create Idris data dir + repl history and config dir
- idrisCatch (do dir <- runIO $ getIdrisUserDataDir
- exists <- runIO $ doesDirectoryExist dir
- unless exists $ logLvl 1 ("Creating " ++ dir)
- runIO $ createDirectoryIfMissing True (dir </> "repl"))
- (\e -> return ())
+ sequence_ $
+ [idrisCatch (do dir <- runIO $ getDir
+ exists <- runIO $ doesDirectoryExist dir
+ unless exists $ logLvl 1 ("Creating " ++ dir)
+ runIO $ createDirectoryIfMissing True (dir </> "repl"))
+ (\e -> return ()) | getDir <- [getIdrisUserConfigDir, getIdrisUserDataDir]]
 
  historyFile <- runIO $ getIdrisHistoryFile