Update modules/workspace/i3blocks/default.nix

This commit is contained in:
Alexander Bantyev 2020-04-10 14:52:54 +03:00
parent 140f36b3a1
commit 34e00a7713

View File

@ -18,11 +18,11 @@ in {
background ${config.themes.colors.bg} background ${config.themes.colors.bg}
statusline ${config.themes.colors.fg} statusline ${config.themes.colors.fg}
separator ${config.themes.colors.alt} separator ${config.themes.colors.alt}
focused_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.blue} focused_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.blue}
active_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.green} active_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.green}
inactive_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.fg} inactive_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.fg}
urgent_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.orange} urgent_workspace ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.orange}
binding_mode ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.yellow} binding_mode ${config.themes.colors.bg} ${config.themes.colors.bg} ${config.themes.colors.yellow}
} }
} }
''; '';
@ -36,8 +36,7 @@ in {
in '' in ''
interval=60 interval=60
markup=pango markup=pango
'' + genIniOrdered ( '' + genIniOrdered (optional (config.secrets ? mail) (scr "email") ++ [
optional (config.secrets ? mail) (scr "email") ++ [
(scrint "weather" 600) (scrint "weather" 600)
(scr "calendar") (scr "calendar")
(scr "emacs") (scr "emacs")
@ -52,10 +51,6 @@ in {
] ++ optionals config.deviceSpecific.isLaptop [ ] ++ optionals config.deviceSpecific.isLaptop [
(scr "battery") (scr "battery")
(scrint "brightness" 5) (scrint "brightness" 5)
] ++ [ ] ++ optional (config.deviceSpecific.devInfo ? bigScreen) (scrint "network" 1)
(scrint "connections" 10) ++ [ (scrint "connections" 10) (scr "df") (scr "date") (scrint "time" 1) ]);
(scr "df")
(scr "date")
(scrint "time" 1)
]);
} }