diff --git a/ginit.vim b/ginit.vim index d96cb65..60af804 100644 --- a/ginit.vim +++ b/ginit.vim @@ -12,7 +12,7 @@ if gtk_colorscheme == "'prefer-dark'" set background=dark else set background=light - hi ColorColumn guibg=#c0bfbc + "" hi ColorColumn guibg=#c0bfbc endif "" @@ -21,7 +21,7 @@ endif "" parameters let s:defaultfontsize = 10 -let s:fontname = "Source Code Pro" +let s:fontname = "Roboto Mono [GOOG]" "" set default font :execute "Guifont " . s:fontname . ":h" . s:defaultfontsize diff --git a/lua/plugins/10_ide.lua b/lua/plugins/10_ide.lua index 6fdc7fa..382a0d7 100644 --- a/lua/plugins/10_ide.lua +++ b/lua/plugins/10_ide.lua @@ -124,56 +124,56 @@ 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 = 'os', - reject = 'or', - insert_accept = '', - }, + -- { + -- '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 = 'os', + -- reject = 'or', + -- insert_accept = '', + -- }, - }, - }, + -- }, + -- }, { 'williamboman/mason-lspconfig.nvim', dependencies = { 'ms-jpq/coq_nvim', 'nanotee/nvim-lsp-basics', - 'jacob411/Ollama-Copilot', + -- 'jacob411/Ollama-Copilot', 'neovim/nvim-lspconfig', 'stevearc/aerial.nvim', 'williamboman/mason.nvim', diff --git a/lua/plugins/50_ui.lua b/lua/plugins/50_ui.lua index a0c8340..fae0856 100644 --- a/lua/plugins/50_ui.lua +++ b/lua/plugins/50_ui.lua @@ -7,7 +7,7 @@ return { lazy = false, config = function() local ct = require('conftool') - ct.set({'background', 'light'}) + ct.set({'background', 'dark'}) vim.cmd [[colo onedark]] end, keys = { @@ -48,6 +48,13 @@ return { { 'hiphish/rainbow-delimiters.nvim', lazy = false, - } + }, + -- + -- Neovim Qt + -- + { + 'equalsraf/neovim-gui-shim', + lazy = false, + }, } diff --git a/lua/plugins/90_misc.lua b/lua/plugins/90_misc.lua index 41acb67..ade41ea 100644 --- a/lua/plugins/90_misc.lua +++ b/lua/plugins/90_misc.lua @@ -10,10 +10,10 @@ return { -- -- Multi-cursor -- - { - 'mg979/vim-visual-multi', - lazy = false - }, + -- { + -- 'mg979/vim-visual-multi', + -- lazy = false + -- }, { 'Raimondi/delimitMate', lazy = false } } diff --git a/lua/ui.lua b/lua/ui.lua index f856e00..692f6a9 100644 --- a/lua/ui.lua +++ b/lua/ui.lua @@ -16,10 +16,11 @@ vim.opt.list = true -- -- Misc. -- -ct.set('ruler', 'showcmd', 'cursorline', 'number', 'title') +ct.set('ruler', 'showcmd', 'cursorline', 'title') +-- ct.set('number') ct.set( {'termguicolors', true}, - {'signcolumn', 'yes:1'}, + {'signcolumn', 'number'}, {'conceallevel', 0}, {'colorcolumn', '81,121'}, {'textwidth', 0},