From 9d91488fd8f6bc48c7e49fa31fa41734cbcd4437 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 24 Jun 2019 18:59:57 -0700 Subject: [PATCH] [XMonad] Use xdg-desktop-entry --- dotfiles/config/taffybar/taffybar | 2 +- dotfiles/config/taffybar/taffybar.hs | 1 - dotfiles/config/xmonad/imalison-xmonad.cabal | 2 +- dotfiles/config/xmonad/xmonad.hs | 5 ++--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index 398dc00a..104a1c12 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit 398dc00a9427fd2c120aa65f212fdecc7046fae1 +Subproject commit 104a1c12f722f362ccb60794119de95f96f18ea8 diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index dc6122b7..175bdbe8 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -117,7 +117,6 @@ cssFileByHostname = ] main = do - -- logDebug hostName <- getHostName homeDirectory <- getHomeDirectory cssFilePath <- diff --git a/dotfiles/config/xmonad/imalison-xmonad.cabal b/dotfiles/config/xmonad/imalison-xmonad.cabal index d610c076..fd134b06 100644 --- a/dotfiles/config/xmonad/imalison-xmonad.cabal +++ b/dotfiles/config/xmonad/imalison-xmonad.cabal @@ -24,7 +24,7 @@ executable imalison-xmonad , process>=1.4.3.0 , safe , split - , taffybar + , xdg-desktop-entry , transformers>=0.5.2.0 , tuple >= 0.3.0.2 , utf8-string diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs index 5306e9c2..ce5672fc 100644 --- a/dotfiles/config/xmonad/xmonad.hs +++ b/dotfiles/config/xmonad/xmonad.hs @@ -28,11 +28,10 @@ import Network.HostName import PagerHints import Safe import System.Directory +import System.Environment.XDG.DesktopEntry import System.FilePath.Posix import System.IO.Unsafe import System.Process -import System.Taffybar.Hooks -import System.Taffybar.Information.XDG.DesktopEntry import Text.Printf import Unsafe.Coerce import XMonad hiding ( (|||) ) @@ -401,7 +400,7 @@ desktopEntriesMap :: MM.MultiMap String DesktopEntry desktopEntriesMap = unsafePerformIO $ do tee id (>>= writeToHomeDirLog . show . MM.keys) $ - directoryEntriesByClassName <$> getDirectoryEntriesDefault + indexDesktopEntriesByClassName <$> getDirectoryEntriesDefault lookupIconFromClasses classes = getFirst $ fold $ First . deIcon <$>