merge main

This commit is contained in:
Anish L 2022-04-22 23:12:48 +10:00
commit 293c643bab

View file

@ -50,7 +50,7 @@ let
pynvim
six
python-lsp-server
pylsp-mypy
# pylsp-mypy
pylint
black
# other python packages you want
@ -58,11 +58,11 @@ let
python-with-my-packages = pkgs.python3.withPackages my-python-packages;
in
{
#environment.variables.EDITOR = "nvim";
#environment.shellAliases = {
# k = "cd ~/kitaab/vimwiki; vim -c :VimwikiIndex; cd $OLDPWD";
# kz = "cd ~/kitaab/vimwiki; vim -c :VimwikiIndex -c :ZettelNew; cd $OLDPWD";
#};
home.sessionVariables.EDITOR = "nvim";
home.shellAliases = {
k = "cd ~/kitaab/vimwiki; vim -c :VimwikiIndex; cd $OLDPWD";
kz = "cd ~/kitaab/vimwiki; vim -c :VimwikiIndex -c :ZettelNew; cd $OLDPWD";
};
#environment.systemPackages = with customPlugins; [ tidal ];
programs.neovim = {
@ -247,6 +247,24 @@ in
nnoremap <leader>vll :call LspLocationList()<CR>
nnoremap <leader>va :lua require('telescope.builtin').lsp_code_actions(require('telescope.themes').get_cursor())<cr>
" dashboard
let g:dashboard_custom_header = [
\' ',
\' ',
\' ',
\' ',
\' ',
\' ',
\' ',
\' ',
\' ',
\' ',
\' ',
\' ',
\]
let g:dashboard_custom_footer = ["Run wild"]
" lua config
lua <<EOF
vim.g.diagnostics_active = true
@ -299,7 +317,6 @@ in
vim_item.menu = ({
buffer = "[Buffer]",
nvim_lsp = "[LSP]",
cmp_tabnine = "[TabNine]",
look = "[Look]",
path = "[Path]",
spell = "[Spell]",
@ -343,15 +360,12 @@ in
sources = {
{name = 'buffer'}, {name = 'nvim_lsp'},
{name = "look"}, {name = "path"},
{name = 'cmp_tabnine'}, {name = "calc"}, {name = "spell"},
{name = "calc"}, {name = "spell"},
{name = 'cmp-conjure'}
},
completion = {completeopt = 'menu,menuone,noinsert'}
}
cmp.event:on( 'confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = ' ' } }))
-- TabNine cmp
local tabnine = require('cmp_tabnine.config')
tabnine:setup({max_lines = 1000, max_num_results = 20, sort = true})
-- Setup lspconfig
require("lsp-format").setup {}
@ -382,7 +396,7 @@ in
require('gitsigns').setup { sign_priority=80 }
-- treesitter
require('nvim-treesitter.configs').setup { ensure_installed={'nix', 'clojure', 'python', 'typescript'}}
require('nvim-treesitter.configs').setup { ensure_installed={'nix', 'clojure', 'python', 'fennel', 'lua', 'html', 'css', 'glsl'}}
-- lualine
require('nvim-gps').setup {}
@ -484,7 +498,6 @@ in
nvim-lsp-ts-utils
cmp-conjure
cmp-buffer
cmp-tabnine
lspkind-nvim
cmp-path
cmp-spell