Skip to content

Commit 3510ed9

Browse files
authored
Add tinted8 templates (#32)
1 parent 20deef5 commit 3510ed9

7 files changed

Lines changed: 77 additions & 65 deletions

File tree

CONTRIBUTING.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MIT License
22

3+
Copyright (c) 2022 Tinted Theming (https://github.com/tinted-theming)
34
Copyright (c) 2017 nicodebo
4-
Copyright (c) 2022 [Tinted Theming](https://github.com/tinted-theming)
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Matrix Chat](https://img.shields.io/matrix/tinted-theming:matrix.org)](https://matrix.to/#/#tinted-theming:matrix.org)
44

5-
This repository provides [Base16] and [Base24] color schemes for [fzf], a
6-
command-line fuzzy finder written in Go.
5+
This repository provides [Base16], [Base24] an [Tinted8] color schemes for
6+
[fzf], a command-line fuzzy finder written in Go.
77

88
It is meant to be used along with other [Tinted Theming] template
99
projects, which proposes a modular approach by separating templates,
@@ -12,19 +12,14 @@ schemes and builder into different repositories.
1212
Themes in tinted-fzf work by appending `--color` options to your
1313
existing `FZF_DEFAULT_OPTS` environment variable.
1414

15-
Previously [base16-fzf], but we've since added Base24 themes and plan
16-
to add themes for different color systems in future, the `base16-`
17-
prefix doesn't work anymore so we've moved to the less restrictive name
18-
`tinted-fzf`.
19-
2015
## Installation
2116

2217
### Posix complaint shell (sh, bash, zsh)
2318

2419
Source your favorite color scheme from the `sh/` directory into your
2520
shell configuration file (`.*rc` file).
2621

27-
```shell
22+
```sh
2823
. /path/to/tinted-fzf/sh/base16-oceanicnext.sh
2924
```
3025

@@ -66,7 +61,7 @@ shell environments, enhancing your experience with fzf.
6661

6762
## Contributing
6863

69-
See [CONTRIBUTING.md], which contains building and contributing
64+
See [CONTRIBUTING_TO_TEMPLATES.md], which contains building and contributing
7065
instructions.
7166

7267
This template's themes were built with [builder-rust].
@@ -79,11 +74,11 @@ This template's themes were built with [builder-rust].
7974

8075
[Base16]: https://github.com/tinted-theming/home
8176
[Base24]: https://github.com/tinted-theming/base24
77+
[Tinted8]: https://github.com/tinted-theming/home/blob/main/specs/tinted8/styling.md
8278
[Tinted Theming]: https://github.com/tinted-theming/home
8379
[fzf]: https://github.com/junegunn/fzf
8480
[builder-rust]: https://github.com/tinted-theming/tinted-builder-rust
85-
[CONTRIBUTING.md]: CONTRIBUTING.md
86-
[base16-fzf]: https://github.com/tinted-theming/base16-fzf
81+
[CONTRIBUTING_TO_TEMPLATES.md]: https://github.com/tinted-theming/CONTRIBUTING_TO_TEMPLATES.md
8782
[1]: screenshots/base16-solarized-dark.png
8883
[2]: screenshots/base16-horizon-dark.png
8984
[3]: screenshots/base16-tomorrow.png

templates/config.yaml

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,44 @@
11
legacy:
2-
extension: .config
3-
output: bash
2+
filename: bash/{{ scheme-system }}-{{ scheme-slug }}.config
43

54
base16-default:
6-
extension: .sh
7-
output: sh
5+
filename: sh/{{ scheme-system }}-{{ scheme-slug }}.sh
86

97
base24-default:
10-
extension: .sh
11-
output: sh
12-
supported-systems: [base24]
8+
filename: sh/{{ scheme-system }}-{{ scheme-slug }}.sh
9+
supported-systems: [base24]
10+
11+
tinted8-default:
12+
filename: sh/{{ scheme.system }}-{{ scheme.slug }}.sh
13+
supported-systems: [tinted8]
14+
supports:
15+
tinted8-builder: ~0.2.0
16+
tinted8-styling: ~0.2.0
1317

1418
base16-fish:
15-
extension: .fish
16-
output: fish
19+
filename: fish/{{ scheme-system }}-{{ scheme-slug }}.fish
1720

1821
base24-fish:
19-
extension: .fish
20-
output: fish
21-
supported-systems: [base24]
22+
filename: fish/{{ scheme-system }}-{{ scheme-slug }}.fish
23+
supported-systems: [base24]
24+
25+
tinted8-fish:
26+
filename: fish/{{ scheme.system }}-{{ scheme.slug }}.fish
27+
supported-systems: [tinted8]
28+
supports:
29+
tinted8-builder: ~0.2.0
30+
tinted8-styling: ~0.2.0
2231

2332
base16-powershell:
24-
extension: .ps1
25-
output: powershell
33+
filename: powershell/{{ scheme-system }}-{{ scheme-slug }}.ps1
2634

2735
base24-powershell:
28-
extension: .ps1
29-
output: powershell
30-
supported-systems: [base24]
36+
filename: powershell/{{ scheme-system }}-{{ scheme-slug }}.ps1
37+
supported-systems: [base24]
38+
39+
tinted8-powershell:
40+
filename: powershell/{{ scheme.system }}-{{ scheme.slug }}.ps1
41+
supported-systems: [tinted8]
42+
supports:
43+
tinted8-builder: ~0.2.0
44+
tinted8-styling: ~0.2.0

templates/tinted8-default.mustache

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Scheme name: {{scheme.name}}
2+
# Scheme system: {{scheme.system}}
3+
# Scheme author: {{scheme.author}}
4+
# Template author: Tinted Theming (https://github.com/tinted-theming)
5+
6+
export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS"\
7+
" --color=bg:#{{ui.global.background.normal.hex}},fg:#{{ui.global.foreground.normal.hex}},hl:#{{ui.highlight.search.foreground.hex}}"\
8+
" --color=bg+:#{{ui.selection.background.hex}},fg+:#{{ui.selection.foreground.hex}},hl+:#{{ui.highlight.search.foreground.hex}}"\
9+
" --color=info:#{{ui.status.info.hex}},border:#{{ui.border.hex}},prompt:#{{ui.accent.hex}}"\
10+
" --color=pointer:#{{ui.accent.hex}},marker:#{{ui.status.success.hex}},spinner:#{{ui.accent.hex}},header:#{{ui.global.foreground.dark.hex}}"

templates/tinted8-fish.mustache

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Scheme name: {{scheme.name}}
2+
# Scheme system: {{scheme.system}}
3+
# Scheme author: {{scheme.author}}
4+
# Template author: Tinted Theming (https://github.com/tinted-theming)
5+
6+
set -l FZF_NON_COLOR_OPTS
7+
8+
for arg in (echo $FZF_DEFAULT_OPTS | tr " " "\n")
9+
if not string match -q -- "--color*" $arg
10+
set -a FZF_NON_COLOR_OPTS $arg
11+
end
12+
end
13+
14+
set -Ux FZF_DEFAULT_OPTS "$FZF_NON_COLOR_OPTS"\
15+
" --color=bg:#{{ui.global.background.normal.hex}},fg:#{{ui.global.foreground.normal.hex}},hl:#{{ui.highlight.search.foreground.hex}}"\
16+
" --color=bg+:#{{ui.selection.background.hex}},fg+:#{{ui.selection.foreground.hex}},hl+:#{{ui.highlight.search.foreground.hex}}"\
17+
" --color=info:#{{ui.status.info.hex}},border:#{{ui.border.hex}},prompt:#{{ui.accent.hex}}"\
18+
" --color=pointer:#{{ui.accent.hex}},marker:#{{ui.status.success.hex}},spinner:#{{ui.accent.hex}},header:#{{ui.global.foreground.dark.hex}}"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Scheme name: {{scheme.name}}
2+
# Scheme system: {{scheme.system}}
3+
# Scheme author: {{scheme.author}}
4+
# Template author: Tinted Theming (https://github.com/tinted-theming)
5+
6+
$ENV:FZF_DEFAULT_OPTS=@"
7+
--color=bg:#{{ui.global.background.normal.hex}},fg:#{{ui.global.foreground.normal.hex}},hl:#{{ui.highlight.search.foreground.hex}}
8+
--color=bg+:#{{ui.selection.background.hex}},fg+:#{{ui.selection.foreground.hex}},hl+:#{{ui.highlight.search.foreground.hex}}
9+
--color=info:#{{ui.status.info.hex}},border:#{{ui.border.hex}},prompt:#{{ui.accent.hex}}
10+
--color=pointer:#{{ui.accent.hex}},marker:#{{ui.status.success.hex}},spinner:#{{ui.accent.hex}},header:#{{ui.global.foreground.dark.hex}}
11+
"@

0 commit comments

Comments
 (0)