diff --git a/dotfiles/Xresources b/dotfiles/Xresources index f0f2a2b1..33d76b4c 100644 --- a/dotfiles/Xresources +++ b/dotfiles/Xresources @@ -6,11 +6,39 @@ rofi.padding: 30 rofi.font: source code pro semibold 12 +#define BG +#define RED #F44336 +#define LBLUE #0288D1 +#define GREEN #388E3C +#define BGREY #37474F +#define YELLOW #FFEB3B +#define TEAL #26A69A +#define DGREY #424242 +#define LAMBER #FFECB3 +#define LGREY #E0E0E0 +#define BLACK #000000 +#define BLUE2 #0D47A1 +#define BLUE1 #1E88E5 +#define WHITE #FFFFFF + + +#define _GREEN #4CAF50 +#define _YELLOW #FFEB3B +#define _BLUE #2196F3 +#define _RED #F44336 +#define _DGREY #212121 + +#define ROFIBG _DGREY +#define ROFI1 _GREEN +#define ROFI2 _BLUE +#define ROFIACCENT _YELLOW +#define ROFITEXT _YELLOW + ! border width rofi.bw: 5 rofi.color-enabled: true -rofi.color-window: #121212, #455a64, #000000 -rofi.color-normal: #455a64, #ffffff, #455a64, #121212, #fff59d +rofi.color-window: ROFIBG, ROFIACCENT, ROFIACCENT +rofi.color-normal: ROFI1, ROFITEXT, ROFI1, ROFI2, ROFITEXT rofi.color-active: #fdf6e3, #268bd2, #eee8d5, #268bd2, #fdf6e3 rofi.color-urgent: #fdf6e3, #dc322f, #eee8d5, #dc322f, #fdf6e3 diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index c65d847d..2235ed43 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -28,10 +28,11 @@ main = do ] , graphLabel = Just "cpu" } - let clock = textClockNew Nothing "%a %b %_d %r" 1 + let clock = textClockNew Nothing "%a %b %_d %r" 1 pagerConfig = defaultPagerConfig { useImages = True , emptyWorkspace = id + , urgentWorkspace = id , imageCount = 8 , workspaceGap = 0 , activeWorkspace = escape diff --git a/dotfiles/config/taffybar/taffybar.rc b/dotfiles/config/taffybar/taffybar.rc index 67f00759..a609bab3 100644 --- a/dotfiles/config/taffybar/taffybar.rc +++ b/dotfiles/config/taffybar/taffybar.rc @@ -1,13 +1,15 @@ style "taffybar-default" { color["black"] = "#000000" color["white"] = "#ffffff" - color["green"] = "#00ff00" - color["red"] = "#ff0000" - color["aqua"] = "#455a64" - color["yellow"] = "#fff59d" - color["gray"] = "#263238" - bg[NORMAL] = @black + color["green"] = "#4caf50" + color["yellow"] = "#ffeb3b" + color["blue"] = "#2196f3" + color["red"] = "#f44336" + color["dgrey"] = "#212121" + color["lgrey"] = "#bdbdbd" + + bg[NORMAL] = @dgrey fg[NORMAL] = @white text[NORMAL] = @white fg[PRELIGHT] = @green @@ -25,21 +27,25 @@ style "taffybar-notification-button" = "taffybar-default" { } style "taffybar-workspace-border-active" = "taffybar-default" { - bg[NORMAL] = @aqua + bg[NORMAL] = "#01579B" + fg[NORMAL] = @black } style "taffybar-workspace-border-visible" = "taffybar-default" { - bg[NORMAL] = @gray + bg[NORMAL] = "#80CBC4" + fg[NORMAL] = @black } style "taffybar-workspace-border-empty" = "taffybar-default" { - bg[NORMAL] = @black + bg[NORMAL] = @dgrey } style "taffybar-workspace-border-hidden" = "taffybar-default" { - bg[NORMAL] = @black + bg[NORMAL] = "#E57373" + fg[NORMAL] = @black } style "taffybar-workspace-border-urgent" = "taffybar-default" { bg[NORMAL] = @black } +widget "Taffybar*" style "taffybar-default" widget "Taffybar*WindowSwitcher*label" style "taffybar-active-window" widget "*NotificationCloseButton" style "taffybar-notification-button" widget "*Workspace-*-active*" style "taffybar-workspace-border-active"