merge main
This commit is contained in:
		
						commit
						293c643bab
					
				|  | @ -50,7 +50,7 @@ let | ||||||
|     pynvim |     pynvim | ||||||
|     six |     six | ||||||
|     python-lsp-server |     python-lsp-server | ||||||
|     pylsp-mypy |     # pylsp-mypy | ||||||
|     pylint |     pylint | ||||||
|     black |     black | ||||||
|     # other python packages you want |     # other python packages you want | ||||||
|  | @ -58,11 +58,11 @@ let | ||||||
|   python-with-my-packages = pkgs.python3.withPackages my-python-packages; |   python-with-my-packages = pkgs.python3.withPackages my-python-packages; | ||||||
| in | in | ||||||
| { | { | ||||||
|   #environment.variables.EDITOR = "nvim"; |   home.sessionVariables.EDITOR = "nvim"; | ||||||
|   #environment.shellAliases = { |   home.shellAliases = { | ||||||
|   #  k = "cd ~/kitaab/vimwiki; vim -c :VimwikiIndex; cd $OLDPWD"; |     k = "cd ~/kitaab/vimwiki; vim -c :VimwikiIndex; cd $OLDPWD"; | ||||||
|   #  kz = "cd ~/kitaab/vimwiki; vim -c :VimwikiIndex -c :ZettelNew; cd $OLDPWD"; |     kz = "cd ~/kitaab/vimwiki; vim -c :VimwikiIndex -c :ZettelNew; cd $OLDPWD"; | ||||||
|   #}; |   }; | ||||||
| 
 | 
 | ||||||
|   #environment.systemPackages = with customPlugins; [ tidal ]; |   #environment.systemPackages = with customPlugins; [ tidal ]; | ||||||
|   programs.neovim = { |   programs.neovim = { | ||||||
|  | @ -247,6 +247,24 @@ in | ||||||
|       nnoremap <leader>vll :call LspLocationList()<CR> |       nnoremap <leader>vll :call LspLocationList()<CR> | ||||||
|       nnoremap <leader>va :lua require('telescope.builtin').lsp_code_actions(require('telescope.themes').get_cursor())<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 config  | ||||||
|       lua <<EOF |       lua <<EOF | ||||||
|       vim.g.diagnostics_active = true |       vim.g.diagnostics_active = true | ||||||
|  | @ -299,7 +317,6 @@ in | ||||||
|                   vim_item.menu = ({ |                   vim_item.menu = ({ | ||||||
|                       buffer = "[Buffer]", |                       buffer = "[Buffer]", | ||||||
|                       nvim_lsp = "[LSP]", |                       nvim_lsp = "[LSP]", | ||||||
|                       cmp_tabnine = "[TabNine]", |  | ||||||
|                       look = "[Look]", |                       look = "[Look]", | ||||||
|                       path = "[Path]", |                       path = "[Path]", | ||||||
|                       spell = "[Spell]", |                       spell = "[Spell]", | ||||||
|  | @ -343,15 +360,12 @@ in | ||||||
|           sources = { |           sources = { | ||||||
|               {name = 'buffer'}, {name = 'nvim_lsp'},  |               {name = 'buffer'}, {name = 'nvim_lsp'},  | ||||||
|               {name = "look"}, {name = "path"}, |               {name = "look"}, {name = "path"}, | ||||||
|               {name = 'cmp_tabnine'}, {name = "calc"}, {name = "spell"}, |               {name = "calc"}, {name = "spell"}, | ||||||
|               {name = 'cmp-conjure'} |               {name = 'cmp-conjure'} | ||||||
|           }, |           }, | ||||||
|           completion = {completeopt = 'menu,menuone,noinsert'} |           completion = {completeopt = 'menu,menuone,noinsert'} | ||||||
|       } |       } | ||||||
|       cmp.event:on( 'confirm_done', cmp_autopairs.on_confirm_done({  map_char = { tex = ' ' } })) |       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 |       -- Setup lspconfig | ||||||
|       require("lsp-format").setup {} |       require("lsp-format").setup {} | ||||||
|  | @ -382,7 +396,7 @@ in | ||||||
|       require('gitsigns').setup { sign_priority=80 } |       require('gitsigns').setup { sign_priority=80 } | ||||||
| 
 | 
 | ||||||
|       -- treesitter |       -- 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 |       -- lualine | ||||||
|       require('nvim-gps').setup {} |       require('nvim-gps').setup {} | ||||||
|  | @ -484,7 +498,6 @@ in | ||||||
|       nvim-lsp-ts-utils |       nvim-lsp-ts-utils | ||||||
|       cmp-conjure |       cmp-conjure | ||||||
|       cmp-buffer |       cmp-buffer | ||||||
|       cmp-tabnine |  | ||||||
|       lspkind-nvim |       lspkind-nvim | ||||||
|       cmp-path |       cmp-path | ||||||
|       cmp-spell |       cmp-spell | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue