diff -Nru regolith-styles-1.2.32/debian/changelog regolith-styles-1.2.36/debian/changelog --- regolith-styles-1.2.32/debian/changelog 2019-09-17 14:24:58.000000000 +0000 +++ regolith-styles-1.2.36/debian/changelog 2019-10-13 23:59:45.000000000 +0000 @@ -1,3 +1,27 @@ +regolith-styles (1.2.36-1ubuntu1~ppa1) disco; urgency=medium + + * Define bar icons in typeface resource file. + + -- Ken Gilmer Sun, 13 Oct 2019 16:59:45 -0700 + +regolith-styles (1.2.35-1ubuntu1~ppa1) disco; urgency=medium + + * Package new styles by @appelgriebsch. + + -- Ken Gilmer Sun, 29 Sep 2019 18:00:45 -0700 + +regolith-styles (1.2.34-1ubuntu1~ppa1) disco; urgency=medium + + * Fix i3-wm style to use glyph define for workspace symbol. + + -- Ken Gilmer Fri, 20 Sep 2019 08:14:38 -0700 + +regolith-styles (1.2.33-1ubuntu1~ppa1) disco; urgency=medium + + * Remove invalid comment about resource modification. + + -- Ken Gilmer Fri, 20 Sep 2019 07:56:02 -0700 + regolith-styles (1.2.32-1ubuntu1~ppa1) disco; urgency=medium * Add documentation of package dependencies for optional themes. diff -Nru regolith-styles-1.2.32/Xresources/color-ayu regolith-styles-1.2.36/Xresources/color-ayu --- regolith-styles-1.2.32/Xresources/color-ayu 1970-01-01 00:00:00.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/color-ayu 2019-09-30 00:59:29.000000000 +0000 @@ -0,0 +1,17 @@ +! Ayu colors +#define color_base03 #fafafa +#define color_base02 #eee8d5 +#define color_base01 #cbccc6 +#define color_base00 #cbccc6 +#define color_base0 #cbccc6 +#define color_base1 #6c7680 +#define color_base2 #6c7680 +#define color_base3 #6c7680 +#define color_yellow #ffa759 +#define color_orange #ff9940 +#define color_red #ff3333 +#define color_magenta #f28779 +#define color_violet #B48EAD +#define color_blue #73d0ff +#define color_cyan #95e6cb +#define color_green #bae67e diff -Nru regolith-styles-1.2.32/Xresources/color-ayu-dark regolith-styles-1.2.36/Xresources/color-ayu-dark --- regolith-styles-1.2.32/Xresources/color-ayu-dark 1970-01-01 00:00:00.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/color-ayu-dark 2019-09-30 00:59:29.000000000 +0000 @@ -0,0 +1,17 @@ +! Ayu Dark colors +#define color_base03 #0a0e14 +#define color_base02 #1f2430 +#define color_base01 #b3b1ad +#define color_base00 #b3b1ad +#define color_base0 #e6e1cf +#define color_base1 #e6e1cf +#define color_base2 #ffffff +#define color_base3 #ffffff +#define color_yellow #ffd580 +#define color_orange #e6b450 +#define color_red #ff3333 +#define color_magenta #f28779 +#define color_violet #B48EAD +#define color_blue #73d0ff +#define color_cyan #95e6cb +#define color_green #bae67e diff -Nru regolith-styles-1.2.32/Xresources/color-ayu-mirage regolith-styles-1.2.36/Xresources/color-ayu-mirage --- regolith-styles-1.2.32/Xresources/color-ayu-mirage 1970-01-01 00:00:00.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/color-ayu-mirage 2019-09-30 00:59:29.000000000 +0000 @@ -0,0 +1,17 @@ +! Ayu Mirage colors +#define color_base03 #1f2430 +#define color_base02 #292b30 +#define color_base01 #bfbab0 +#define color_base00 #bfbab0 +#define color_base0 #e6e1cf +#define color_base1 #e6e1cf +#define color_base2 #ffffff +#define color_base3 #ffffff +#define color_yellow #ffe6b3 +#define color_orange #ffcc66 +#define color_red #ff6666 +#define color_magenta #f28779 +#define color_violet #B48EAD +#define color_blue #a6e1ff +#define color_cyan #95e6cb +#define color_green #cee6ac diff -Nru regolith-styles-1.2.32/Xresources/i3-wm regolith-styles-1.2.36/Xresources/i3-wm --- regolith-styles-1.2.32/Xresources/i3-wm 2019-09-06 15:18:22.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/i3-wm 2019-10-13 23:56:24.000000000 +0000 @@ -1,7 +1,7 @@ #define Q(x) #x #define QUOTE(x) Q(x) -#define glyph  +#define glyph typeface_bar_glyph_workspace i3-wm.bar.font: typeface_bar @@ -49,22 +49,22 @@ #define WORKSPACE_NAME(INDEX, FONT, COLOR, GLYPH) INDEX: INDEX GLYPH -i3-wm.workspace.01.name: WORKSPACE_NAME(1, glyph_font, QUOTE(color_blue), ) -i3-wm.workspace.02.name: WORKSPACE_NAME(2, glyph_font, QUOTE(color_cyan), ) -i3-wm.workspace.03.name: WORKSPACE_NAME(3, glyph_font, QUOTE(color_green), ) -i3-wm.workspace.04.name: WORKSPACE_NAME(4, glyph_font, QUOTE(color_yellow), ) -i3-wm.workspace.05.name: WORKSPACE_NAME(5, glyph_font, QUOTE(color_orange), ) -i3-wm.workspace.06.name: WORKSPACE_NAME(6, glyph_font, QUOTE(color_red), ) -i3-wm.workspace.07.name: WORKSPACE_NAME(7, glyph_font, QUOTE(color_magenta), ) -i3-wm.workspace.08.name: WORKSPACE_NAME(8, glyph_font, QUOTE(color_violet), ) -i3-wm.workspace.09.name: WORKSPACE_NAME(9, glyph_font, QUOTE(color_base1), ) -i3-wm.workspace.10.name: WORKSPACE_NAME(10, glyph_font, QUOTE(color_blue), ) -i3-wm.workspace.11.name: WORKSPACE_NAME(11, glyph_font, QUOTE(color_cyan), ) -i3-wm.workspace.12.name: WORKSPACE_NAME(12, glyph_font, QUOTE(color_green), ) -i3-wm.workspace.13.name: WORKSPACE_NAME(13, glyph_font, QUOTE(color_yellow), ) -i3-wm.workspace.14.name: WORKSPACE_NAME(14, glyph_font, QUOTE(color_orange), ) -i3-wm.workspace.15.name: WORKSPACE_NAME(15, glyph_font, QUOTE(color_red), ) -i3-wm.workspace.16.name: WORKSPACE_NAME(16, glyph_font, QUOTE(color_magenta), ) -i3-wm.workspace.17.name: WORKSPACE_NAME(17, glyph_font, QUOTE(color_violet), ) -i3-wm.workspace.18.name: WORKSPACE_NAME(18, glyph_font, QUOTE(color_base1), ) -i3-wm.workspace.19.name: WORKSPACE_NAME(19, glyph_font, QUOTE(color_blue), ) +i3-wm.workspace.01.name: WORKSPACE_NAME(1, glyph_font, QUOTE(color_blue), glyph) +i3-wm.workspace.02.name: WORKSPACE_NAME(2, glyph_font, QUOTE(color_cyan), glyph) +i3-wm.workspace.03.name: WORKSPACE_NAME(3, glyph_font, QUOTE(color_green), glyph) +i3-wm.workspace.04.name: WORKSPACE_NAME(4, glyph_font, QUOTE(color_yellow), glyph) +i3-wm.workspace.05.name: WORKSPACE_NAME(5, glyph_font, QUOTE(color_orange), glyph) +i3-wm.workspace.06.name: WORKSPACE_NAME(6, glyph_font, QUOTE(color_red), glyph) +i3-wm.workspace.07.name: WORKSPACE_NAME(7, glyph_font, QUOTE(color_magenta), glyph) +i3-wm.workspace.08.name: WORKSPACE_NAME(8, glyph_font, QUOTE(color_violet), glyph) +i3-wm.workspace.09.name: WORKSPACE_NAME(9, glyph_font, QUOTE(color_base1), glyph) +i3-wm.workspace.10.name: WORKSPACE_NAME(10, glyph_font, QUOTE(color_blue), glyph) +i3-wm.workspace.11.name: WORKSPACE_NAME(11, glyph_font, QUOTE(color_cyan), glyph) +i3-wm.workspace.12.name: WORKSPACE_NAME(12, glyph_font, QUOTE(color_green), glyph) +i3-wm.workspace.13.name: WORKSPACE_NAME(13, glyph_font, QUOTE(color_yellow), glyph) +i3-wm.workspace.14.name: WORKSPACE_NAME(14, glyph_font, QUOTE(color_orange), glyph) +i3-wm.workspace.15.name: WORKSPACE_NAME(15, glyph_font, QUOTE(color_red), glyph) +i3-wm.workspace.16.name: WORKSPACE_NAME(16, glyph_font, QUOTE(color_magenta), glyph) +i3-wm.workspace.17.name: WORKSPACE_NAME(17, glyph_font, QUOTE(color_violet), glyph) +i3-wm.workspace.18.name: WORKSPACE_NAME(18, glyph_font, QUOTE(color_base1), glyph) +i3-wm.workspace.19.name: WORKSPACE_NAME(19, glyph_font, QUOTE(color_blue), glyph) diff -Nru regolith-styles-1.2.32/Xresources/i3xrocks regolith-styles-1.2.36/Xresources/i3xrocks --- regolith-styles-1.2.32/Xresources/i3xrocks 2019-09-06 15:15:54.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/i3xrocks 2019-10-13 23:56:24.000000000 +0000 @@ -6,3 +6,15 @@ i3xrocks.warning: color_yellow i3xrocks.nominal: color_base0 i3xrocks.date.format: + %m/%d %I:%M %p + +i3xrocks.label.wifi: typeface_bar_glyph_wifi +i3xrocks.label.cpu: typeface_bar_glyph_cpu +i3xrocks.label.battery100: typeface_bar_glyph_battery_100 +i3xrocks.label.battery80: typeface_bar_glyph_battery_80 +i3xrocks.label.battery50: typeface_bar_glyph_battery_50 +i3xrocks.label.battery20: typeface_bar_glyph_battery_20 +i3xrocks.label.battery0: typeface_bar_glyph_battery_0 +i3xrocks.label.batterycharging: typeface_bar_glyph_battery_charging +i3xrocks.label.batteryac: typeface_bar_glyph_battery_ac +i3xrocks.label.batteryunknown: typeface_bar_glyph_battery_unknown +i3xrocks.label.time: typeface_bar_glyph_time diff -Nru regolith-styles-1.2.32/Xresources/root regolith-styles-1.2.36/Xresources/root --- regolith-styles-1.2.32/Xresources/root 2019-09-17 14:24:46.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/root 2019-09-30 00:59:29.000000000 +0000 @@ -7,6 +7,9 @@ !#include "/etc/regolith/styles/color-solarized-light" !#include "/etc/regolith/styles/color-gruvbox" #include "/etc/regolith/styles/color-nord" +!#include "/etc/regolith/styles/color-ayu" +!#include "/etc/regolith/styles/color-ayu-dark" +!#include "/etc/regolith/styles/color-ayu-mirage" ! -- Styles - Fonts ! NOTE: Font packages may need to be installed when enabling typefaces. @@ -27,11 +30,20 @@ ! The following theme requires nordic and paper-icon-theme to be installed #include "/etc/regolith/styles/theme-nordic" +! The following theme requires Ayu and Arc-icon-theme to be installed +! (https://github.com/appelgriebsch/ayu-theme/releases/tag/ayu-0.1.0) +!#include "/etc/regolith/styles/theme-ayu" + +! The following theme requires Ayu and Arc-icon-theme to be installed +! (https://github.com/appelgriebsch/ayu-theme/releases/tag/ayu-0.1.0) +!#include "/etc/regolith/styles/theme-ayu-dark" + +! The following theme requires Ayu-Mirage and Arc-icon-theme to be installed +! (https://github.com/appelgriebsch/ayu-theme/releases/tag/ayu-mirage-0.1.0) +!#include "/etc/regolith/styles/theme-ayu-mirage" + ! -- Applications -! These files are not intended to be modified, however if you -! would like to configure a new apps Xresources to use Regolith -! theme info, this is the place to add it. -! +! These files map values defined above into specific app settings. #include "/etc/regolith/styles/st-term" #include "/etc/regolith/styles/i3-wm" #include "/etc/regolith/styles/i3xrocks" diff -Nru regolith-styles-1.2.32/Xresources/theme-ayu regolith-styles-1.2.36/Xresources/theme-ayu --- regolith-styles-1.2.32/Xresources/theme-ayu 1970-01-01 00:00:00.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/theme-ayu 2019-09-30 00:59:29.000000000 +0000 @@ -0,0 +1,2 @@ +#define gtk_theme Ayu +#define icon_theme Arc diff -Nru regolith-styles-1.2.32/Xresources/theme-ayu-dark regolith-styles-1.2.36/Xresources/theme-ayu-dark --- regolith-styles-1.2.32/Xresources/theme-ayu-dark 1970-01-01 00:00:00.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/theme-ayu-dark 2019-09-30 00:59:29.000000000 +0000 @@ -0,0 +1,2 @@ +#define gtk_theme Ayu-Dark +#define icon_theme Arc diff -Nru regolith-styles-1.2.32/Xresources/theme-ayu-mirage regolith-styles-1.2.36/Xresources/theme-ayu-mirage --- regolith-styles-1.2.32/Xresources/theme-ayu-mirage 1970-01-01 00:00:00.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/theme-ayu-mirage 2019-09-30 00:59:29.000000000 +0000 @@ -0,0 +1,2 @@ +#define gtk_theme Ayu-Mirage-Dark +#define icon_theme Arc diff -Nru regolith-styles-1.2.32/Xresources/typeface-sourcecodepro regolith-styles-1.2.36/Xresources/typeface-sourcecodepro --- regolith-styles-1.2.32/Xresources/typeface-sourcecodepro 2019-08-07 02:59:30.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/typeface-sourcecodepro 2019-10-13 23:56:24.000000000 +0000 @@ -3,3 +3,16 @@ #define typeface_bar pango:Source Code Pro Medium 13, FontAwesome 13 #define typeface_rofi Source Code Pro Medium 16 #define typeface_terminal Source Code Pro:pixelsize=16:antialias=true:autohint=true + +#define typeface_bar_glyph_wifi  +#define typeface_bar_glyph_cpu  +#define typeface_bar_glyph_battery_100  +#define typeface_bar_glyph_battery_80  +#define typeface_bar_glyph_battery_50  +#define typeface_bar_glyph_battery_20  +#define typeface_bar_glyph_battery_0  +#define typeface_bar_glyph_battery_charging  +#define typeface_bar_glyph_battery_ac  +#define typeface_bar_glyph_battery_unknown  +#define typeface_bar_glyph_time  +#define typeface_bar_glyph_workspace  diff -Nru regolith-styles-1.2.32/Xresources/typeface-ubuntu regolith-styles-1.2.36/Xresources/typeface-ubuntu --- regolith-styles-1.2.32/Xresources/typeface-ubuntu 2019-08-31 03:12:10.000000000 +0000 +++ regolith-styles-1.2.36/Xresources/typeface-ubuntu 2019-10-13 23:56:24.000000000 +0000 @@ -3,3 +3,16 @@ #define typeface_bar pango:FontAwesome 13 #define typeface_rofi Ubuntu Medium 16 #define typeface_terminal Source Code Pro:pixelsize=16:antialias=true:autohint=true + +#define typeface_bar_glyph_wifi  +#define typeface_bar_glyph_cpu  +#define typeface_bar_glyph_battery_100  +#define typeface_bar_glyph_battery_80  +#define typeface_bar_glyph_battery_50  +#define typeface_bar_glyph_battery_20  +#define typeface_bar_glyph_battery_0  +#define typeface_bar_glyph_battery_charging  +#define typeface_bar_glyph_battery_ac  +#define typeface_bar_glyph_battery_unknown  +#define typeface_bar_glyph_time  +#define typeface_bar_glyph_workspace 