diff options
| -rw-r--r-- | XMonad/xmonad.hs | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/XMonad/xmonad.hs b/XMonad/xmonad.hs index 6f5f149d..a095e079 100644 --- a/XMonad/xmonad.hs +++ b/XMonad/xmonad.hs @@ -2,6 +2,11 @@ import XMonad import qualified XMonad.StackSet as W -- import XMonad hiding ((|||)) +-- for bar shit +-- import Data.Time.Clock +import qualified XMonad.Util.ExtensibleState as XS +import XMonad.Util.Timer + -- actions import XMonad.Actions.CycleWS (moveTo, shiftTo, WSType(..), nextScreen, prevScreen) import XMonad.Actions.CopyWindow @@ -52,8 +57,12 @@ myStartupHook = do setDefaultCursor xC_left_ptr +-- bar actions +windowCount :: X (Maybe String) +windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset + -- defaults @@ -75,10 +84,6 @@ myBrowser = "firefox" -- myEditor :: String -- myEditor = "vim" -windowCount :: X (Maybe String) -windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset - - -- wm variables nBorder = "#1E1F29" -- "#3804f4" -- "#bf00ff" @@ -86,8 +91,8 @@ fBorder = "#FB027F" myBorderWidth = 2 -sGap = 3 -- screen gap -wGap = 1 -- window gap +sGap = 0 -- screen gap +wGap = 0 -- window gap myExtraWorkspaces = [(xK_0, " 十 ")] -- ,(xK_minus, "tmp"),(xK_equal, "swap")] myWorkspaces = [" 一 "," 二 "," 三 "," 四 "," 五 "," 六 "," 七 "," 八 ", " 九 "] ++ (map snd myExtraWorkspaces) @@ -181,6 +186,7 @@ myKeys = [ ] + -- layouts myGap = spacingRaw False (Border sGap sGap sGap sGap) True (Border wGap wGap wGap wGap) True @@ -192,17 +198,17 @@ myLayoutHook = myLayouts myLemonbarPP = def {ppCurrent = wrap "%{F#6c71c4}%{B#d33682}%{F-}" "%{F#d33682}%{B-}%{F-}" , ppWsSep = " " , ppHidden = wrap "%{B#268bd2}" "%{B-}" - , ppHiddenNoWindows = wrap "%{F#02fc45}" " %{F-}" - , ppTitle = wrap "%{B#6c71c4}%{F#f0f0f0} " " %{B-}" . shorten 90 + , ppHiddenNoWindows = wrap "%{F#02fc45}" "%{F-}" + , ppTitle = wrap " %{B#6c71c4}%{F#f0f0f0} " " %{B-}" . shorten 90 , ppUrgent = wrap "%{B#9cfc02} " " %{B-}%{F-}" - , ppLayout = wrap "%{r}%{B#99B1D5}%{F#232627} " " %{B-} " + , 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-} "] + , ppOrder = \(ws:l:t:ex) -> [ws]++[t]++[l]++["%{B#50FA7B}%{F#232627} WIN:"]++ex++["%{B-}%{F-} "] } main = do - bar <- spawnPipe "lemonbar -g 1366x21 -b -B '#171520' -p -F '#ffffff' -f 'Source Han Sans JP:size=10' -o -3 -f 'RobotoMono Nerd Font:style=Regular:size=15' -f -n 'mainbar' -o 0" + bar <- spawnPipe "lemonbar -b -g 1366x21 -B '#171520' -F '#ffffff' -f 'Source Han Sans JP:size=10' -o -3 -f 'RobotoMono Nerd Font:style=Regular:size=15' -f -n 'notXMobar' -o 0" xmonad $ docks def { terminal = myTerminal, @@ -216,7 +222,7 @@ main = do layoutHook = myLayoutHook, -- manageHook = myManageHook, -- handleEventHook = myEventHook, - logHook = dynamicLogWithPP myLemonbarPP { ppOutput = \x -> hPutStrLn bar x }, + logHook = dynamicLogWithPP myLemonbarPP { ppOutput = \x -> hPutStrLn bar x}, startupHook = myStartupHook } `additionalKeys` myKeys |