From 0c151aa260086e8301a598f8e2c398831d50b886 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Wed, 28 Oct 2020 22:29:56 -0400
Subject: More statusbar config

---
 desktop/.conkyrc          | 4 ++--
 desktop/.xmonad/xmonad.hs | 9 ++++-----
 desktop/.xsession         | 5 ++++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/desktop/.conkyrc b/desktop/.conkyrc
index e8f61e5..e225ba1 100644
--- a/desktop/.conkyrc
+++ b/desktop/.conkyrc
@@ -10,5 +10,5 @@ conky.config = {
 -- ${if_pa_sink_muted}OFF$else${pa_sink_volume}%$endif
 
 conky.text = [[
-${if_up wlp39s0}wlan ${wireless_essid wlp39s0}${endif} \
-^fg()${time %a %b %d %I:%M%P}]]
+${if_up wlp39s0}^fn(FontAwesome)^fn() ${wireless_essid wlp39s0}${endif}^p(20)\
+^fg()${time %m月%d号%H:%M}]]
diff --git a/desktop/.xmonad/xmonad.hs b/desktop/.xmonad/xmonad.hs
index 7aeeefd..aff7522 100644
--- a/desktop/.xmonad/xmonad.hs
+++ b/desktop/.xmonad/xmonad.hs
@@ -32,8 +32,8 @@ cDark = "#252526"
 cBlue = "#237AD3"
   
 myDzenPP = def { ppCurrent  = dzenColor "white" cBlue . pad
-               , ppVisible  = dzenColor "white" cDark . pad
-               , ppHidden   = dzenColor "white" cViolet . pad
+               , ppVisible  = dzenColor "white" cViolet . pad
+               , ppHidden   = dzenColor "white" cDark . pad
                , ppHiddenNoWindows = const ""
                , ppUrgent   = dzenColor "red" "yellow" . pad
                , ppWsSep    = ""
@@ -48,7 +48,7 @@ myDzenPP = def { ppCurrent  = dzenColor "white" cBlue . pad
                , ppTitle    = (("^p(10)^bg(" ++ cDark ++ ") ") ++) . dzenEscape
                } 
 
-dzenCommand = "dzen2 -dock -x 0 -y 0 -h 24 -expand right -fn \"DejaVu Sans:pixelsize=20\" -ta l -bg '" ++ cDark ++ "' -fg '#f4f4f4'"
+dzenCommand = "dzen2 -dock -x 0 -y 0 -h 24 -expand right -fn \"WenQuanYi Micro Hei-16\" -ta l -bg '" ++ cDark ++ "' -fg '#f4f4f4'"
 
 bar :: LayoutClass l Window => XConfig l -> IO (XConfig (ModifiedLayout AvoidStruts l))
 bar = statusBar dzenCommand myDzenPP toggleStrutsKey
@@ -71,7 +71,7 @@ myConfig host =
     , borderWidth = 2
     , focusedBorderColor = cBlue
     , normalBorderColor = cDark
-    , workspaces = pure <$> "\"<>PYFAOEUI"
+    , workspaces = ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十" ]
     , manageHook = manageHook kdeConfig <+> insertPosition Below Newer <+> (isDialog --> doF W.shiftMaster <+> doF W.swapDown)
     }
   where myLayout = onHost layoutScreensHost (verticalTiled ||| horizontalTiled ||| Full) $
@@ -179,7 +179,6 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
                     , xK_period
                     , xK_p
                     , xK_y
-                    , xK_f
                     , xK_a
                     , xK_o
                     , xK_e
diff --git a/desktop/.xsession b/desktop/.xsession
index f737088..640c88b 100755
--- a/desktop/.xsession
+++ b/desktop/.xsession
@@ -16,11 +16,14 @@ pasystray &
 xss-lock -- /usr/bin/env xscreensaver-command --lock &
 xset -b
 dzen2 -dock -x 0 -h 24 -e 'onstart=lower' -bg '#252526' -p &
-conky | dzen2 -dock -geometry 1000x24-1150+0 -expand left -fn "DejaVu Sans:pixelsize=20" -ta r -bg '#252526' -fg '#f4f4f4' &
+conky | dzen2 -dock -geometry 1000x24-1150+0 -expand left -fn "WenQuanYi Micro Hei-16" -ta r -bg '#252526' -fg '#f4f4f4' &
 trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 100 --widthtype pixel --transparent true --height 24 --tint 0x252526  --alpha 0 &
+
 [[ -f /etc/nixos/configuration.nix ]] || \
   redshift -l 40:-70 -r -t 5500:3700 &
 
+nm-applet --no-agent &
+
 if which autorandr >/dev/null; then
   autorandr --change
 fi
-- 
cgit v1.2.3