diff --git a/private_dot_config/nvim/init.lua b/private_dot_config/nvim/init.lua index b456875..9ed1039 100644 --- a/private_dot_config/nvim/init.lua +++ b/private_dot_config/nvim/init.lua @@ -5,6 +5,7 @@ vim.wo.number = true vim.wo.signcolumn = "yes" vim.o.scrolloff = 3 vim.o.sidescrolloff = 2 +vim.loader.enable() local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then @@ -18,21 +19,24 @@ if not vim.loop.fs_stat(lazypath) then }) end vim.opt.rtp:prepend(lazypath) + require("lazy").setup({ { "ellisonleao/gruvbox.nvim", priority = 1000 }, { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }, { "nvim-telescope/telescope.nvim", tag = "0.1.1", dependencies = { "nvim-lua/plenary.nvim" } }, { "ojroques/nvim-osc52" }, - { "nvim-tree/nvim-tree.lua"}, + { "nvim-tree/nvim-tree.lua" }, { "jeffkreeftmeijer/vim-numbertoggle" }, { "lukas-reineke/indent-blankline.nvim" }, - { "mbbill/undotree"}, + { "mbbill/undotree" }, { "phaazon/hop.nvim" }, - { "edluffy/hologram.nvim", lazy=true }, - { "echasnovski/mini.nvim", version = "*"}, - { "mg979/vim-visual-multi", branch = "master"}, + { "edluffy/hologram.nvim", lazy = true }, + { "echasnovski/mini.nvim", version = "*" }, + { "mg979/vim-visual-multi", branch = "master" }, { "ethanholz/nvim-lastplace" }, { "rmagatti/auto-session" }, + { 'codota/tabnine-nvim', build = "./dl_binaries.sh" }, + {'akinsho/toggleterm.nvim', version = "*", config = true}, { "antonme/auto-session-nvim-tree" }, { "williamboman/mason.nvim", @@ -63,12 +67,24 @@ require("lazy").setup({ { "neovim/nvim-lspconfig" }, }) -require'nvim-lastplace'.setup { - lastplace_ignore_buftype = {"quickfix", "nofile", "help"}, - lastplace_ignore_filetype = {"gitcommit", "gitrebase", "svn", "hgcommit"}, - lastplace_open_folds = true -} +require("nvim-lastplace").setup({ + lastplace_ignore_buftype = { "quickfix", "nofile", "help" }, + lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" }, + lastplace_open_folds = true, +}) +require('tabnine').setup({ + disable_auto_comment=true, + accept_keymap="", + dismiss_keymap = "", + debounce_ms = 800, + suggestion_color = {gui = "#808080", cterm = 244}, + exclude_filetypes = {"TelescopePrompt"}, + log_file_path = nil, -- absolute path to Tabnine log file +}) + +require('tabnine.status').status() +require("toggleterm").setup{} require("hop").setup() require("mini.ai").setup() @@ -79,12 +95,11 @@ require("mini.statusline").setup() require("mini.tabline").setup() require("mini.bracketed").setup() require("mini.surround").setup() -require("mini.completion").setup() +-- require("mini.completion").setup() - -require('hologram').setup{ - auto_display = true -- WIP automatic markdown image display, may be prone to breaking -} +require("hologram").setup({ + auto_display = true, -- WIP automatic markdown image display, may be prone to breaking +}) require("mason").setup({ ui = { @@ -129,7 +144,7 @@ require("osc52").setup({ }) local hop = require("hop") -local directions = require("hop.hint").HintDirection +-- local directions = require("hop.hint").HintDirection vim.keymap.set("n", "s", function() hop.hint_words() end, { remap = true }) @@ -159,42 +174,31 @@ require("nvim-tree").setup({ }, }) - vim.api.nvim_set_keymap("n", "e", ":NvimTreeToggle", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "t", ":ToggleTerm", { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "q", ":qa", { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "w", ":w", { noremap = true, silent = true }) vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) - -vim.o.sessionoptions="blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" +vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" local auto_session = require("auto-session") local auto_session_nvim_tree = require("auto-session-nvim-tree") --- auto_session.setup { --- log_level = "error", --- auto_session_root_dir=vim.fn.stdpath('data').."/sessions/", --- auto_session_enabled = true, --- auto_save_enabled = true, --- auto_restore_enabled = true, --- auto_session_suppress_dirs = nil, --- auto_session_use_git_branch = nil, --- cwd_change_handling = { --- restore_upcoming_session = true, -- This is necessary!! --- }, --- -- the configs below are lua only --- bypass_session_save_file_types = nil --- } -auto_session.setup { - log_level = "error", - cwd_change_handling = { - restore_upcoming_session = true, -- This is necessary!! - }, -} +auto_session.setup({ + log_level = "error", + auto_session_root_dir = vim.fn.stdpath("data") .. "/sessions/", + auto_session_enabled = true, + auto_save_enabled = true, + auto_restore_enabled = true, + auto_session_suppress_dirs = nil, + auto_session_use_git_branch = nil, + cwd_change_handling = { + restore_upcoming_session = true, -- This is necessary!! + }, +}) auto_session_nvim_tree.setup(auto_session) - - vim.cmd([[highlight IndentBlanklineIndent1 guifg=#443838 gui=nocombine]]) vim.opt.tabstop = 4 @@ -212,6 +216,7 @@ require("indent_blankline").setup({ "IndentBlanklineIndent1", }, }) + vim.keymap.set("n", "c", require("osc52").copy_operator, { expr = true }) vim.keymap.set("n", "cc", "c_", { remap = true }) vim.keymap.set("v", "c", require("osc52").copy_visual)