Przeglądaj źródła

~/.{xmonad,config/taffybar}: update taffybar.

Lucas Stadler 11 lat temu
rodzic
commit
26c29538c9
2 zmienionych plików z 7 dodań i 9 usunięć
  1. 3 3
      .config/taffybar/taffybar.hs
  2. 4 6
      .xmonad/xmonad.hs

+ 3 - 3
.config/taffybar/taffybar.hs

@ -1,7 +1,7 @@
1 1
import System.Taffybar
2 2
import System.Taffybar.Battery
3 3
import System.Taffybar.Systray
4
import System.Taffybar.XMonadLog
4
import System.Taffybar.TaffyPager
5 5
import System.Taffybar.SimpleClock
6 6
import System.Taffybar.Widgets.PollingGraph
7 7
import System.Taffybar.Widgets.PollingLabel
@ -26,10 +26,10 @@ main = do
26 26
            graphDataColors = [(0, 1, 0, 1), (1, 0, 1, 0.5)]
27 27
        }
28 28
        clock = textClockNew Nothing "<span fgcolor='orange'>%a %b %_d %H:%M</span>" 1
29
        log = xmonadLogNew
29
        log = taffyPagerNew defaultPagerConfig
30 30
        tray = systrayNew
31 31
        cpu = pollingGraphNew cpuCfg 3 cpuCallback
32
        battery = textBatteryNew "Bat: %d%%" 30
32
        battery = textBatteryNew "Bat: $percentage$%" 30
33 33
        memory = textMemoryNew 3
34 34
    defaultTaffybar defaultTaffybarConfig {
35 35
        barHeight = 15,

+ 4 - 6
.xmonad/xmonad.hs

@ -1,10 +1,10 @@
1 1
import XMonad
2 2
import XMonad.Actions.SpawnOn (manageSpawn, spawnHere)
3
import DBus.Client (connectSession)
4
import System.Taffybar.XMonadLog (dbusLog)
3
import System.Taffybar.Hooks.PagerHints (pagerHints)
5 4
import XMonad.Hooks.ManageDocks (ToggleStruts(..), manageDocks, avoidStruts)
6 5
import XMonad.Hooks.ManageHelpers
7 6
import XMonad.Hooks.SetWMName
7
import XMonad.Hooks.EwmhDesktops (ewmh)
8 8
import XMonad.Layout.NoBorders (smartBorders)
9 9
import XMonad.Layout.Fullscreen (fullscreenEventHook, fullscreenManageHook)
10 10
import XMonad.Util.Run (spawnPipe)
@ -27,8 +27,7 @@ import Data.Monoid (All (All))
27 27
(??) = flip fmap
28 28
29 29
main = do
30
    dbusClient <- connectSession
31
    xmonad $ defaultConfig {
30
    xmonad $ ewmh $ pagerHints $ defaultConfig {
32 31
        modMask  = mod4Mask,
33 32
        terminal = "sakura",
34 33
        startupHook = setWMName "LG3D",
@ -43,8 +42,7 @@ main = do
43 42
                     ] <+> manageHook defaultConfig,
44 43
        -- Don't overwrite the section used by docks
45 44
        layoutHook = avoidStruts $ smartBorders $ layoutHook defaultConfig,
46
        handleEventHook = fullscreenEventHook,
47
        logHook = dbusLog dbusClient
45
        handleEventHook = fullscreenEventHook
48 46
     } `additionalKeys` [
49 47
        ((mod4Mask, xK_b), spawnHere "chromium --allow-file-access-from-files"),
50 48
        ((mod4Mask .|. shiftMask, xK_b), spawnHere "chromium --incognito --allow-file-access-from-files"),