From 79bf6ab868cbdab1f9a3827c9b70198f54548b44 Mon Sep 17 00:00:00 2001 From: Aram Drevekenin Date: Wed, 5 Oct 2022 07:44:00 +0200 Subject: feat(config): switch to kdl (#1759) * chore(config): default kdl keybindings config * tests * work * refactor(config): move stuff around * work * tab merge layout * work * work * layouts working * work * layout tests * work * work * feat(parsing): kdl layouts without config * refactor(kdl): move stuff around * work * tests(layout): add cases and fix bugs * work * fix(kdl): various bugs * chore(layouts): move all layouts to kdl * feat(kdl): shared keybidns * fix(layout): do not count fixed panes toward percentile * fix(keybinds): missing keybinds and actions * fix(config): adjust default tips * refactor(config): move stuff around * fix(tests): make e2e tests pass * fix(kdl): add verbose parsing errors * fix(kdl): focused tab * fix(layout): corret default_tab_template behavior * style(code): fix compile warnings * feat(cli): send actions through the cli * fix(cli): exit only when action is done * fix(cli): open embedded pane from floating pane * fix(cli): send actions to other sessions * feat(cli): command alias * feat(converter): convert old config * feat(converter): convert old layout and theme files * feat(kdl): pretty errors * feat(client): convert old YAML files on startup * fix: various bugs and styling issues * fix: e2e tests * fix(screen): propagate errors after merge * style(clippy): lower clippy level * fix(tests): own session_name variable * style(fmt): rustfmt * fix(cli): various action fixes * style(fmt): rustfmt * fix(themes): loading of theme files * style(fmt): rustfmt * fix(tests): theme fixtures * fix(layouts): better errors on unknown nodes * fix(kdl): clarify valid node terminator error * fix(e2e): adjust close tab test * fix(e2e): adjust close tab test again * style(code): cleanup some comments --- example/themes/README.md | 4 ++-- example/themes/dracula.kdl | 17 +++++++++++++++++ example/themes/dracula.yaml | 16 ---------------- example/themes/gruvbox-dark.kdl | 16 ++++++++++++++++ example/themes/gruvbox-dark.yaml | 15 --------------- example/themes/gruvbox-light.kdl | 16 ++++++++++++++++ example/themes/gruvbox-light.yaml | 15 --------------- example/themes/molokai-dark.kdl | 16 ++++++++++++++++ example/themes/molokai-dark.yaml | 15 --------------- example/themes/nord.kdl | 15 +++++++++++++++ example/themes/nord.yaml | 16 ---------------- example/themes/one-half-dark.kdl | 16 ++++++++++++++++ example/themes/one-half-dark.yaml | 15 --------------- example/themes/solarized-dark.kdl | 16 ++++++++++++++++ example/themes/solarized-dark.yaml | 15 --------------- example/themes/solarized-light.kdl | 16 ++++++++++++++++ example/themes/solarized-light.yaml | 15 --------------- example/themes/tokyo-night-dark.kdl | 0 example/themes/tokyo-night-light.kdl | 16 ++++++++++++++++ example/themes/tokyo-night-light.yaml | 16 ---------------- example/themes/tokyo-night-storm.kdl | 16 ++++++++++++++++ example/themes/tokyo-night-storm.yaml | 16 ---------------- example/themes/tokyo-night.kdl | 16 ++++++++++++++++ example/themes/tokyo-night.yaml | 16 ---------------- 24 files changed, 178 insertions(+), 172 deletions(-) create mode 100644 example/themes/dracula.kdl delete mode 100644 example/themes/dracula.yaml create mode 100644 example/themes/gruvbox-dark.kdl delete mode 100644 example/themes/gruvbox-dark.yaml create mode 100644 example/themes/gruvbox-light.kdl delete mode 100644 example/themes/gruvbox-light.yaml create mode 100644 example/themes/molokai-dark.kdl delete mode 100644 example/themes/molokai-dark.yaml create mode 100644 example/themes/nord.kdl delete mode 100644 example/themes/nord.yaml create mode 100644 example/themes/one-half-dark.kdl delete mode 100644 example/themes/one-half-dark.yaml create mode 100644 example/themes/solarized-dark.kdl delete mode 100644 example/themes/solarized-dark.yaml create mode 100644 example/themes/solarized-light.kdl delete mode 100644 example/themes/solarized-light.yaml create mode 100644 example/themes/tokyo-night-dark.kdl create mode 100644 example/themes/tokyo-night-light.kdl delete mode 100644 example/themes/tokyo-night-light.yaml create mode 100644 example/themes/tokyo-night-storm.kdl delete mode 100644 example/themes/tokyo-night-storm.yaml create mode 100644 example/themes/tokyo-night.kdl delete mode 100644 example/themes/tokyo-night.yaml (limited to 'example/themes') diff --git a/example/themes/README.md b/example/themes/README.md index ade4d6cd6..8572222a5 100644 --- a/example/themes/README.md +++ b/example/themes/README.md @@ -1,7 +1,7 @@ # Themes -Please make sure that the theme name and the file name are the same (+`.yaml`). +Please make sure that the theme name and the file name are the same (+`.kdl`). Example: - theme: gruvbox -- filename: `gruvbox.yaml` +- filename: `gruvbox.kdl` diff --git a/example/themes/dracula.kdl b/example/themes/dracula.kdl new file mode 100644 index 000000000..26f20504e --- /dev/null +++ b/example/themes/dracula.kdl @@ -0,0 +1,17 @@ +// From https://github.com/dracula/zellij + +themes { + dracula { + fg 248 248 242 + bg 40 42 54 + black 0 0 0 + red 255 85 85 + green 80 250 123 + yellow 241 250 140 + blue 98 114 164 + magenta 255 121 198 + cyan 139 233 253 + white 255 255 255 + orange 255 184 108 + } +} diff --git a/example/themes/dracula.yaml b/example/themes/dracula.yaml deleted file mode 100644 index b9c8a5afb..000000000 --- a/example/themes/dracula.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Dracula Theme - -themes: - dracula: - # From https://github.com/dracula/zellij - bg: [40, 42, 54] - red: [255, 85, 85] - green: [80, 250, 123] - yellow: [241, 250, 140] - blue: [98, 114, 164] - magenta: [255, 121, 198] - orange: [255, 184, 108] - fg: [248, 248, 242] - cyan: [139, 233, 253] - black: [0, 0, 0] - white: [255, 255, 255] diff --git a/example/themes/gruvbox-dark.kdl b/example/themes/gruvbox-dark.kdl new file mode 100644 index 000000000..53c9d6ab3 --- /dev/null +++ b/example/themes/gruvbox-dark.kdl @@ -0,0 +1,16 @@ +themes { + gruvbox-dark { + fg 213 196 161 + bg 40 40 40 + black 60 56 54 + red 204 36 29 + green 152 151 26 + yellow 215 153 33 + blue 69 133 136 + magenta 177 98 134 + cyan 104 157 106 + white 251 241 199 + orange 214 93 14 + } +} + diff --git a/example/themes/gruvbox-dark.yaml b/example/themes/gruvbox-dark.yaml deleted file mode 100644 index 676bc42b9..000000000 --- a/example/themes/gruvbox-dark.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Gruvbox theme - -themes: - gruvbox-dark: - bg: [40, 40, 40] - red: [204, 36, 29] - green: [152, 151, 26] - yellow: [215, 153, 33] - blue: [69, 133, 136] - magenta: [177, 98, 134] - orange: [214, 93, 14] - fg: [213, 196, 161] - cyan: [104, 157, 106] - black: [60, 56, 54] - white: [251, 241, 199] diff --git a/example/themes/gruvbox-light.kdl b/example/themes/gruvbox-light.kdl new file mode 100644 index 000000000..7bb33e683 --- /dev/null +++ b/example/themes/gruvbox-light.kdl @@ -0,0 +1,16 @@ +themes { + gruvbox-light { + fg 60 56 54 + bg 251 82 75 + black 40 40 40 + red 205 75 69 + green 152 151 26 + yellow 215 153 33 + blue 69 133 136 + magenta 177 98 134 + cyan 104 157 106 + white 213 196 161 + orange 214 93 14 + } +} + diff --git a/example/themes/gruvbox-light.yaml b/example/themes/gruvbox-light.yaml deleted file mode 100644 index d672ec3b8..000000000 --- a/example/themes/gruvbox-light.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Gruvbox theme - -themes: - gruvbox-light: - bg: [251, 82, 75] - red: [205, 75, 69] - green: [152, 151, 26] - yellow: [215, 153, 33] - blue: [69, 133, 136] - magenta: [177, 98, 134] - orange: [214, 93, 14] - fg: [60, 56, 54] - cyan: [104, 157, 106] - black: [40, 40, 40] - white: [213, 196, 161] diff --git a/example/themes/molokai-dark.kdl b/example/themes/molokai-dark.kdl new file mode 100644 index 000000000..6fd96f9af --- /dev/null +++ b/example/themes/molokai-dark.kdl @@ -0,0 +1,16 @@ +themes { + molokai-dark { + fg 248 248 240 + bg 27 29 30 + black 0 0 0 + red 255 0 0 + green 0 140 0 + yellow 255 255 0 + blue 102 217 239 + magenta 174 129 255 + cyan 0 255 255 + white 255 255 255 + orange 253 151 31 + } +} + diff --git a/example/themes/molokai-dark.yaml b/example/themes/molokai-dark.yaml deleted file mode 100644 index b2135fdfc..000000000 --- a/example/themes/molokai-dark.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Molokai Theme - -themes: - molokai-dark: - bg: [27, 29, 30] - red: [255, 0, 0] - green: [0, 140, 0] - yellow: [255, 255, 0] - blue: [102, 217, 239] - magenta: [174, 129, 255] - orange: [253, 151, 31] - fg: [248, 248, 240] - cyan: [0, 255, 255] - black: [0, 0, 0] - white: [255, 255, 255] diff --git a/example/themes/nord.kdl b/example/themes/nord.kdl new file mode 100644 index 000000000..a56a9bfb3 --- /dev/null +++ b/example/themes/nord.kdl @@ -0,0 +1,15 @@ +themes { + nord { + fg 216 222 233 // #D8DEE9 + bg 46 52 64 // #2E3440 + black 59 66 82 // #3B4252 + red 191 97 106 // #BF616A + green 163 190 140 // #A3BE8C + yellow 235 203 139 // #EBCB8B + blue 129 161 193 // #81A1C1 + magenta 180 142 173 // #B48EAD + cyan 136 192 208 // #88C0D0 + white 229 233 240 // #E5E9F0 + orange 208 135 112 // #D08770 + } +} diff --git a/example/themes/nord.yaml b/example/themes/nord.yaml deleted file mode 100644 index 61851ad20..000000000 --- a/example/themes/nord.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Nord theme - -themes: - nord: - fg: [216, 222, 233] #D8DEE9 - bg: [46, 52, 64] #2E3440 - black: [59, 66, 82] #3B4252 - red: [191, 97, 106] #BF616A - green: [163, 190, 140] #A3BE8C - yellow: [235,203,139] #EBCB8B - blue: [129, 161, 193] #81A1C1 - magenta: [180, 142, 173] #B48EAD - cyan: [136, 192, 208] #88C0D0 - white: [229, 233, 240] #E5E9F0 - orange: [208, 135, 112] #D08770 - diff --git a/example/themes/one-half-dark.kdl b/example/themes/one-half-dark.kdl new file mode 100644 index 000000000..ade1874bf --- /dev/null +++ b/example/themes/one-half-dark.kdl @@ -0,0 +1,16 @@ +themes { + one-half-dark { + fg 220 223 228 + bg 40 44 52 + black 27 29 35 + red 227 63 76 + green 152 195 121 + yellow 229 192 123 + blue 97 175 239 + magenta 198 120 221 + cyan 86 182 194 + white 233 225 254 + orange 216 133 76 + } +} + diff --git a/example/themes/one-half-dark.yaml b/example/themes/one-half-dark.yaml deleted file mode 100644 index 5f3b3968a..000000000 --- a/example/themes/one-half-dark.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# One Half Theme - -themes: - one-half-dark: - bg: [40, 44, 52] - red: [227, 63, 76] - green: [152, 195, 121] - yellow: [229, 192, 123] - blue: [97, 175, 239] - magenta: [198, 120, 221] - orange: [216, 133, 76] - fg: [220, 223, 228] - cyan: [86, 182, 194] - black: [27, 29, 35] - white: [233, 225, 254] \ No newline at end of file diff --git a/example/themes/solarized-dark.kdl b/example/themes/solarized-dark.kdl new file mode 100644 index 000000000..20482f5c3 --- /dev/null +++ b/example/themes/solarized-dark.kdl @@ -0,0 +1,16 @@ +themes { + solarized-dark { + fg 253 246 227 + bg 0 43 54 + black 7 54 66 + red 220 50 47 + green 133 153 0 + yellow 181 137 0 + blue 38 139 210 + magenta 211 54 130 + cyan 42 161 152 + white 238 232 213 + orange 203 75 22 + } +} + diff --git a/example/themes/solarized-dark.yaml b/example/themes/solarized-dark.yaml deleted file mode 100644 index c93635e47..000000000 --- a/example/themes/solarized-dark.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Solarized dark - -themes: - solarized-dark: - bg: [0, 43, 54] - red: [220, 50, 47] - green: [133, 153, 0] - yellow: [181, 137, 0] - blue: [38, 139, 210] - magenta: [211, 54, 130] - orange: [203, 75, 22] - fg: [253, 246, 227] - cyan: [42, 161, 152] - black: [7, 54, 66] - white: [238, 232, 213] diff --git a/example/themes/solarized-light.kdl b/example/themes/solarized-light.kdl new file mode 100644 index 000000000..93bac49b7 --- /dev/null +++ b/example/themes/solarized-light.kdl @@ -0,0 +1,16 @@ +themes { + solarized-light { + fg 101 123 131 + bg 253 246 227 + black 7 54 66 + red 220 50 47 + green 133 153 0 + yellow 181 137 0 + blue 38 139 210 + magenta 211 54 130 + cyan 42 161 152 + white 238 232 213 + orange 203 75 22 + } +} + diff --git a/example/themes/solarized-light.yaml b/example/themes/solarized-light.yaml deleted file mode 100644 index 456833761..000000000 --- a/example/themes/solarized-light.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Solarized light - -themes: - solarized-light: - bg: [253, 246, 227] - red: [220, 50, 47] - green: [133, 153, 0] - yellow: [181, 137, 0] - blue: [38, 139, 210] - magenta: [211, 54, 130] - orange: [203, 75, 22] - fg: [101, 123, 131] - cyan: [42, 161, 152] - black: [7, 54, 66] - white: [238, 232, 213] diff --git a/example/themes/tokyo-night-dark.kdl b/example/themes/tokyo-night-dark.kdl new file mode 100644 index 000000000..e69de29bb diff --git a/example/themes/tokyo-night-light.kdl b/example/themes/tokyo-night-light.kdl new file mode 100644 index 000000000..3ac5fb767 --- /dev/null +++ b/example/themes/tokyo-night-light.kdl @@ -0,0 +1,16 @@ +themes { + tokyo-night-light { + fg 52 59 88 + bg 213 214 219 + black 15 15 20 + red 186 75 96 + green 72 94 48 + yellow 143 94 21 + blue 52 84 138 + magenta 90 74 120 + cyan 15 75 110 + white 130 137 172 + orange 150 80 39 + } +} + diff --git a/example/themes/tokyo-night-light.yaml b/example/themes/tokyo-night-light.yaml deleted file mode 100644 index 156943cd8..000000000 --- a/example/themes/tokyo-night-light.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# TokyoNight Theme -# Originally by https://github.com/enkia/tokyo-night-vscode-theme - -themes: - tokyo-night-light: - fg: [52,59,88] #343B58 - bg: [213,214,219] #D5D6DB - black: [15,15,20] #0F0F14 - red: [186,75,96] #BA4B60 - green: [72,94,48] #485E30 - yellow: [143,94,21] #8F5E15 - blue: [52,84,138] #34548A - magenta: [90,74,120] #5A4A78 - cyan: [15,75,110] #0F4B6E - white: [130,137,172] #8289AC - orange: [150,80,39] #965027 diff --git a/example/themes/tokyo-night-storm.kdl b/example/themes/tokyo-night-storm.kdl new file mode 100644 index 000000000..e727ef72f --- /dev/null +++ b/example/themes/tokyo-night-storm.kdl @@ -0,0 +1,16 @@ +themes { + tokyo-night-storm { + fg 169 177 214 + bg 36 40 59 + black 56 62 90 + red 249 51 87 + green 158 206 106 + yellow 224 175 104 + blue 122 162 247 + magenta 187 154 247 + cyan 42 195 222 + white 192 202 245 + orange 255 158 100 + } +} + diff --git a/example/themes/tokyo-night-storm.yaml b/example/themes/tokyo-night-storm.yaml deleted file mode 100644 index 9239990f9..000000000 --- a/example/themes/tokyo-night-storm.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# TokyoNight Theme -# Originally by https://github.com/enkia/tokyo-night-vscode-theme - -themes: - tokyo-night-storm: - fg: [169,177,214] #A9B1D6 - bg: [36,40,59] #24283B - black: [56,62,90] #383E5A - red: [249,51,87] #F9334D - green: [158,206,106] #9ECE6A - yellow: [224,175,104] #E0AF68 - blue: [122,162,247] #7AA2F7 - magenta: [187,154,247] #BB9AF7 - cyan: [42,195,222] #2AC3DE - white: [192,202,245] #C0CAF5 - orange: [255,158,100] #FF9E64 diff --git a/example/themes/tokyo-night.kdl b/example/themes/tokyo-night.kdl new file mode 100644 index 000000000..4ea1a8104 --- /dev/null +++ b/example/themes/tokyo-night.kdl @@ -0,0 +1,16 @@ +themes { + tokyo-night { + fg 169 177 214 + bg 26 27 38 + black 56 62 90 + red 249 51 87 + green 158 206 106 + yellow 224 175 104 + blue 122 162 247 + magenta 187 154 247 + cyan 42 195 222 + white 192 202 245 + orange 255 158 100 + } +} + diff --git a/example/themes/tokyo-night.yaml b/example/themes/tokyo-night.yaml deleted file mode 100644 index d62fb4228..000000000 --- a/example/themes/tokyo-night.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# TokyoNight Theme -# Originally by https://github.com/enkia/tokyo-night-vscode-theme - -themes: - tokyo-night: - fg: [169,177,214] #A9B1D6 - bg: [26,27,38] #1A1B26 - black: [56,62,90] #383E5A - red: [249,51,87] #F9334D - green: [158,206,106] #9ECE6A - yellow: [224,175,104] #E0AF68 - blue: [122,162,247] #7AA2F7 - magenta: [187,154,247] #BB9AF7 - cyan: [42,195,222] #2AC3DE - white: [192,202,245] #C0CAF5 - orange: [255,158,100] #FF9E64 -- cgit v1.2.3