From 5d68d556eaa107fc01a67c661f600812a4a64e40 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Wed, 5 Dec 2018 00:03:34 +0000
Subject: Minor tweaks

---
 src/Top.hs        | 6 ++----
 src/lib/Bottom.hs | 2 +-
 src/lib/Config.hs | 5 ++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Top.hs b/src/Top.hs
index c14b56a..8a74ad5 100644
--- a/src/Top.hs
+++ b/src/Top.hs
@@ -21,18 +21,16 @@ dynNetwork p = DynNetwork (p <~> ["-t", "↑ <tx> ↓ <rx>"
                                  , "-L", "20", "-H", "1024000"
                                  , "-m", "5", "-W", "10", "-S", "Off"]) 10
 
-network p = Network "tun0" ["-t", "<dev>:", "-x", ""] 20
-
 config p = (baseConfig p) {
-  position = Static {xpos=1, ypos=1, width=1920, height=24}
+  position = TopSize C 100 defaultHeight
   , textOffset = 16
   , commands = [ Run (topProc p)
                , Run (wireless p)
                , Run (multiCPU p)
                , Run (cpuFreq p)
                , Run (dynNetwork p)
-               , Run (network p)
                , Run XMonadLog
+               , Run (Network "tun0" ["-t", "<dev>:", "-x", ""] 20)
                , Run (DateZone "%H" "en_US" "US/Pacific" "laTime" 10)
                , Run (Date "%R" "datetime" 10)
                ]
diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs
index 1c70548..4bd6614 100644
--- a/src/lib/Bottom.hs
+++ b/src/lib/Bottom.hs
@@ -65,7 +65,7 @@ brightness = Brightness ["--", "-D", "intel_backlight"] 10
 memory = Memory ["-t","<available> M", "-p", "2"] 20
 
 config cs p = (baseConfig p) {
-  position = BottomSize C 100 24
+  position = BottomSize C 100 defaultHeight
   , textOffset = 17
   , commands = [ Run (uptime p)
                , Run brightness
diff --git a/src/lib/Config.hs b/src/lib/Config.hs
index 94b9211..4ab805d 100644
--- a/src/lib/Config.hs
+++ b/src/lib/Config.hs
@@ -1,9 +1,12 @@
-module Config (Palette, baseConfig, palette, (<~>)) where
+module Config (Palette, baseConfig, palette, (<~>), defaultHeight) where
 
 import System.Environment (lookupEnv)
 
 import Xmobar
 
+defaultHeight :: Int
+defaultHeight = 24
+
 data Palette = Palette { pNormal :: String
                        , pLow :: String
                        , pHigh :: String
-- 
cgit v1.2.3