[XMonad] Use xdg-desktop-entry

This commit is contained in:
Ivan Malison 2019-06-24 18:59:57 -07:00
parent 948decd385
commit 9d91488fd8
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 4 additions and 6 deletions

@ -1 +1 @@
Subproject commit 398dc00a9427fd2c120aa65f212fdecc7046fae1 Subproject commit 104a1c12f722f362ccb60794119de95f96f18ea8

View File

@ -117,7 +117,6 @@ cssFileByHostname =
] ]
main = do main = do
-- logDebug
hostName <- getHostName hostName <- getHostName
homeDirectory <- getHomeDirectory homeDirectory <- getHomeDirectory
cssFilePath <- cssFilePath <-

View File

@ -24,7 +24,7 @@ executable imalison-xmonad
, process>=1.4.3.0 , process>=1.4.3.0
, safe , safe
, split , split
, taffybar , xdg-desktop-entry
, transformers>=0.5.2.0 , transformers>=0.5.2.0
, tuple >= 0.3.0.2 , tuple >= 0.3.0.2
, utf8-string , utf8-string

View File

@ -28,11 +28,10 @@ import Network.HostName
import PagerHints import PagerHints
import Safe import Safe
import System.Directory import System.Directory
import System.Environment.XDG.DesktopEntry
import System.FilePath.Posix import System.FilePath.Posix
import System.IO.Unsafe import System.IO.Unsafe
import System.Process import System.Process
import System.Taffybar.Hooks
import System.Taffybar.Information.XDG.DesktopEntry
import Text.Printf import Text.Printf
import Unsafe.Coerce import Unsafe.Coerce
import XMonad hiding ( (|||) ) import XMonad hiding ( (|||) )
@ -401,7 +400,7 @@ desktopEntriesMap :: MM.MultiMap String DesktopEntry
desktopEntriesMap = desktopEntriesMap =
unsafePerformIO $ do unsafePerformIO $ do
tee id (>>= writeToHomeDirLog . show . MM.keys) $ tee id (>>= writeToHomeDirLog . show . MM.keys) $
directoryEntriesByClassName <$> getDirectoryEntriesDefault indexDesktopEntriesByClassName <$> getDirectoryEntriesDefault
lookupIconFromClasses classes = lookupIconFromClasses classes =
getFirst $ fold $ First . deIcon <$> getFirst $ fold $ First . deIcon <$>