diff --git a/init.lua b/init.lua index 6f66feb..90e362a 100644 --- a/init.lua +++ b/init.lua @@ -35,10 +35,6 @@ require("bindings") -- cmd [[autocmd ColorScheme * highlight StatusLineNC ctermbg=none guibg=none]] -- cmd [[autocmd ColorScheme * highlight CursorLineNr ctermbg=none guibg=none]] --- THEME_BEGIN -cmd("colorscheme srcery") --- THEME_END - -- THEME_BEGIN cmd("colorscheme srcery") -- THEME_END \ No newline at end of file diff --git a/lua/config/bracey.lua b/lua/config/bracey.lua new file mode 100644 index 0000000..adc7fca --- /dev/null +++ b/lua/config/bracey.lua @@ -0,0 +1,3 @@ +vim.g['bracey_server_allow_remote_connections'] = 1 +vim.g['bracey_server_path'] = 'http://localhost' +-- vim.g['bracey_auto_start_browser'] = 0 diff --git a/lua/config/lspinstaller.lua b/lua/config/lspinstaller.lua index 827f302..aa40e63 100644 --- a/lua/config/lspinstaller.lua +++ b/lua/config/lspinstaller.lua @@ -32,5 +32,16 @@ lsp_instller.on_server_ready(function(server) } end) -return M +require("lspconfig").gdscript.setup{ + root_dir = function() + return vim.fn.getcwd() + end, + init_options = lspconfig_config.get_server_init_options("godot"), + on_attach = lspconfig_config.on_attach, + on_init = lspconfig_config.on_init, + flags = lspconfig_config.flags, + capabilities = capabilities, + settings = lspconfig_config.get_server_settings("godot") +} +return M diff --git a/lua/plugins.lua b/lua/plugins.lua index 3f32eb7..af29d08 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -25,6 +25,20 @@ local function usePlugins(use, use_rocks) -- use 'wellle/targets.vim' -- TODO: setup targets.vim + -- Live html, css, javascript reloading + -- TODO: Do auto setup of plugin. + -- Because you have to manually install the server at least once + -- in the location where packer installs this. + -- For me: + -- > cd ~/.local/share/nvim/site/pack/packer/opt/bracey.vim + -- > npm install --prefix server + -- use { + -- 'turbio/bracey.vim', + -- cmd = { 'Bracey', 'BraceyStop', 'BraceyReload', 'BraceyEval' }, + -- run = 'npm install --prefix server', + -- config = [[require 'config.bracey']] + -- } + -- Align characters vertically use 'godlygeek/tabular' @@ -145,6 +159,9 @@ local function usePlugins(use, use_rocks) config = [[require 'config.lspinstaller']] } + -- Godot support + use 'habamax/vim-godot' + -- LSP utils use {"ray-x/lsp_signature.nvim", config = [[require 'config.lspsignature']]} use { @@ -179,18 +196,19 @@ local function usePlugins(use, use_rocks) } -- Color themes - use 'morhetz/gruvbox' - use 'tomasr/molokai' - use 'Mangeshrex/uwu.vim' - use 'ayu-theme/ayu-vim' - use 'sickill/vim-monokai' - use 'joshdick/onedark.vim' use 'srcery-colors/srcery-vim' - use 'mswift42/vim-themes' - use 'squarefrog/tomorrow-night.vim' - use 'fnune/base16-vim' + use 'morhetz/gruvbox' + -- use 'tomasr/molokai' + -- use 'Mangeshrex/uwu.vim' + -- use 'ayu-theme/ayu-vim' + -- use 'sickill/vim-monokai' + -- use 'joshdick/onedark.vim' + -- use 'mswift42/vim-themes' + -- use 'squarefrog/tomorrow-night.vim' + -- use 'fnune/base16-vim' -- Git integration + use 'antonk52/gitignore-grabber.nvim' use { 'tpope/vim-fugitive', config = [[require 'config.fugitive']] } use { 'lewis6991/gitsigns.nvim',