Skip to content

Commit

Permalink
Move terminal colours to dotdrop variables
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcelRobitaille committed Jan 20, 2019
1 parent f1165b5 commit 408dbab
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 78 deletions.
56 changes: 28 additions & 28 deletions alacritty/alacritty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,46 +100,46 @@ render_timer: false
colors:
# Default colors
primary:
background: '0x12181e'
foreground: '0xFFFFFD'
background: '0x{{@@ color_background @@}}'
foreground: '0x{{@@ color_foreground @@}}'

# Colors the cursor will use if `custom_cursor_colors` is true
cursor:
text: '0x000000'
cursor: '0xffffff'
text: '0x{{@@ color_text @@}}'
cursor: '0x{{@@ color_cursor @@}}'

# Normal colors
normal:
black: '0x12181e'
red: '0xad4117'
green: '0x659b45'
yellow: '0xb8cc4b'
blue: '0x3a74bc'
magenta: '0xbdcb92'
cyan: '0x96744A'
white: '0xe3e2e1'
black: '0x{{@@ color_normal_black @@}}'
red: '0x{{@@ color_normal_red @@}}'
green: '0x{{@@ color_normal_green @@}}'
yellow: '0x{{@@ color_normal_yellow @@}}'
blue: '0x{{@@ color_normal_blue @@}}'
magenta: '0x{{@@ color_normal_magenta @@}}'
cyan: '0x{{@@ color_normal_cyan @@}}'
white: '0x{{@@ color_normal_white @@}}'

# Bright colors
bright:
black: '0x5b7083'
red: '0xf6f2b9'
green: '0x8d9fba'
yellow: '0x7fd84b'
blue: '0xe6c675'
magenta: '0xe7ff5f'
cyan: '0xd19851'
white: '0xfffffd'
black: '0x{{@@ color_bright_black @@}}'
red: '0x{{@@ color_bright_red @@}}'
green: '0x{{@@ color_bright_green @@}}'
yellow: '0x{{@@ color_bright_yellow @@}}'
blue: '0x{{@@ color_bright_blue @@}}'
magenta: '0x{{@@ color_bright_magenta @@}}'
cyan: '0x{{@@ color_bright_cyan @@}}'
white: '0x{{@@ color_bright_white @@}}'

# Dim colors (Optional)
dim:
black: '0x333333'
red: '0xf2777a'
green: '0x99cc99'
yellow: '0xffcc66'
blue: '0x6699cc'
magenta: '0xcc99cc'
cyan: '0x66cccc'
white: '0xdddddd'
black: '0x{{@@ color_dim_black @@}}'
red: '0x{{@@ color_dim_red @@}}'
green: '0x{{@@ color_dim_green @@}}'
yellow: '0x{{@@ color_dim_yellow @@}}'
blue: '0x{{@@ color_dim_blue @@}}'
magenta: '0x{{@@ color_dim_magenta @@}}'
cyan: '0x{{@@ color_dim_cyan @@}}'
white: '0x{{@@ color_dim_white @@}}'

# Visual Bell
#
Expand Down
31 changes: 29 additions & 2 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,35 @@ actions:
mkdir -p ~/.oh-my-zsh/custom/plugins;
cp /tmp/tmuxinator/completion/tmuxinator.zsh ~/.oh-my-zsh/custom/plugins/)
vim-plug: vim +PlugInstall +qall
variables:
color_background: '12181e'
color_foreground: 'FFFFFD'
color_text: '000000'
color_cursor: 'ffffff'
color_normal_black: '12181e'
color_normal_red: 'ad4117'
color_normal_green: '659b45'
color_normal_yellow: 'b8cc4b'
color_normal_blue: '3a74bc'
color_normal_magenta: 'bdcb92'
color_normal_cyan: '96744A'
color_normal_white: 'e3e2e1'
color_bright_black: '5b7083'
color_bright_red: 'f6f2b9'
color_bright_green: '8d9fba'
color_bright_yellow: '7fd84b'
color_bright_blue: 'e6c675'
color_bright_magenta: 'e7ff5f'
color_bright_cyan: 'd19851'
color_bright_white: 'fffffd'
color_dim_black: '333333'
color_dim_red: 'f2777a'
color_dim_green: '99cc99'
color_dim_yellow: 'ffcc66'
color_dim_blue: '6699cc'
color_dim_magenta: 'cc99cc'
color_dim_cyan: '66cccc'
color_dim_white: 'dddddd'
dynvariables:
mozilla_path: find ~/.mozilla/firefox -name '*.default'
config:
Expand Down Expand Up @@ -134,7 +163,6 @@ dotfiles:
openbox_theme:
dst: ~/.local/share/themes/Arc-Dark/openbox-3/
src: ./openbox/theme/
link: true

# Ranger
ranger:
Expand Down Expand Up @@ -170,7 +198,6 @@ dotfiles:
termite:
dst: ~/.config/termite/config
src: ./termite/config
link: true

# Tern
tern:
Expand Down
2 changes: 1 addition & 1 deletion firefox/chrome/userChrome.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:root {
--chrome-background-color: #12181e !important;
--chrome-background-color: #{{@@ color_normal_black @@}} !important;
--tab-line-color: #325f93 !important;
--toolbarbutton-icon-fill-attention: #CF5323 !important;
--url-and-searchbar-background-color: #505050 !important;
Expand Down
22 changes: 11 additions & 11 deletions firefox/chrome/userContent.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
* OneNote
****************************************/

.WACInteractiveView.Ltr.WACViewPanel {
background-color: white !important;
color: black !important;
}
.WACInteractiveView.Ltr.WACViewPanel .Paragraph,
.WACInteractiveView.Ltr.WACViewPanel .TextRun {
color: inherit !important;
}
/* .WACInteractiveView.Ltr.WACViewPanel { */
/* background-color: white !important; */
/* color: black !important; */
/* } */
/* .WACInteractiveView.Ltr.WACViewPanel .Paragraph, */
/* .WACInteractiveView.Ltr.WACViewPanel .TextRun { */
/* color: inherit !important; */
/* } */


/**
Expand All @@ -54,10 +54,10 @@
@-moz-document url-prefix("https://disable.www.messenger.com/") {
div[role="banner"] {
border-bottom: 1px solid #1c242d !important;
background: #12181e !important;
background: #{{@@ color_normal_black @@}} !important;
}
div[role="banner"] + div {
background: #12181e !important;
background: #{{@@ color_normal_black @@}} !important;
}
div[role="banner"] h1 {
color: #fffffd !important;
Expand Down Expand Up @@ -86,7 +86,7 @@
}

div[role="main"] {
background: #12181e !important;
background: #{{@@ color_normal_black @@}} !important;
border-left: 1px solid #1c242d !important;
}
div[role="main"] > span > div:first-child {
Expand Down
32 changes: 16 additions & 16 deletions openbox/theme/themerc
Original file line number Diff line number Diff line change
Expand Up @@ -27,41 +27,41 @@ window.handle.width: 0
padding.width: 10
padding.height: 10

window.active.border.color: #12181e
window.inactive.border.color: #2d3036
window.active.title.separator.color: #12181e
window.inactive.title.separator.color: #12181e
window.active.client.color: #2d3036
window.inactive.client.color: #2d3036
window.active.border.color: #{{@@ color_normal_black @@}}
window.inactive.border.color: #{{@@ color_normal_black @@}}
window.active.title.separator.color: #{{@@ color_normal_black @@}}
window.inactive.title.separator.color: #{{@@ color_normal_black @@}}
window.active.client.color: #{{@@ color_normal_black @@}}
window.inactive.client.color: #{{@@ color_normal_black @@}}

window.active.label.text.color: #D3DAE3
window.inactive.label.text.color: #7F8388

window.active.button.unpressed.image.color: #D3DAE3
window.active.button.pressed.image.color: #5294E2
window.active.button.disabled.image.color: #2d3036
window.active.button.disabled.image.color: #{{@@ color_normal_black @@}}
window.active.button.hover.image.color: #757b85
window.active.button.toggled.unpressed.image.color: #D3DAE3
window.active.button.toggled.pressed.image.color: #5294E2
window.active.button.toggled.hover.image.color: #afb8c5
window.inactive.button.unpressed.image.color: #D3DAE3
window.inactive.button.pressed.image.color: #5294E2
window.inactive.button.disabled.image.color: #2d3036
window.inactive.button.disabled.image.color: #{{@@ color_normal_black @@}}
window.inactive.button.hover.image.color: #757b85
window.inactive.button.toggled.unpressed.image.color: #D3DAE3
window.inactive.button.toggled.pressed.image.color: #5294E2
window.inactive.button.toggled.hover.image.color: #afb8c5

window.active.title.bg: flat solid
window.active.title.bg.color: #12181e
window.active.title.bg.color: #{{@@ color_normal_black @@}}
window.active.label.bg: flat solid
window.active.label.bg.color: #12181e
window.active.label.bg.color: #{{@@ color_normal_black @@}}
#window.active.handle.bg: texture
#window.active.grip.bg: texture
window.inactive.title.bg: flat solid
window.inactive.title.bg.color: #12181e
window.inactive.title.bg.color: #{{@@ color_normal_black @@}}
window.inactive.label.bg: flat solid
window.inactive.label.bg.color: #12181e
window.inactive.label.bg.color: #{{@@ color_normal_black @@}}
#window.inactive.handle.bg: texture
#window.inactive.grip.bg: texture

Expand Down Expand Up @@ -108,7 +108,7 @@ menu.items.bg.color: #454a54
menu.items.active.bg: flat solid
menu.items.active.bg.color: #5294E2
menu.title.bg: flat solid
menu.title.bg.color: #2d3036
menu.title.bg.color: #{{@@ color_normal_black @@}}

menu.title.text.justify: center

Expand All @@ -118,14 +118,14 @@ menu.title.text.justify: center
### OSD
osd.border.width: 1

osd.border.color: #2d3036
osd.border.color: #{{@@ color_normal_black @@}}

osd.label.text.color: #D3DAE3

osd.bg: flat solid
osd.bg.color: #12181e
osd.bg.color: #{{@@ color_normal_black @@}}
osd.label.bg: flat solid
osd.label.bg.color: #12181e
osd.label.bg.color: #{{@@ color_normal_black @@}}
osd.hilight.bg: flat solid
osd.hilight.bg.color: #5294E2
osd.unhilight.bg: flat solid
Expand Down
40 changes: 20 additions & 20 deletions termite/config
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ dynamic_title = false
icon_name = terminal

[colors]
background = #12181e
foreground = #FFFFFD
cursor = #FFFFFD
cursor_foreground = #12181e
background = #{{@@ color_background @@}}
foreground = #{{@@ color_foreground @@}}
cursor = #{{@@ color_cursor @@}}
cursor_foreground = #{{@@ color_text @@}}

color0 = #12181e
color1 = #ad4117
color2 = #659b45
color3 = #b8cc4b
color4 = #426da2
color5 = #bdcb92
color6 = #96744A
color7 = #e3e2e1
color8 = #5b7083
color9 = #f6f2b9
color10 = #8d9fba
color11 = #7fd84b
color12 = #e6c675
color13 = #e7ff5f
color14 = #d19851
color15 = #fffffd
color0 = #{{@@ color_normal_black @@}}
color1 = #{{@@ color_normal_red @@}}
color2 = #{{@@ color_normal_green @@}}
color3 = #{{@@ color_normal_yellow @@}}
color4 = #{{@@ color_normal_blue @@}}
color5 = #{{@@ color_normal_magenta @@}}
color6 = #{{@@ color_normal_cyan @@}}
color7 = #{{@@ color_normal_white @@}}
color8 = #{{@@ color_bright_black @@}}
color9 = #{{@@ color_bright_red @@}}
color10 = #{{@@ color_bright_green @@}}
color11 = #{{@@ color_bright_yellow @@}}
color12 = #{{@@ color_bright_blue @@}}
color13 = #{{@@ color_bright_magenta @@}}
color14 = #{{@@ color_bright_cyan @@}}
color15 = #{{@@ color_bright_white @@}}

0 comments on commit 408dbab

Please sign in to comment.