summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--after/ftplugin/dart.lua2
-rw-r--r--after/ftplugin/html.lua1
-rw-r--r--after/ftplugin/javascript.lua1
-rw-r--r--after/ftplugin/python.lua3
l---------after/ftplugin/typescript.lua1
l---------after/ftplugin/typescriptreact.lua1
l---------after/ftplugin/vue.lua1
-rw-r--r--lazy-lock.json10
-rw-r--r--lua/filetypes.lua25
-rw-r--r--lua/misc.lua4
-rw-r--r--lua/plugins/10_ide.lua85
-rw-r--r--lua/plugins/50_ui.lua2
12 files changed, 102 insertions, 34 deletions
diff --git a/after/ftplugin/dart.lua b/after/ftplugin/dart.lua
new file mode 100644
index 0000000..85ec4ed
--- /dev/null
+++ b/after/ftplugin/dart.lua
@@ -0,0 +1,2 @@
+require('conftool').set({'tabstop', 2}, {'shiftwidth', 2}, 'expandtab')
+vim.cmd 'IndentGuidesDisable'
diff --git a/after/ftplugin/html.lua b/after/ftplugin/html.lua
new file mode 100644
index 0000000..abd4d87
--- /dev/null
+++ b/after/ftplugin/html.lua
@@ -0,0 +1 @@
+require('conftool').set({'tabstop', 2},{'shiftwidth', 2})
diff --git a/after/ftplugin/javascript.lua b/after/ftplugin/javascript.lua
new file mode 100644
index 0000000..abd4d87
--- /dev/null
+++ b/after/ftplugin/javascript.lua
@@ -0,0 +1 @@
+require('conftool').set({'tabstop', 2},{'shiftwidth', 2})
diff --git a/after/ftplugin/python.lua b/after/ftplugin/python.lua
new file mode 100644
index 0000000..b0f98bf
--- /dev/null
+++ b/after/ftplugin/python.lua
@@ -0,0 +1,3 @@
+local ct = require('conftool')
+
+ct.set({'tabstop', 4}, {'shiftwidth', 4}, 'expandtab')
diff --git a/after/ftplugin/typescript.lua b/after/ftplugin/typescript.lua
new file mode 120000
index 0000000..4b8d109
--- /dev/null
+++ b/after/ftplugin/typescript.lua
@@ -0,0 +1 @@
+javascript.lua \ No newline at end of file
diff --git a/after/ftplugin/typescriptreact.lua b/after/ftplugin/typescriptreact.lua
new file mode 120000
index 0000000..ede1851
--- /dev/null
+++ b/after/ftplugin/typescriptreact.lua
@@ -0,0 +1 @@
+typescript.lua \ No newline at end of file
diff --git a/after/ftplugin/vue.lua b/after/ftplugin/vue.lua
new file mode 120000
index 0000000..4b8d109
--- /dev/null
+++ b/after/ftplugin/vue.lua
@@ -0,0 +1 @@
+javascript.lua \ No newline at end of file
diff --git a/lazy-lock.json b/lazy-lock.json
index 64ffb18..4e6bea2 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,9 +1,12 @@
{
- "aerial.nvim": { "branch": "master", "commit": "9ebc13583cff447f5493a63e99dfca526b3c3088" },
+ "Ollama-Copilot": { "branch": "main", "commit": "8004f8b9e7c4e45decce1a47c7daa33fa0549724" },
+ "aerial.nvim": { "branch": "master", "commit": "44684bf429dc40e97a6d00ffa09043ac3f692186" },
"closetag.vim": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
+ "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
"coq.artifacts": { "branch": "artifacts", "commit": "ef5f21d638ccc456cfa5b8d0ab37093cefe48c8b" },
"coq_nvim": { "branch": "coq", "commit": "d83bc18d044cfcd65e91dc49740a353546bc143b" },
"delimitMate": { "branch": "master", "commit": "becbd2d353a2366171852387288ebb4b33a02487" },
+ "flutter-tools.nvim": { "branch": "main", "commit": "6faf2c70bd56f1fe78620591a2bb73f4dc6f4870" },
"goyo.vim": { "branch": "master", "commit": "fa0263d456dd43f5926484d1c4c7022dfcb21ba9" },
"hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
"kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
@@ -11,9 +14,10 @@
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+ "nvim-cmp": { "branch": "main", "commit": "059e89495b3ec09395262f16b1ad441a38081d04" },
"nvim-lsp-basics": { "branch": "main", "commit": "632714bd3ab355eb6e725b5a78cd8730f12d14d2" },
- "nvim-lspconfig": { "branch": "master", "commit": "200280dab91a7df2ca42fd2ab3cb4c5fab056666" },
- "nvim-treesitter": { "branch": "master", "commit": "e329e94a6a0a5ccf6ec8bfec1d10faf5eaae665f" },
+ "nvim-lspconfig": { "branch": "master", "commit": "ff6471d4f837354d8257dfa326b031dd8858b16e" },
+ "nvim-treesitter": { "branch": "master", "commit": "4b390e1e46ca2e6220f14641cb840bbf9ad5446f" },
"onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "de39919a57e1a40a4c7dc5bae0de276f9c616ef3" },
diff --git a/lua/filetypes.lua b/lua/filetypes.lua
index 78a2c70..08aed46 100644
--- a/lua/filetypes.lua
+++ b/lua/filetypes.lua
@@ -9,9 +9,9 @@ local defs = require('defaults')
ct.augroup('templates',
{'BufNewFile', '*.c', '0r', defs.template_dir .. '/c_stdio.c'},
{'BufNewFile', '*.cpp', '0r', defs.template_dir .. '/cpp_iostream.cpp'},
+ {'BufNewFile', '*.desktop', '0r', defs.template_dir .. '/desktop'},
{'BufNewFile', '*.go', '0r', defs.template_dir .. '/go.go'},
- {'BufNewFile', '*.html', '0r', defs.template_dir .. '/html.html'},
- {'BufNewFile', '*.html', '0r', defs.template_dir .. '/html.html'},
+ {'BufNewFile', '*.html', '0r', defs.template_dir .. '/html-index.html'},
{'BufNewFile', '*.py', '0r', defs.template_dir .. '/py.py'},
{'BufNewFile', '*.sh', '0r', defs.template_dir .. '/sh.sh'}
)
@@ -19,16 +19,19 @@ ct.augroup('templates',
--
-- FileType based Settings
--
-ct.augroup('filetypeSettings',
- {'FileType', 'python', 'setlocal', 'tabstop=4 shiftwidth=4 expandtab'},
- {'FileType', 'html', 'setlocal', 'tabstop=2 shiftwidth=2'},
- {'FileType', 'javascript', 'setlocal', 'tabstop=2 shiftwidth=2'},
- {'FileType', 'typescript', 'setlocal', 'tabstop=2 shiftwidth=2'},
- {'FileType', 'typescriptreact','setlocal', 'tabstop=2 shiftwidth=2'},
- {'FileType', 'vue', 'setlocal', 'tabstop=2 shiftwidth=2'}
-)
+
+-- moved to after/ftplugin
+-- ct.augroup('filetypeSettings',
+-- {'FileType', 'python', 'setlocal', 'tabstop=4 shiftwidth=4 expandtab'},
+-- {'FileType', 'dart', 'setlocal', 'tabstop=2 shiftwidth=2 expandtab'},
+-- {'FileType', 'html', 'setlocal', 'tabstop=2 shiftwidth=2'},
+-- {'FileType', 'javascript', 'setlocal', 'tabstop=2 shiftwidth=2'},
+-- {'FileType', 'typescript', 'setlocal', 'tabstop=2 shiftwidth=2'},
+-- {'FileType', 'typescriptreact','setlocal', 'tabstop=2 shiftwidth=2'},
+-- {'FileType', 'vue', 'setlocal', 'tabstop=2 shiftwidth=2'}
+-- )
--
-- Misc.
--
-vim.cmd 'autocmd BufWritePost *.go,*.py,*.js,*.ts,*tsx,*.tex LspFormat' -- run lspformat when saving in go
+vim.cmd 'autocmd BufWritePost *.go,*.py,*.js,*.ts,*tsx,*.tex LspFormat' -- run lspformat when saving
diff --git a/lua/misc.lua b/lua/misc.lua
index 1fe2c30..467524b 100644
--- a/lua/misc.lua
+++ b/lua/misc.lua
@@ -3,7 +3,7 @@ local ct = require('conftool')
--
-- Encoding
--
-ct.set({'encoding', 'utf-8'}, {'fileencoding', 'utf-8'})
+-- ct.set({'encoding', 'utf-8'}, {'fileencoding', 'utf-8'})
--
-- Search
@@ -34,7 +34,7 @@ ct.set({'spellsuggest', {'best', 5}})
vim.g.netrw_liststyle = 3 -- tree style display
vim.g.netrw_banner = 0 -- no banner needed
vim.g.netrw_browse_split = 0
-vim.g.netrw_chgwin = 1
+vim.g.netrw_chgwin = 1
--
-- EtC.
diff --git a/lua/plugins/10_ide.lua b/lua/plugins/10_ide.lua
index 3dfe6b2..6fdc7fa 100644
--- a/lua/plugins/10_ide.lua
+++ b/lua/plugins/10_ide.lua
@@ -9,8 +9,9 @@ return {
"bash",
"bibtex",
"c",
+ "cs",
"cpp",
- "css",
+ "cs",
"go",
"html",
"http",
@@ -42,12 +43,12 @@ return {
dependencies = { 'ms-jpq/coq.artifacts' },
branch = 'coq',
build = ':COQdeps',
+ event = { "VimEnter" },
config = function()
vim.cmd([[autocmd VimEnter * COQnow -s]])
end
},
- --
-- Language Configurations
--
{ 'ap/vim-css-color', lazy = false },
@@ -63,6 +64,21 @@ return {
},
{ 'bellinitte/uxntal.vim', lazy = false },
+ {
+ 'nvim-flutter/flutter-tools.nvim',
+ ft = 'dart',
+ dependencies = {
+ 'nvim-lua/plenary.nvim',
+ 'nanotee/nvim-lsp-basics',
+ },
+ opts = {
+ lsp = {
+ color = {
+ enabled = true,
+ },
+ },
+ },
+ },
--
-- Language Server
@@ -109,10 +125,55 @@ return {
end
},
{
+ 'hrsh7th/cmp-nvim-lsp',
+ dependencies = {
+ 'hrsh7th/nvim-cmp',
+ }
+ },
+ {
+ 'jacob411/Ollama-Copilot',
+ dependencies = {
+ 'hrsh7th/cmp-nvim-lsp',
+ },
+ opts = {
+ model_name = "qwen2.5-coder:14b",
+ stream_suggestion = false,
+ python_command = "python3",
+ filetypes = {
+ "bash",
+ "c",
+ "cpp",
+ "cs",
+ "dart",
+ "go",
+ "html",
+ "javascript",
+ "javascriptreact",
+ "json",
+ "lua",
+ "python",
+ "tex",
+ "typescript",
+ "typescriptreact",
+ },
+ ollama_model_opts = {
+ num_predict = 40,
+ temperature = 0.1,
+ },
+ keymaps = {
+ suggestion = '<leader>os',
+ reject = '<leader>or',
+ insert_accept = '<Leader><Tab>',
+ },
+
+ },
+ },
+ {
'williamboman/mason-lspconfig.nvim',
dependencies = {
'ms-jpq/coq_nvim',
'nanotee/nvim-lsp-basics',
+ 'jacob411/Ollama-Copilot',
'neovim/nvim-lspconfig',
'stevearc/aerial.nvim',
'williamboman/mason.nvim',
@@ -135,6 +196,7 @@ return {
"bash",
"c",
"cpp",
+ "cs",
"dart",
"go",
"html",
@@ -169,26 +231,14 @@ return {
-- Show code diagnostics in a separate buffer window
{
'folke/trouble.nvim',
- opts = {
- height = 6,
- icons = false,
- fold_open = "v",
- fold_closed = ">",
- signs = {
- error = "E:",
- warning = "W:",
- hint = "H:",
- information = "I:"
- },
- use_diagnostic_signs = false
- },
+ opts = {},
cmd = {
- "TroubleToggle",
+ "Trouble",
},
keys = {
- {'<Leader>t', ':TroubleToggle<CR>'},
+ {'<Leader>t', ':Trouble diagnostics toggle<CR>'},
}
},
--
@@ -220,6 +270,7 @@ return {
-- Open request results in a horizontal split
result_split_horizontal = true,
-- Keep the http file buffer above|left when split horizontal|vertical
+ --
result_split_in_place = true,
result = {
show_curl_command = false,
diff --git a/lua/plugins/50_ui.lua b/lua/plugins/50_ui.lua
index 1382bf1..a0c8340 100644
--- a/lua/plugins/50_ui.lua
+++ b/lua/plugins/50_ui.lua
@@ -35,7 +35,7 @@ return {
{
'nathanaelkane/vim-indent-guides',
lazy = false,
- setup = function()
+ init = function()
vim.g.indent_guides_guide_size = 1
vim.g.indent_guides_tab_guides = 0
vim.g.indent_guides_start_level = 2
generated by cgit v1.3 (git 2.53.0) at 2026-11-02 17:27:22 +0000