aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--XMonad/xmonad.hs36
1 files changed, 14 insertions, 22 deletions
diff --git a/XMonad/xmonad.hs b/XMonad/xmonad.hs
index e6f8e2f4..bd74489c 100644
--- a/XMonad/xmonad.hs
+++ b/XMonad/xmonad.hs
@@ -58,17 +58,12 @@ import XMonad.Util.NamedScratchpad
myStartupHook :: X ()
myStartupHook = do
- --spawnOnce "/home/zt/.xmonad/baraction | lemonbar -b -g 500x21+800+0 -B '#171520' -F '#ffffff' -f 'Source Han Sans JP:size=10'"
- spawnOnce "brave"
--- spawnOnce "sleep 3; trayer --align center --edge top --width 20 --height 21 --expand true --distance 90 --distancefrom right --tint 0x171520 --transparent true --alpha 0 --iconspacing 8"
- setWMName "Oppai"
+ spawnOnce "start-lemonbar.sh"
+ spawnOnce "xmonad-log | lemonbar -b -g 800x21+0+0 -B '#171520' -F '#ffffff' -o -3 -f 'Source Han Sans JP:size=10' -o 0 -f 'RobotoMono Nerd Font:style=Regular:size=15'"
+ spawnOnce "firefox"
+ setWMName "AnimeThighsWM"
setDefaultCursor xC_left_ptr
-
-windowCount :: X (Maybe String)
-windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset
-
-
-- defaults
-- myModMask :: KeyMask
myModMask = mod4Mask
@@ -370,20 +365,20 @@ myLayoutHook = avoidStruts (
)
myLemonbarPP :: D.Client -> PP
-myLemonbarPP dbus = def {ppCurrent = wrap "%{B#d33682}" "%{B-}"
+myLemonbarPP dbus = def { ppOutput = dbusOutput dbus
+ , ppCurrent = wrap "%{B#d33682}" "%{B-}"
, ppWsSep = ""
, ppHidden = wrap "%{B#268bd2}" "%{B-}"
, ppHiddenNoWindows = wrap "%{F#02fc45}" "%{F-}"
- , ppTitle = wrap " %{B#6c71c4}%{F#f0f0f0} " " %{B-}" . shorten 60
+ , ppTitle = wrap " %{B#6c71c4}%{F#f0f0f0} " " %{B-}" . shorten 60
, ppUrgent = wrap "%{B#9cfc02} " " %{B-}%{F-}"
- , ppLayout = wrap "%{r}%{B#99B1D5}%{F#232627} " " %{B-} "
- , ppSep = " "
- , ppExtras = [windowCount]
- , ppOrder = \(ws:l:t:ex) -> [ws]++[t]++[l]++["%{B#50FA7B}%{F#232627} WIN:"]++ex++["%{B-}%{F-} "]
- , ppOutput = dbusOutput dbus
- }
-
--- Emit a DBus signal on log updates
+ , ppLayout = wrap "" ""
+-- , ppLayout = wrap "%{r}%{B#99B1D5}%{F#232627} " " %{B-} "
+ , ppSep = " "
+ -- , ppOrder = \(ws:l:t:ex) -> [ws]++[t]++[l]++["%{B#50FA7B}%{F#232627} WIN:"]++ex++["%{B-}%{F-} "]
+ , ppOrder = \(ws:l:t:ex) -> [ws]++["%{B#130F23}%{F#6C71C4} "]++[l]++[" %{F-}%{B-}"]++[t]++ex
+ }
+
dbusOutput :: D.Client -> String -> IO ()
dbusOutput dbus str = do
let signal = (D.signal objectPath interfaceName memberName) {
@@ -405,9 +400,6 @@ main = do
-- Request access to the DBus name
D.requestName dbus (D.busName_ "org.xmonad.Log")
[D.nameAllowReplacement, D.nameReplaceExisting, D.nameDoNotQueue]
- -- notXMobar <- spawnPipe "lemonbar -b -g 1366x21+0+0 -B '#130F23' -F '#ffffff' -f 'Source Han Sans JP:size=10' -o -3 -f 'RobotoMono Nerd Font:style=Regular:size=15' -f -n 'notXMobar' -o 0"
- -- statusBar <- spawnPipe "/home/zt/.xmonad/baraction | lemonbar -g 1366x21+0+0 -B '#130F23' -F '#ffffff' -o -3 -f 'Source Han Sans JP:size=10' -o 0 -f 'RobotoMono Nerd Font:style=Regular:size=15'"
- -- statusBar <- spawnPipe "tiramisu -j | lemonbar -g 850x21+0+0 -B '#130F23' -F '#ffffff' -o -3 -f 'Source Han Sans JP:size=10' -o 0 -f 'RobotoMono Nerd Font:style=Regular:size=15'"
xmonad $ docks def
{
terminal = myTerminal,