Skip to content

Commit c6356a5

Browse files
morfizemorfize
committed
update
1 parent cc7917b commit c6356a5

7 files changed

Lines changed: 532 additions & 39 deletions

File tree

‎init.lua‎

Lines changed: 93 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,80 @@ require('lazy').setup({
699699
},
700700
},
701701
},
702+
bashls = {
703+
-- cmd = {},
704+
filetypes = { 'bash', 'zsh', 'sh' },
705+
-- capabilities = {},
706+
-- settings = {},
707+
},
708+
yamlls = {},
709+
taplo = { -- for TOML
710+
cmd = { 'taplo', 'lsp', 'stdio' },
711+
filetypes = { 'toml' },
712+
capabilities = {},
713+
settings = {},
714+
},
715+
rust_analyzer = {
716+
cmd = {},
717+
filetypes = {},
718+
capabilities = {},
719+
settings = {
720+
['rust-analyzer'] = {
721+
checkOnSave = {
722+
enable = true,
723+
},
724+
diagnostics = {
725+
enable = true,
726+
underline = false,
727+
},
728+
imports = {
729+
granularity = {
730+
group = 'module',
731+
},
732+
prefix = 'self',
733+
},
734+
cargo = {
735+
buildScripts = {
736+
enable = true,
737+
},
738+
},
739+
procMacro = {
740+
enable = true,
741+
},
742+
},
743+
},
744+
},
745+
hls = {
746+
cmd = { 'haskell-language-server-wrapper', '--lsp' },
747+
filetypes = { 'haskell', 'lhaskell', 'cabal' },
748+
capabilities = {},
749+
root_dir = function(bufnr, on_dir)
750+
local fname = vim.api.nvim_buf_get_name(bufnr)
751+
local util = require 'neovim.util'
752+
on_dir(util.root_pattern('hie.yaml', 'stack.yaml', 'cabal.project', '*.cabal', 'package.yaml')(fname))
753+
end,
754+
settings = {
755+
haskell = {
756+
cabalFormattingProvider = 'cabalfmt',
757+
formattingProvider = 'ormolu',
758+
},
759+
},
760+
},
761+
tinymist = {
762+
cmd = { 'tinymist' },
763+
filetypes = { 'typ' },
764+
settings = {
765+
formatterMode = 'typStyle',
766+
exportPdf = 'onType',
767+
semanticTokens = 'disable',
768+
},
769+
},
770+
-- vale_ls = {
771+
-- cmd = { 'vale', 'lsp' },
772+
-- filetypes = { 'markdown', 'mdx' },
773+
-- capabilities = {},
774+
-- settings = {},
775+
-- },
702776
}
703777

704778
-- Ensure the servers and tools above are installed
@@ -717,6 +791,10 @@ require('lazy').setup({
717791
local ensure_installed = vim.tbl_keys(servers or {})
718792
vim.list_extend(ensure_installed, {
719793
'stylua', -- Used to format Lua code
794+
'beautysh',
795+
'markdownlint',
796+
'hlint',
797+
'tinymist',
720798
})
721799
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
722800

@@ -769,6 +847,7 @@ require('lazy').setup({
769847
end,
770848
formatters_by_ft = {
771849
lua = { 'stylua' },
850+
markdown = { 'markdownlint' },
772851
-- Conform can also run multiple formatters sequentially
773852
-- python = { "isort", "black" },
774853
--
@@ -946,7 +1025,20 @@ require('lazy').setup({
9461025
config = function()
9471026
local ts = require 'nvim-treesitter'
9481027
ts.setup {}
949-
ts.install({ 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }):wait(30000)
1028+
ts.install({
1029+
'bash',
1030+
'c',
1031+
'diff',
1032+
'html',
1033+
'lua',
1034+
'luadoc',
1035+
'markdown',
1036+
'markdown_inline',
1037+
'query',
1038+
'vim',
1039+
'vimdoc',
1040+
'd2',
1041+
}):wait(30000)
9501042
end,
9511043

9521044
-- There are additional nvim-treesitter modules that you can use to interact

‎lua/custom/plugins/copilot.lua‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,20 @@ return {
9292
},
9393
server_opts_overrides = {},
9494
}
95+
-- CopilotChat.nvim
96+
local map = vim.keymap.set
97+
local opts = { noremap = true, silent = true }
98+
99+
map('n', '<Leader>cci', '<cmd>CopilotChat ', { desc = ':CopilotChat', unpack(opts) })
100+
map('n', '<Leader>cco', '<cmd>CopilotChatOpen<CR>', { desc = ':CopilotChatOpen', unpack(opts) })
101+
map('n', '<Leader>ccq', '<cmd>CopilotChatClose<CR>', { desc = ':CopilotChatClose', unpack(opts) })
102+
map('n', '<Leader>cct', '<cmd>CopilotChatToggle<CR>', { desc = ':CopilotChatToggle', unpack(opts) })
103+
map('n', '<Leader>ccs', '<cmd>CopilotChatStop<CR>', { desc = ':CopilotChatStop', unpack(opts) })
104+
map('n', '<Leader>ccr', '<cmd>CopilotChatReset<CR>', { desc = ':CopilotChatReset', unpack(opts) })
105+
map('n', '<leader>ccS', '<cmd>CopilotChatSave ', { desc = 'Save Copilot Chat history', noremap = true, silent = false })
106+
map('n', '<leader>ccL', '<cmd>CopilotChatLoad ', { desc = 'Load Copilot Chat history', noremap = true, silent = false })
107+
map('n', '<leader>ccp', '<cmd>CopilotChatPrompts<CR>', { desc = 'Copilot Chat prompt templates', unpack(opts) })
108+
map('n', '<leader>ccm', '<cmd>CopilotChatModels<CR>', { desc = 'Copilot Chat models', unpack(opts) })
109+
map('n', '<leader>ccE', '<cmd>CopilotChat', { desc = 'Copilot Chat prompt template', noremap = true, silent = false })
95110
end,
96111
}

‎lua/custom/plugins/init.lua‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,30 +46,19 @@ map('n', '<Leader>V', '<cmd>ToggleTerm size=80 direction=vertical<CR>', { desc =
4646
map('n', '<M-i>', '<cmd>ToggleTerm direction=float<CR>', { desc = 'Open Terminal floating' })
4747
map('t', '<M-i>', '<cmd>ToggleTerm direction=float<CR>', { desc = 'Open Terminal floating' })
4848

49-
-- CopilotChat.nvim
50-
map('n', '<Leader>cci', '<cmd>CopilotChat ', { desc = ':CopilotChat', unpack(opts) })
51-
map('n', '<Leader>cco', '<cmd>CopilotChatOpen<CR>', { desc = ':CopilotChatOpen', unpack(opts) })
52-
map('n', '<Leader>ccq', '<cmd>CopilotChatClose<CR>', { desc = ':CopilotChatClose', unpack(opts) })
53-
map('n', '<Leader>cct', '<cmd>CopilotChatToggle<CR>', { desc = ':CopilotChatToggle', unpack(opts) })
54-
map('n', '<Leader>ccs', '<cmd>CopilotChatStop<CR>', { desc = ':CopilotChatStop', unpack(opts) })
55-
map('n', '<Leader>ccr', '<cmd>CopilotChatReset<CR>', { desc = ':CopilotChatReset', unpack(opts) })
56-
map('n', '<leader>ccS', '<cmd>CopilotChatSave ', { desc = 'Save Copilot Chat history', noremap = true, silent = false })
57-
map('n', '<leader>ccL', '<cmd>CopilotChatLoad ', { desc = 'Load Copilot Chat history', noremap = true, silent = false })
58-
map('n', '<leader>ccp', '<cmd>CopilotChatPrompts<CR>', { desc = 'Copilot Chat prompt templates', unpack(opts) })
59-
map('n', '<leader>ccm', '<cmd>CopilotChatModels<CR>', { desc = 'Copilot Chat models', unpack(opts) })
60-
map('n', '<leader>ccE', '<cmd>CopilotChat', { desc = 'Copilot Chat prompt template', noremap = true, silent = false })
61-
62-
-- macos like keybindings for text editing in insert mode
63-
map('i', '<C-a>', '<C-o>^', opts)
64-
map('i', '<C-e>', '<C-o>$', opts)
65-
map('i', '<C-k>', '<C-o>D', opts)
66-
map('i', '<C-u>', '<C-o>d0', opts)
67-
map('i', '<C-f>', '<Right>', opts)
68-
map('i', '<C-b>', '<Left>', opts)
69-
map('i', '<C-d>', '<Del>', opts)
70-
map('i', '<C-h>', '<BS>', opts)
71-
map('i', '<C-n>', '<Down>', opts)
72-
map('i', '<C-p>', '<Up>', opts)
49+
-- NOTE: macos like keybindings for text editing in insert mode
50+
51+
-- map('i', '<C-a>', '<C-o>^', opts)
52+
-- map('i', '<C-e>', '<C-o>$', opts)
53+
-- map('i', '<C-k>', '<C-o>D', opts)
54+
-- map('i', '<C-u>', '<C-o>d0', opts)
55+
-- map('i', '<C-f>', '<Right>', opts)
56+
-- map('i', '<C-b>', '<Left>', opts)
57+
-- map('i', '<C-d>', '<Del>', opts)
58+
-- map('i', '<C-h>', '<BS>', opts)
59+
-- map('i', '<C-n>', '<Down>', opts)
60+
-- map('i', '<C-p>', '<Up>', opts)
61+
7362
-- NOTE: keymaps end
7463

7564
-- NOTE: neovide

‎lua/custom/plugins/snacks.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ return {
1010
bigfile = { enabled = true },
1111
dashboard = { enabled = true },
1212
explorer = { enabled = true },
13+
image = { enabled = false },
1314
indent = { enabled = true },
1415
input = { enabled = true },
1516
picker = { enabled = true },

‎lua/custom/plugins/tree-sitter-d2.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
return {
22
'ravsii/tree-sitter-d2',
3+
lazy = 'VeryLazy',
34
enable = true,
45
ft = { 'd2', 'md' },
6+
version = '*',
57
dependencies = { 'nvim-treesitter/nvim-treesitter' },
68
build = 'make nvim-install',
79
}

‎lua/kickstart/plugins/lint.lua‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ return {
77
local lint = require 'lint'
88
lint.linters_by_ft = {
99
markdown = { 'markdownlint' },
10+
mdx = { 'markdownlint' },
11+
haskell = { 'hlint' },
12+
typ = { 'tinymist' },
13+
}
14+
local markdownlint = require 'lint.linters.markdownlint'
15+
markdownlint.args = {
16+
'--disable',
17+
'MD013', -- Line length
18+
'MD024', -- Multiple headers with the same content
19+
'MD025', -- Multiple top level headers in the same document
20+
'MD033', -- Inline HTML
21+
-- 'MD041', -- First line in file should be a top level header
1022
}
1123

1224
-- To allow other plugins to add linters to require('lint').linters_by_ft,

0 commit comments

Comments
 (0)