diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d307be4..3695dda 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,3 +1,10 @@ +-- TODO: +-- status line +-- goyo-like thing +-- coq +-- chadtree colors +-- map A-S to toggle spell check (see logic from hlsearch section in init.vim) + -- basic settings: ~/.config/nvim/lua/settings.lua require('settings') -- plugins and plugin settings: ~/.config/nvim/lua/plugins.lua diff --git a/.config/nvim/lua/other.lua b/.config/nvim/lua/other.lua index ca217c0..f31aac7 100644 --- a/.config/nvim/lua/other.lua +++ b/.config/nvim/lua/other.lua @@ -1,5 +1,11 @@ local M = {} +-- chadtree +M.chadtree = function () + vim.api.nvim_set_keymap('n', 'v', 'CHADopen', { noremap = true, silent = true }) + -- chadtree_settings.theme.text_colour_set = "trapdoor" +end + -- nvimtree M.nvimtree = function () local tree_cb = require'nvim-tree.config'.nvim_tree_callback diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 49f424b..618abdc 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -3,8 +3,8 @@ local fn = vim.fn local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) - vim.cmd 'packadd packer.nvim' + fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) + vim.cmd 'packadd packer.nvim' end return require('packer').startup(function() @@ -51,6 +51,13 @@ return require('packer').startup(function() require("lsp").lspconfig() end } + use { -- compe + "hrsh7th/nvim-cmp", + requires = { + "hrsh7th/vim-vsnip", + "hrsh7th/cmp-buffer", + } + } use { -- function parameter previews "ray-x/lsp_signature.nvim", after = "nvim-lspconfig", @@ -64,12 +71,13 @@ return require('packer').startup(function() -- require("other").packer_lazy_load "vim-matchup" -- end, } - use { - 'dense-analysis/ale', - config = function() - vim.g.ale_disable_lsp = 1 - end - } + -- use { -- ALE: Support for lots of linters, etc + -- 'dense-analysis/ale', + -- config = function() + -- vim.g.ale_disable_lsp = 1 + -- end + -- } + ---- Other IDE features use { -- git integration @@ -81,12 +89,23 @@ return require('packer').startup(function() -- require('other').gitsigns() -- end } - use { -- file manager - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', + -- use { -- file manager + -- 'kyazdani42/nvim-tree.lua', + -- requires = 'kyazdani42/nvim-web-devicons', + -- config = function() + -- require('other').nvimtree() + -- end + -- } + use { -- new file manager + 'ms-jpq/chadtree', + branch = 'chad', + run = 'python3 -m chadtree deps', config = function() - require('other').nvimtree() + require('other').chadtree() end + -- config = funciton () + -- vim.cmd 'nnoremap v CHADopen' + -- end } use { -- terminal "akinsho/toggleterm.nvim", @@ -94,6 +113,17 @@ return require('packer').startup(function() require('other').toggleterm() end } + use { -- Smooth Scrolling + "karb94/neoscroll.nvim", + -- disable = not plugin_status.neoscroll, + -- opt = true, + -- config = function() + -- require("plugins.configs.others").neoscroll() + -- end, + -- setup = function() + -- require("core.utils").packer_lazy_load "neoscroll.nvim" + -- end, + } -- Conveniences use { -- Undo tree diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 5df8c7f..e72f539 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -1,3 +1,5 @@ +vim.g.mapleader = " " + vim.cmd [[ set suffixes+=.aux,.bbl,.blg,.brf,.cb,.dvi,.idx,.ilg,.ind,.inx,.jpg,.log,.out,.png,.toc set suffixes-=.h