Skip to content

Commit 39b2d04

Browse files
committed
format fixes
1 parent 755d035 commit 39b2d04

File tree

4 files changed

+47
-41
lines changed

4 files changed

+47
-41
lines changed

arch/link/.DS_Store

-6 KB
Binary file not shown.

git/.gitconfig

+39-39
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[user]
2-
3-
name = Ryan Chhong
4-
signingkey = ~/.ssh/id_rsa.pub
2+
3+
name = Ryan Chhong
4+
signingkey = ~/.ssh/id_rsa.pub
55
[alias]
6-
tree = log --all --decorate --oneline --graph
6+
tree = log --all --decorate --oneline --graph
77
# Space saver
8-
compact = !git reflog expire --expire=0 --all && git repack -ad && git prune && git gc
8+
compact = !git reflog expire --expire=0 --all && git repack -ad && git prune && git gc
99
# Get gitignores
10-
gitignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"
10+
gitignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"
1111
# Ignore files only locally
1212
ignore = update-index --assume-unchanged
1313
unignore = update-index --no-assume-unchanged
@@ -19,42 +19,42 @@
1919
lol = log --oneline --graph --all
2020
# Color on
2121
[color]
22-
ui = auto
22+
ui = auto
2323
[core]
2424
excludesfile = ~/.gitignore_global
25-
editor = nvim
25+
editor = nvim
2626
pager = delta
2727
# Sign commits
2828
[commit]
29-
gpgsign = true
29+
gpgsign = true
3030
verbose = true
3131
# Catppuccin theme
3232
[delta "catppuccin-mocha"]
33-
blame-palette = "#1e1e2e #181825 #11111b #313244 #45475a"
34-
commit-decoration-style = "box ul"
35-
dark = true
36-
file-decoration-style = "#cdd6f4"
37-
file-style = "#cdd6f4"
38-
hunk-header-decoration-style = "box ul"
39-
hunk-header-file-style = "bold"
40-
hunk-header-line-number-style = "bold #a6adc8"
41-
hunk-header-style = "file line-number syntax"
42-
line-numbers = true
43-
line-numbers-left-style = "#6c7086"
44-
line-numbers-minus-style = "bold #f38ba8"
45-
line-numbers-plus-style = "bold #a6e3a1"
46-
line-numbers-right-style = "#6c7086"
47-
line-numbers-zero-style = "#6c7086"
48-
# 25% red 75% base
49-
minus-emph-style = "bold syntax #53394c"
50-
# 10% red 90% base
51-
minus-style = "syntax #35293b"
52-
# 25% green 75% base
53-
plus-emph-style = "bold syntax #40504b"
54-
# 10% green 90% base
55-
plus-style = "syntax #2c333a"
56-
# Should match the name of the bat theme
57-
syntax-theme = "Catppuccin-mocha"
33+
blame-palette = "#1e1e2e #181825 #11111b #313244 #45475a"
34+
commit-decoration-style = "box ul"
35+
dark = true
36+
file-decoration-style = "#cdd6f4"
37+
file-style = "#cdd6f4"
38+
hunk-header-decoration-style = "box ul"
39+
hunk-header-file-style = "bold"
40+
hunk-header-line-number-style = "bold #a6adc8"
41+
hunk-header-style = "file line-number syntax"
42+
line-numbers = true
43+
line-numbers-left-style = "#6c7086"
44+
line-numbers-minus-style = "bold #f38ba8"
45+
line-numbers-plus-style = "bold #a6e3a1"
46+
line-numbers-right-style = "#6c7086"
47+
line-numbers-zero-style = "#6c7086"
48+
# 25% red 75% base
49+
minus-emph-style = "bold syntax #53394c"
50+
# 10% red 90% base
51+
minus-style = "syntax #35293b"
52+
# 25% green 75% base
53+
plus-emph-style = "bold syntax #40504b"
54+
# 10% green 90% base
55+
plus-style = "syntax #2c333a"
56+
# Should match the name of the bat theme
57+
syntax-theme = "Catppuccin-mocha"
5858
# Delta configuration
5959
[delta]
6060
navigate = true # use n and N to move between diff sections
@@ -67,12 +67,12 @@
6767
colorMoved = default
6868
# Tell git about my ssh key
6969
[gpg]
70-
format = ssh
70+
format = ssh
7171
# [includeIf "gitdir:~/code/<work>/"]
7272
# path = "~/code/<work>/.gitconfig"
7373
# "main" as main branch
7474
[init]
75-
defaultBranch = main
75+
defaultBranch = main
7676
# Use delta
7777
[interactive]
7878
diffFilter = delta --color-only
@@ -89,11 +89,11 @@
8989
autosquash = true
9090
# Force ssh
9191
92-
insteadOf = "https://github.com/"
92+
insteadOf = "https://github.com/"
9393
# Avoid data corruption
9494
[transfer]
95-
fsckobjects = true
95+
fsckobjects = true
9696
[fetch]
97-
fsckobjects = true
97+
fsckobjects = true
9898
[receive]
9999
fsckobjects = true

nvim/.config/nvim/lua/plugins/lsp/conform.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ return {
1313
formatters_by_ft = {
1414
lua = { "stylua" },
1515
python = { "ruff_fix", "ruff_format", "trim_whitespace" },
16-
-- markdown = { "vale" },
16+
c = { "clang_format" },
1717
javascript = { "prettier" },
1818
["*"] = { "codespell" },
1919
},

nvim/.config/nvim/lua/plugins/lsp/mason.lua

+7-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@ return {
2525
'terraform-ls',
2626
-- Docker
2727
'docker-compose-language-service',
28-
'dockerfile-language-server'
28+
'dockerfile-language-server',
29+
-- Lua
30+
'stylua',
31+
'lua-language-server',
32+
-- C
33+
'clangd',
34+
'clang-format',
2935
},
3036
},
3137
---@param opts MasonSettings | {ensure_installed: string[]}

0 commit comments

Comments
 (0)