Просмотр исходного кода

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

Lucas Stadler лет назад: 11
Родитель
Сommit
26c29538c9
2 измененных файлов с 7 добавлено и 9 удалено
  1. 3 3
      .config/taffybar/taffybar.hs
  2. 4 6
      .xmonad/xmonad.hs

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

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

+ 4 - 6
.xmonad/xmonad.hs

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