after/ftplugin/dart.lua

@@ -1,2 +0,0 @@
-require('conftool').set({'tabstop', 2}, {'shiftwidth', 2}, 'expandtab')
-vim.cmd 'IndentGuidesDisable'

after/ftplugin/html.lua

@@ -1 +0,0 @@
-require('conftool').set({'tabstop', 2},{'shiftwidth', 2})

after/ftplugin/javascript.lua

@@ -1 +0,0 @@
-require('conftool').set({'tabstop', 2},{'shiftwidth', 2})

after/ftplugin/python.lua

@@ -1,3 +0,0 @@
-local ct = require('conftool')
-
-ct.set({'tabstop', 4}, {'shiftwidth', 4}, 'expandtab')

after/ftplugin/typescript.lua

@@ -1 +0,0 @@
-javascript.lua

after/ftplugin/typescriptreact.lua

@@ -1 +0,0 @@
-typescript.lua

after/ftplugin/vue.lua

@@ -1 +0,0 @@
-javascript.lua

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-index.html'},
+	{'BufNewFile', '*.html', '0r', defs.template_dir .. '/html.html'},
+	{'BufNewFile', '*.html', '0r', defs.template_dir .. '/html.html'},
 	{'BufNewFile', '*.py', '0r', defs.template_dir .. '/py.py'},
 	{'BufNewFile', '*.sh', '0r', defs.template_dir .. '/sh.sh'}
 )
@@ -19,19 +19,16 @@ ct.augroup('templates',
 --
 -- FileType based Settings
 --
-
+ct.augroup('filetypeSettings',
--- moved to after/ftplugin
+	{'FileType', 'python',		'setlocal', 'tabstop=4 shiftwidth=4 expandtab'},
--- ct.augroup('filetypeSettings',
+	{'FileType', 'html',		'setlocal', 'tabstop=2 shiftwidth=2'},
--- 	{'FileType', 'python',		'setlocal', 'tabstop=4 shiftwidth=4 expandtab'},
+	{'FileType', 'javascript',	'setlocal', 'tabstop=2 shiftwidth=2'},
--- 	{'FileType', 'dart',		'setlocal', 'tabstop=2 shiftwidth=2 expandtab'},
+	{'FileType', 'typescript',	'setlocal', 'tabstop=2 shiftwidth=2'},
--- 	{'FileType', 'html',		'setlocal', 'tabstop=2 shiftwidth=2'},
+	{'FileType', 'typescriptreact','setlocal', 'tabstop=2 shiftwidth=2'},
--- 	{'FileType', 'javascript',	'setlocal', 'tabstop=2 shiftwidth=2'},
+	{'FileType', 'vue',			'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
+vim.cmd 'autocmd BufWritePost *.go,*.py,*.js,*.ts,*tsx,*.tex LspFormat' -- run lspformat when saving in go

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

lua/plugins/10_ide.lua

@@ -9,9 +9,8 @@ return {
 				"bash",
 				"bibtex",
 				"c",
-				"cs",
 				"cpp",
-				"cs",
+				"css",
 				"go",
 				"html",
 				"http",
@@ -43,12 +42,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 },
@@ -64,21 +63,6 @@ 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
@@ -124,56 +108,11 @@ return {
 			vim.diagnostic.config({ virtual_text = false })
 		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',
@@ -196,7 +135,6 @@ return {
 			"bash",
 			"c",
 			"cpp",
-			"cs",
 			"dart",
 			"go",
 			"html",
@@ -231,14 +169,26 @@ return {
 	-- Show code diagnostics in a separate buffer window
 	{
 		'folke/trouble.nvim',
-		opts = {},
+		opts = {
+			height = 6,
+			icons = false,
+			fold_open = "v",
+			fold_closed = ">",
+			signs = {
+				error = "E:",
+				warning = "W:",
+				hint = "H:",
+				information = "I:"
+			},
+			use_diagnostic_signs = false
+		},
 
 		cmd = {
-			"Trouble",
+			"TroubleToggle",
 		},
 
 		keys = 	{
-			{'<Leader>t', ':Trouble diagnostics toggle<CR>'},
+			{'<Leader>t', ':TroubleToggle<CR>'},
 		}
 	},
 	--
@@ -270,7 +220,6 @@ 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,

lua/plugins/50_ui.lua

@@ -35,7 +35,7 @@ return {
 	{
 		'nathanaelkane/vim-indent-guides',
 		lazy = false,
-		init = function()
+		setup = function()
 			vim.g.indent_guides_guide_size = 1
 			vim.g.indent_guides_tab_guides = 0
 			vim.g.indent_guides_start_level = 2