From 1e567f46b1f6599e4ad21107969d656c9b533e52 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Thu, 28 May 2020 18:25:50 +0200
Subject: [PATCH] Update

---
 xmobar.hs          |  3 ++-
 xmonad.hs          |  4 ++--
 xpm/haskell_20.xpm | 25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 xpm/haskell_20.xpm

diff --git a/xmobar.hs b/xmobar.hs
index bce9f9c..05c7c0e 100644
--- a/xmobar.hs
+++ b/xmobar.hs
@@ -1,6 +1,7 @@
 Config { font     = "xft:HackNerdFont:size=10:antialias=true,IPAPGothic:size=10:antialias=true"
        , bgColor  = "#002b36"
        , fgColor  = "#839496"
+       , iconRoot = "/home/kubat/.xmonad/xpm/"
        , position = Static { xpos = 0 , ypos = 0, width = 1920, height = 18 }
        , commands =  [ Run Cpu       ["-t", "<fc=#b58900>CPU</fc> <total>%", "-L","3","-H","50"] 50
                      , Run Memory    ["-t","<fc=#b58900>RAM</fc> <usedratio>%","-H","80","-L","10"] 50
@@ -24,5 +25,5 @@ Config { font     = "xft:HackNerdFont:size=10:antialias=true,IPAPGothic:size=10:
        , allDesktops    = False
        , sepChar        = "%"
        , alignSep       = "}{"
-       , template       = " %StdinReader% } %lektor% { %cpu% | %coretemp% | %memory% | <fc=#b58900>Vol</fc> %volume% | %vpn%%battery% | <fc=#b58900>%date%</fc> "
+       , template       = " <icon=haskell_20.xpm/> %StdinReader% } %lektor% { %cpu% | %coretemp% | %memory% | <fc=#b58900>Vol</fc> %volume% | %vpn%%battery% | <fc=#b58900>%date%</fc> "
 }
diff --git a/xmonad.hs b/xmonad.hs
index 741b3ae..90d5d3d 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -103,13 +103,13 @@ main = do
           , ppLayout            = xmobarColor       "#b58900" "" . (Prelude.map toLower)
           , ppSep               = " "
           , ppWsSep             = " "
-          , ppCurrent           = xmobarColor       "#268bd2" ""        . wrap "[" "]" . (Prelude.map toUpper)
+          , ppCurrent           = xmobarColor       "#268bd2" ""        . (\ x -> x) . (Prelude.map toUpper)
           , ppVisible           = xmobarColor       "grey"    ""        . (\ x -> x) . (Prelude.map toUpper)
           , ppHidden            = xmobarColor       "grey"    ""        . (\ x -> x) . (Prelude.map toUpper)
           , ppHiddenNoWindows   = xmobarColor       "#707070" ""        . (\ x -> x) . (Prelude.map toUpper)
           , ppUrgent            = xmobarColor       "white"   "#268bd2" . (\ x -> x) . (Prelude.map toUpper)
           , ppVisibleNoWindows  = Just (xmobarColor "#707070" ""        . (\ x -> x) . (Prelude.map toUpper))
-          , ppOrder             = \(ws:layout:title:extra) -> [ws, "(" ++ (replace "minimize " "" layout) ++ ")"]
+          , ppOrder             = \(ws:layout:title:extra) -> [ (replace "minimize " "" layout), ws ]
           }
     } `additionalKeys` myAdditionalKeys
 
diff --git a/xpm/haskell_20.xpm b/xpm/haskell_20.xpm
new file mode 100644
index 0000000..0342ac9
--- /dev/null
+++ b/xpm/haskell_20.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * haskell_20_xpm[] = {
+"20 20 2 1",
+" 	c None",
+".	c #839496",
+"                    ",
+"                    ",
+"                    ",
+".... ....           ",
+" .... ...           ",
+"  ... ....          ",
+"  .... ....         ",
+"   .... ... ........",
+"    ... .... .......",
+"    .... ....       ",
+"    .... ....       ",
+"    ... ...... .....",
+"   .... ....... ....",
+"  .... .... ...     ",
+"  ... ....  ....    ",
+" .... ...    ....   ",
+".... ....     ...   ",
+"                    ",
+"                    ",
+"                    "};
-- 
GitLab