some fixes

4 files changed, 85 insertions, 31 deletions

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