๐ Backup for my config files
dotfiles
update starship config
+60
-79
+16
-8
.config/nvim/lua/plugins/colorscheme.lua
+16
-8
.config/nvim/lua/plugins/colorscheme.lua
···
172
172
NoiceScrollbar = { bg = colors.none },
173
173
NoiceScrollbarThumb = { bg = colors.overlay1 },
174
174
175
+
-- Render Markdown
175
176
RenderMarkdownCode = { bg = colors.mantle },
176
-
RenderMarkdownCodeInline = { bg = colors.mantle },
177
+
RenderMarkdownCodeInline = { bg = colors.surface0 },
177
178
RenderMarkdownBullet = { fg = colors.text },
178
179
180
+
RenderMarkdownH1Bg = { bg = colors.surface0 },
181
+
RenderMarkdownH2Bg = { bg = colors.surface0 },
182
+
RenderMarkdownH3Bg = { bg = colors.surface0 },
183
+
RenderMarkdownH4Bg = { bg = colors.surface0 },
184
+
RenderMarkdownH5Bg = { bg = colors.surface0 },
185
+
RenderMarkdownH6Bg = { bg = colors.surface0 },
186
+
179
187
["@markup.quote"] = { fg = colors.pink },
180
188
["@markup.raw.markdown_inline"] = { fg = colors.lavender, bg = colors.surface0 },
181
189
["@markup.raw.block.markdown"] = { fg = colors.lavender, bg = colors.none },
182
-
["@markup.strong.markdown_inline"] = { fg = colors.peach },
190
+
["@markup.strong.markdown_inline"] = { fg = colors.lavender, bold = true },
183
191
["@markup.heading.git_config"] = { fg = colors.maroon },
184
192
185
-
["@markup.heading.1.markdown"] = { fg = colors.lavender },
186
-
["@markup.heading.2.markdown"] = { fg = colors.lavender },
187
-
["@markup.heading.3.markdown"] = { fg = colors.lavender },
188
-
["@markup.heading.4.markdown"] = { fg = colors.lavender },
189
-
["@markup.heading.5.markdown"] = { fg = colors.lavender },
190
-
["@markup.heading.6.markdown"] = { fg = colors.lavender },
193
+
["@markup.heading.1.markdown"] = { fg = colors.lavender, bold = true },
194
+
["@markup.heading.2.markdown"] = { fg = colors.lavender, bold = true },
195
+
["@markup.heading.3.markdown"] = { fg = colors.lavender, bold = true },
196
+
["@markup.heading.4.markdown"] = { fg = colors.lavender, bold = true },
197
+
["@markup.heading.5.markdown"] = { fg = colors.lavender, bold = true },
198
+
["@markup.heading.6.markdown"] = { fg = colors.lavender, bold = true },
191
199
192
200
["@markup.quote.markdown"] = { fg = colors.text },
193
201
+1
-1
.config/nvim/lua/plugins/conform.lua
+1
-1
.config/nvim/lua/plugins/conform.lua
+2
-8
.config/nvim/lua/plugins/lsp.lua
+2
-8
.config/nvim/lua/plugins/lsp.lua
···
9
9
filetypes_include = { "gleam" },
10
10
settings = {
11
11
tailwindCSS = {
12
-
includeLanguages = { gleam = "javascript" },
13
-
experimental = {
14
-
classRegex = {
15
-
'class\\(\\s*[\\r\\n]?\\s*"([^"]*)",?\\s*[\\r\\n]?\\s*\\)',
16
-
"class\\(\\s*['\"]([^'\"]*)['\"]\\s*\\)",
17
-
"#?\\(\\s*['\"]([^'\"]*)['\"]\\s*,\\s*[^\\)]*\\)",
18
-
},
19
-
},
12
+
includeLanguages = { gleam = "html" },
13
+
experimental = { classRegex = { '"([^"]*)"' } },
20
14
},
21
15
},
22
16
},
+1
-1
.config/nvim/lua/plugins/render_markdown.lua
+1
-1
.config/nvim/lua/plugins/render_markdown.lua
+40
-61
.config/starship.toml
+40
-61
.config/starship.toml
···
3
3
palette = "catppuccin_mocha"
4
4
add_newline = false
5
5
6
+
format = """
7
+
$directory\
8
+
${custom.jj_bookmarks}\
9
+
${custom.jj_change}\
10
+
${custom.jj_conflict}\
11
+
${custom.jj_op}\
12
+
$line_break\
13
+
$jobs\
14
+
$character
15
+
"""
16
+
6
17
[character]
7
18
success_symbol = "[[๓ฐ](green) โฏ](peach)"
8
19
error_symbol = "[[๓ฐ](red) โฏ](peach)"
···
12
23
truncation_length = 4
13
24
style = "bold lavender"
14
25
15
-
[cmd_duration]
16
-
disabled = true
26
+
[custom.jj_change]
27
+
ignore_timeout = true
28
+
description = "The current jj operation"
29
+
detect_folders = [".jj"]
30
+
command = """
31
+
jj log -r @ --no-graph --color always \
32
+
-T 'change_id.shortest(6)' --ignore-working-copy
33
+
"""
17
34
18
-
# ๏ JJ Module -----------------------------------------------------------------
35
+
[custom.jj_bookmarks]
36
+
ignore_timeout = true
37
+
description = "The current jj bookmark"
38
+
detect_folders = [".jj"]
39
+
command = """
40
+
jj log -r @ --no-graph --color always --limit 1 \
41
+
-T 'bookmarks' --ignore-working-copy
42
+
"""
19
43
20
-
[git_status]
21
-
disabled = true
22
-
23
-
[git_commit]
24
-
disabled = true
25
-
26
-
[git_metrics]
27
-
disabled = true
28
-
29
-
[git_branch]
30
-
disabled = true
31
-
32
-
[custom.jj]
33
-
description = "The current jj status"
44
+
[custom.jj_conflict]
45
+
ignore_timeout = true
46
+
description = "Whether the current jj worktree has conflicts"
34
47
detect_folders = [".jj"]
35
-
symbol = "๓ฑ "
36
-
style = "blue"
37
-
command = '''
38
-
jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '
39
-
separate(" ",
40
-
change_id.shortest(6),
41
-
bookmarks,
42
-
"|",
43
-
concat(
44
-
if(conflict, "๏ข"),
45
-
if(divergent, "๎ "),
46
-
if(hidden, "๓ฑ"),
47
-
if(immutable, "๏ฃ"),
48
-
),
49
-
raw_escape_sequence("\x1b[1;90m") ++ if(empty, "(empty)"),
50
-
raw_escape_sequence("\x1b[1;0m") ++ coalesce(
51
-
truncate_end(29, description.first_line(), "โฆ"), "๓ฐ",
52
-
)
53
-
)
54
-
'
55
-
'''
56
-
57
-
[custom.git_status]
58
-
when = "! jj --ignore-working-copy root"
59
-
command = "starship module git_status"
60
-
style = ""
61
-
description = "Only show git_status if we're not in a jj repo"
62
-
48
+
when = "jj resolve -l --ignore-working-copy"
63
49
64
-
[custom.git_commit]
65
-
when = "! jj --ignore-working-copy root"
66
-
command = "starship module git_commit"
67
-
style = ""
68
-
description = "Only show git_commit if we're not in a jj repo"
50
+
[custom.jj_op]
51
+
ignore_timeout = true
52
+
description = "The current jj operation"
53
+
when = "jj root --ignore-working-copy"
54
+
command = """
55
+
echo -n '๏ถ '
56
+
jj op log -T 'id.short(6)' --limit 1 --no-graph \
57
+
--color always --ignore-working-copy
58
+
"""
69
59
70
-
[custom.git_metrics]
71
-
when = "! jj --ignore-working-copy root"
72
-
command = "starship module git_metrics"
73
-
description = "Only show git_metrics if we're not in a jj repo"
74
-
style = ""
75
-
76
-
[custom.git_branch]
77
-
when = "! jj --ignore-working-copy root"
78
-
command = "starship module git_branch"
79
-
description = "Only show git_branch if we're not in a jj repo"
80
-
style = ""
81
60
82
61
# ๎ปญ Catppuccin ----------------------------------------------------------------
83
62