diff --git a/xmonad.hs b/xmonad.hs index fb9f7d4..117e9fc 100755 --- a/xmonad.hs +++ b/xmonad.hs @@ -28,6 +28,7 @@ import XMonad.Hooks.SetWMName -- Layout import XMonad.Layout +import XMonad.Layout.Gaps import XMonad.Layout.IM as IM -- GIMP stuff import qualified XMonad.Layout.IndependentScreens as IS import XMonad.Layout.LayoutHints (layoutHints) @@ -90,15 +91,35 @@ getTopBar sc = if sc == 1 then "dzen2 -dock -p -x 0 -ta l -w 1024 -e 'onstart:lower;button2=togglehide;sigusr1=togglehide'" else "dzen2 -dock -p -x 1920 -ta l -w 1024 -e 'onstart:lower;button2=togglehide;sigusr1=togglehide'" -getTennessineBar :: Int -> String -getTennessineBar sc = if sc == 1 - then "ssh tennessine 'conky' | dzen2 -dock -p -x 0 -y -1 -ta l -w 1920 -e 'sigusr1=togglehide'" - else "ssh tennessine 'conky' | dzen2 -dock -p -x 1920 -y -1 -ta l -w 1920 -e 'sigusr1=togglehide'" +getBarbicanBar :: Int -> String +getBarbicanBar sc = if sc == 1 + then "ssh barbican 'conky' | dzen2 -dock -p -x 0 -y -108 -ta l -w 1920 -e 'sigusr1=togglehide'" + else "ssh barbican 'conky' | dzen2 -dock -p -x 1920 -y -108 -ta l -w 1920 -e 'sigusr1=togglehide'" getFerrumBar :: Int -> String getFerrumBar sc = if sc == 1 - then "conky | dzen2 -dock -p -x 0 -y -38 -ta l -w 1920 -e 'sigusr1=togglehide'" - else "conky | dzen2 -dock -p -x 1920 -y -38 -ta l -w 1920 -e 'sigusr1=togglehide'" + then "conky | dzen2 -dock -p -x 0 -y -90 -ta l -w 1920 -e 'sigusr1=togglehide'" + else "conky | dzen2 -dock -p -x 1920 -y -90 -ta l -w 1920 -e 'sigusr1=togglehide'" + +getGammachunkBar :: Int -> String +getGammachunkBar sc = if sc == 1 + then "ssh gammachunk 'conky' | dzen2 -dock -p -x 0 -y -72 -ta l -w 1920 -e 'sigusr1=togglehide'" + else "ssh gammachunk 'conky' | dzen2 -dock -p -x 1920 -y -72 -ta l -w 1920 -e 'sigusr1=togglehide'" + +getOsmiumBar :: Int -> String +getOsmiumBar sc = if sc == 1 + then "ssh osmium 'conky' | dzen2 -dock -p -x 0 -y -54 -ta l -w 1920 -e 'sigusr1=togglehide'" + else "ssh osmium 'conky' | dzen2 -dock -p -x 1920 -y -54 -ta l -w 1920 -e 'sigusr1=togglehide'" + +getTennessineBar :: Int -> String +getTennessineBar sc = if sc == 1 + then "ssh tennessine 'conky' | dzen2 -dock -p -x 0 -y -36 -ta l -w 1920 -e 'sigusr1=togglehide'" + else "ssh tennessine 'conky' | dzen2 -dock -p -x 1920 -y -36 -ta l -w 1920 -e 'sigusr1=togglehide'" + +getBlancherBar :: Int -> String +getBlancherBar sc = if sc == 1 + then "ssh blancher.net 'conky' | dzen2 -dock -p -x 0 -y -1 -ta l -w 1920 -e 'sigusr1=togglehide'" + else "ssh blancher.net 'conky' | dzen2 -dock -p -x 1920 -y -1 -ta l -w 1920 -e 'sigusr1=togglehide'" toggleHomeScreens :: X () toggleHomeScreens = do @@ -250,15 +271,19 @@ launcher = makeLauncher "-x" "eval" "\"exec " "\"" main = do sc <- IS.countScreens dzenTopBar <- spawnPipe (getTopBar sc) - dzenTennessineBar <- spawnPipe (getTennessineBar sc) + dzenBarbicanBar <- spawnPipe (getBarbicanBar sc) dzenFerrumBar <- spawnPipe (getFerrumBar sc) + dzenGammachunkBar <- spawnPipe (getGammachunkBar sc) + dzenOsmiumBar <- spawnPipe (getOsmiumBar sc) + dzenTennessineBar <- spawnPipe (getTennessineBar sc) + dzenBlancherBar <- spawnPipe (getBlancherBar sc) xmonad $ docks $ ewmh $ desktopConfig { workspaces = ["shell","vivaldi","pindrop","kofc","VM"] , terminal = myTerminal , focusFollowsMouse = True , manageHook = manageDocks <+> myManageHook <+> manageHook desktopConfig , handleEventHook = docksEventHook <+> handleEventHook desktopConfig - , layoutHook = avoidStruts $ layoutH + , layoutHook = avoidStruts $ gaps [(D,90)] $ layoutH , logHook = myLogHook dzenTopBar >> fadeHook >> updatePointer (0.5, 0.5) (0, 0) , borderWidth = 1 , normalBorderColor = "#333333" @@ -389,7 +414,8 @@ myKeys = [ , ((winKey , xK_b), do spawnHere "pkill -USR1 dzen2" spawnHere "pkill trayer" - sendMessage $ ToggleStrut U) + sendMessage $ ToggleStruts + sendMessage $ ToggleGaps) , ((lAlt , xK_g), spawnHere "~/bin/google_selection.sh") --, ((winKey , xK_g), ifWindows (className =? "Google-chrome") (mapM_ focus) (spawnHere "google-chrome")) , ((winKey , xK_g), ifWindows (className =? "Google-chrome") (mapM_ focus) (spawnHere "google-chrome-stable"))