Skip to content

Commit 7986102

Browse files
committed
Apply formatting using stylua
- Install lua using `cargo install stylua` - Run `stylua .`
1 parent 8bf05c5 commit 7986102

55 files changed

Lines changed: 1468 additions & 1293 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
column_width = 120
2+
line_endings = "Unix"
3+
indent_type = "Spaces"
4+
indent_width = 2
5+
quote_style = "AutoPreferSingle"

stow/nvim/.config/nvim/init.lua

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
require "user.options"
2-
require "user.keymaps"
3-
require "user.colorscheme"
4-
require "user.plugins"
5-
require "user.lsp"
6-
require "user.cmp"
7-
require "user.telescope"
8-
require "user.gitsigns"
9-
require "user.treesitter"
10-
require "user.autopairs"
11-
require "user.comment"
12-
require "user.nvim-tree"
13-
require "user.bufferline"
14-
require "user.lualine"
15-
require "user.toggleterm"
16-
require "user.project"
17-
require "user.impatient"
18-
require "user.indentline"
19-
require "user.whichkey"
20-
require "user.autocommands"
21-
require "user.fzf"
22-
require "user.cmake"
23-
require "user.asyncrun"
24-
require "user.clangformat"
25-
require "user.cmake"
26-
require "user.diffview"
27-
require "user.doxygentoolkit"
28-
require "user.fugitive"
29-
require "user.headerguard"
30-
require "user.nerdcommenter"
31-
require "user.startify"
32-
require "user.undotree"
33-
require "user.tagbar"
34-
require "user.easymotion"
35-
require "user.doge"
36-
require "user.neogit"
37-
require "user.vim-gh-line"
38-
require "user.neogen"
1+
require('user.options')
2+
require('user.keymaps')
3+
require('user.colorscheme')
4+
require('user.plugins')
5+
require('user.lsp')
6+
require('user.cmp')
7+
require('user.telescope')
8+
require('user.gitsigns')
9+
require('user.treesitter')
10+
require('user.autopairs')
11+
require('user.comment')
12+
require('user.nvim-tree')
13+
require('user.bufferline')
14+
require('user.lualine')
15+
require('user.toggleterm')
16+
require('user.project')
17+
require('user.impatient')
18+
require('user.indentline')
19+
require('user.whichkey')
20+
require('user.autocommands')
21+
require('user.fzf')
22+
require('user.cmake')
23+
require('user.asyncrun')
24+
require('user.clangformat')
25+
require('user.cmake')
26+
require('user.diffview')
27+
require('user.doxygentoolkit')
28+
require('user.fugitive')
29+
require('user.headerguard')
30+
require('user.nerdcommenter')
31+
require('user.startify')
32+
require('user.undotree')
33+
require('user.tagbar')
34+
require('user.easymotion')
35+
require('user.doge')
36+
require('user.neogit')
37+
require('user.vim-gh-line')
38+
require('user.neogen')
3939
--require "user.lspsaga"
40-
require "user.trouble"
41-
require "user.neo-tree"
42-
require "user.harpoon"
43-
require "user.possession"
44-
require "user.dap"
45-
require "user.lazydev"
46-
require "user.iron"
40+
require('user.trouble')
41+
require('user.neo-tree')
42+
require('user.harpoon')
43+
require('user.possession')
44+
require('user.dap')
45+
require('user.lazydev')
46+
require('user.iron')

stow/nvim/.config/nvim/lua/user/alpha.lua

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
local status_ok, alpha = pcall(require, "alpha")
1+
local status_ok, alpha = pcall(require, 'alpha')
22
if not status_ok then
3-
return
3+
return
44
end
55

6-
local dashboard = require("alpha.themes.dashboard")
6+
local dashboard = require('alpha.themes.dashboard')
77
dashboard.section.header.val = {
8-
[[ __ ]],
9-
[[ ___ ___ ___ __ __ /\_\ ___ ___ ]],
10-
[[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]],
11-
[[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]],
12-
[[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]],
13-
[[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]],
8+
[[ __ ]],
9+
[[ ___ ___ ___ __ __ /\_\ ___ ___ ]],
10+
[[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]],
11+
[[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]],
12+
[[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]],
13+
[[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]],
1414
}
1515
-- dashboard.section.buttons.val = {
1616
-- dashboard.button("f", " Find file", ":Telescope find_files <CR>"),
@@ -23,17 +23,17 @@ dashboard.section.header.val = {
2323
-- }
2424

2525
local function footer()
26-
-- NOTE: requires the fortune-mod package to work
27-
-- local handle = io.popen("fortune")
28-
-- local fortune = handle:read("*a")
29-
-- handle:close()
30-
-- return fortune
31-
return "chrisatmachine.com"
26+
-- NOTE: requires the fortune-mod package to work
27+
-- local handle = io.popen("fortune")
28+
-- local fortune = handle:read("*a")
29+
-- handle:close()
30+
-- return fortune
31+
return 'chrisatmachine.com'
3232
end
3333

34-
dashboard.section.footer.opts.hl = "Type"
35-
dashboard.section.header.opts.hl = "Include"
36-
dashboard.section.buttons.opts.hl = "Keyword"
34+
dashboard.section.footer.opts.hl = 'Type'
35+
dashboard.section.header.opts.hl = 'Include'
36+
dashboard.section.buttons.opts.hl = 'Keyword'
3737

3838
dashboard.opts.opts.noautocmd = true
3939
-- vim.cmd([[autocmd User AlphaReady echo 'ready']])
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
-- Catkin builds
2-
vim.keymap.set("n", vim.g.altleader .. "kb", ":AsyncRun -cwd=<root> catkin build<CR>")
3-
vim.keymap.set("n", vim.g.altleader .. "kt", ":AsyncRun -cwd=<root> catkin build --make-args tests<CR>")
4-
vim.keymap.set("n", vim.g.altleader .. "kn", ":AsyncStop<CR>")
5-
vim.keymap.set("n", vim.g.altleader .. "<space>", ":call asyncrun#quickfix_toggle(20)<CR>")
2+
vim.keymap.set('n', vim.g.altleader .. 'kb', ':AsyncRun -cwd=<root> catkin build<CR>')
3+
vim.keymap.set('n', vim.g.altleader .. 'kt', ':AsyncRun -cwd=<root> catkin build --make-args tests<CR>')
4+
vim.keymap.set('n', vim.g.altleader .. 'kn', ':AsyncStop<CR>')
5+
vim.keymap.set('n', vim.g.altleader .. '<space>', ':call asyncrun#quickfix_toggle(20)<CR>')
66
vim.g.asyncrun_open = 4
77

88
local function OnAsyncRunFinished()
99
if vim.g.asyncrun_status == 'success' then
10-
vim.defer_fn(function() vim.cmd('cclose') end, 1000)
10+
vim.defer_fn(function()
11+
vim.cmd('cclose')
12+
end, 1000)
1113
else
1214
vim.cmd('copen 20')
1315
end
1416
end
1517

16-
vim.g.asyncrun_exit = "call OnAsyncRunFinished()"
17-
18+
vim.g.asyncrun_exit = 'call OnAsyncRunFinished()'

stow/nvim/.config/nvim/lua/user/autocommands.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
vim.cmd [[
1+
vim.cmd([[
22
augroup _general_settings
33
autocmd!
44
autocmd FileType qf,help,man,lspinfo nnoremap <silent> <buffer> q :close<CR>
@@ -30,7 +30,7 @@ vim.cmd [[
3030
autocmd!
3131
autocmd User AlphaReady set showtabline=0 | autocmd BufUnload <buffer> set showtabline=2
3232
augroup end
33-
]]
33+
]])
3434
-- Autoformat
3535
-- augroup _lsp
3636
-- autocmd!
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
-- Setup nvim-cmp.
2-
local status_ok, npairs = pcall(require, "nvim-autopairs")
2+
local status_ok, npairs = pcall(require, 'nvim-autopairs')
33
if not status_ok then
44
return
55
end
66

7-
npairs.setup {
7+
npairs.setup({
88
check_ts = true,
99
ts_config = {
10-
lua = { "string", "source" },
11-
javascript = { "string", "template_string" },
10+
lua = { 'string', 'source' },
11+
javascript = { 'string', 'template_string' },
1212
java = false,
1313
},
14-
disable_filetype = { "TelescopePrompt", "spectre_panel" },
14+
disable_filetype = { 'TelescopePrompt', 'spectre_panel' },
1515
fast_wrap = {
16-
map = "<M-e>",
17-
chars = { "{", "[", "(", '"', "'" },
18-
pattern = string.gsub([[ [%'%"%)%>%]%)%}%,] ]], "%s+", ""),
16+
map = '<M-e>',
17+
chars = { '{', '[', '(', '"', "'" },
18+
pattern = string.gsub([[ [%'%"%)%>%]%)%}%,] ]], '%s+', ''),
1919
offset = 0, -- Offset from pattern match
20-
end_key = "$",
21-
keys = "qwertyuiopzxcvbnmasdfghjkl",
20+
end_key = '$',
21+
keys = 'qwertyuiopzxcvbnmasdfghjkl',
2222
check_comma = true,
23-
highlight = "PmenuSel",
24-
highlight_grey = "LineNr",
23+
highlight = 'PmenuSel',
24+
highlight_grey = 'LineNr',
2525
},
26-
}
26+
})
2727

28-
local cmp_autopairs = require "nvim-autopairs.completion.cmp"
29-
local cmp_status_ok, cmp = pcall(require, "cmp")
28+
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
29+
local cmp_status_ok, cmp = pcall(require, 'cmp')
3030
if not cmp_status_ok then
3131
return
3232
end
33-
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done { map_char = { tex = "" } })
33+
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } }))

0 commit comments

Comments
 (0)