From 49d9907b32ec13e433ca2c9a3c82681c03cd7afd Mon Sep 17 00:00:00 2001 From: Anish L Date: Thu, 17 Mar 2022 00:56:53 +1000 Subject: [PATCH] nix format doesn't like tabs --- profiles/nvim/nvim.nix | 817 +++++++++++++++++++++-------------------- 1 file changed, 410 insertions(+), 407 deletions(-) diff --git a/profiles/nvim/nvim.nix b/profiles/nvim/nvim.nix index 1919b98a..228a6840 100644 --- a/profiles/nvim/nvim.nix +++ b/profiles/nvim/nvim.nix @@ -1,438 +1,441 @@ { pkgs, ... }: let - customPlugins = { - vim-zettel = pkgs.vimUtils.buildVimPlugin { - name = "vim-zettel"; - src = pkgs.fetchFromGitHub { - owner = "michal-h21"; - repo = "vim-zettel"; - rev = "929d90eec62e6f693c2702d2b6f76a93f2f1689d"; - sha256 = "1fzKmknfVlEYwqeXgbKITbb2/PJ023iJyMz6vak3qh4="; - }; - }; - lsp-format = pkgs.vimUtils.buildVimPlugin { - name = "lsp-format"; - src = pkgs.fetchFromGitHub { - owner = "lukas-reineke"; - repo = "lsp-format.nvim"; - rev = "84e117b99bb2bc0d0c8122e2b256046f046f8aff"; - sha256 = "rs3NTZwWdsmBGXnrgUeVxUiNjbN/ULxJHifPYJD9mT4="; - }; - }; - }; + customPlugins = { + vim-zettel = pkgs.vimUtils.buildVimPlugin { + name = "vim-zettel"; + src = pkgs.fetchFromGitHub { + owner = "michal-h21"; + repo = "vim-zettel"; + rev = "929d90eec62e6f693c2702d2b6f76a93f2f1689d"; + sha256 = "1fzKmknfVlEYwqeXgbKITbb2/PJ023iJyMz6vak3qh4="; + }; + }; + lsp-format = pkgs.vimUtils.buildVimPlugin { + name = "lsp-format"; + src = pkgs.fetchFromGitHub { + owner = "lukas-reineke"; + repo = "lsp-format.nvim"; + rev = "84e117b99bb2bc0d0c8122e2b256046f046f8aff"; + sha256 = "rs3NTZwWdsmBGXnrgUeVxUiNjbN/ULxJHifPYJD9mT4="; + }; + }; + }; - my-python-packages = python-packages: with python-packages; [ - tasklib - pynvim - six - python-lsp-server - pylsp-mypy - python-lsp-black - pylint - black - # other python packages you want - ]; - python-with-my-packages = pkgs.python3.withPackages my-python-packages; + my-python-packages = python-packages: with python-packages; [ + tasklib + pynvim + six + python-lsp-server + pylsp-mypy + python-lsp-black + pylint + black + # other python packages you want + ]; + python-with-my-packages = pkgs.python3.withPackages my-python-packages; in - { - environment.variables.EDITOR = "nvim"; - environment.shellAliases = { - k = "cd ~/vimwiki; vim -c :VimwikiIndex"; - kz = "cd ~/vimwiki; vim -c :VimwikiIndex -c :ZettelNew"; - }; - environment.systemPackages = with pkgs // customPlugins; [ - nodejs - python-with-my-packages - clojure-lsp - rnix-lsp - terraform-lsp - vale - clj-kondo - # Other LSPs or linters - ( neovim.override { - vimAlias = true; - withPython3 = true; - extraPython3Packages = pkgs: with pkgs; [ tasklib six ]; - configure = { - packages.myPlugins = with pkgs.vimPlugins; { - start = [ - # general - vim-nix - fzf-vim - vim-elixir - emmet-vim - nerdtree - ayu-vim - goyo-vim - csv-vim - rainbow_parentheses-vim - vim-surround - vim-devicons - nvim-web-devicons - direnv-vim - vim-peekaboo - undotree - telescope-nvim - plenary-nvim - lualine-nvim - nvim-gps - nvim-treesitter - nvim-treesitter-context - dashboard-nvim - FTerm-nvim - barbar-nvim +{ + environment.variables.EDITOR = "nvim"; + environment.shellAliases = { + k = "cd ~/vimwiki; vim -c :VimwikiIndex"; + kz = "cd ~/vimwiki; vim -c :VimwikiIndex -c :ZettelNew"; + }; + environment.systemPackages = with pkgs // customPlugins; [ + nodejs + python-with-my-packages + clojure-lsp + rnix-lsp + terraform-lsp + vale + clj-kondo + # Other LSPs or linters + (neovim.override { + vimAlias = true; + withPython3 = true; + extraPython3Packages = pkgs: with pkgs; [ tasklib six ]; + configure = { + packages.myPlugins = with pkgs.vimPlugins; { + start = [ + # general + vim-nix + fzf-vim + vim-elixir + emmet-vim + nerdtree + ayu-vim + goyo-vim + csv-vim + rainbow_parentheses-vim + vim-surround + vim-devicons + nvim-web-devicons + direnv-vim + vim-peekaboo + undotree + telescope-nvim + plenary-nvim + lualine-nvim + nvim-gps + nvim-treesitter + nvim-treesitter-context + dashboard-nvim + FTerm-nvim + barbar-nvim - # kitaab stuff - vimwiki - taskwiki - vim-zettel + # kitaab stuff + vimwiki + taskwiki + vim-zettel - # lsp stuff - nvim-lint - nvim-lspconfig - nvim-cmp - cmp-nvim-lsp - cmp-treesitter - nvim-lsp-ts-utils - cmp-conjure - cmp-buffer - cmp-tabnine - lspkind-nvim - cmp-path - cmp-spell - nvim-autopairs - cmp_luasnip - luasnip - lsp-format + # lsp stuff + nvim-lint + nvim-lspconfig + nvim-cmp + cmp-nvim-lsp + cmp-treesitter + nvim-lsp-ts-utils + cmp-conjure + cmp-buffer + cmp-tabnine + lspkind-nvim + cmp-path + cmp-spell + nvim-autopairs + cmp_luasnip + luasnip + lsp-format - # git stuff - vim-fugitive - gitsigns-nvim - fzf-checkout-vim + # git stuff + vim-fugitive + gitsigns-nvim + fzf-checkout-vim - # Clojure stuff - conjure - vim-sexp - vim-sexp-mappings-for-regular-people - # testing - #vim-processing - #vim-tidal - ]; - }; + # Clojure stuff + conjure + vim-sexp + vim-sexp-mappings-for-regular-people + # testing + #vim-processing + #vim-tidal + ]; + }; - customRC = '' - set tabstop=2 - set showmatch - set shiftwidth=2 - set noexpandtab - set autoindent - set undofile - set signcolumn=auto:4 + customRC = '' + set tabstop=2 + set showmatch + set shiftwidth=2 + set noexpandtab + set autoindent + set undofile + set signcolumn=auto:4 - " set foldmethod=indent " fold based on indent - set number - set nocompatible - set relativenumber - set showtabline=2 - set noexpandtab - set autowriteall - syntax on - set list lcs=tab:\|\ - filetype plugin on + " set foldmethod=indent " fold based on indent + set number + set nocompatible + set relativenumber + set showtabline=2 + set noexpandtab + set autowriteall + syntax on + set list lcs=tab:\|\ + filetype plugin on - set termguicolors - let ayucolor="mirage" - colorscheme ayu + set termguicolors + let ayucolor="mirage" + colorscheme ayu - " set spell - set spelllang=en_gb - set ignorecase - set smartcase - set incsearch - " if hidden is not set, TextEdit might fail. - set hidden - " Some servers have issues with backup files, see #649 - set nobackup - set nowritebackup - " Better display for messages - set cmdheight=2 - " You will have bad experience for diagnostic messages when it's default 4000. - set updatetime=300 - " don't give |ins-completion-menu| messages. - set shortmess+=c - " always show signcolumns - set signcolumn=yes + " set spell + set spelllang=en_gb + set ignorecase + set smartcase + set incsearch + " if hidden is not set, TextEdit might fail. + set hidden + " Some servers have issues with backup files, see #649 + set nobackup + set nowritebackup + " Better display for messages + set cmdheight=2 + " You will have bad experience for diagnostic messages when it's default 4000. + set updatetime=300 + " don't give |ins-completion-menu| messages. + set shortmess+=c + " always show signcolumns + set signcolumn=yes - " window - nmap wh :topleft vnew - nmap wl :botright vnew - nmap wk :topleft new - nmap wj :botright new + " window + nmap wh :topleft vnew + nmap wl :botright vnew + nmap wk :topleft new + nmap wj :botright new - " tabs - nmap rt :retab! + " tabs + nmap rt :retab! + vmap rt :retab! - let mapleader = "\" - let maplocalleader = "," + let mapleader = "\" + let maplocalleader = "," - " moving splits with vim movements. - :tnoremap h - :tnoremap j - :tnoremap k - :tnoremap l - :inoremap h - :inoremap j - :inoremap k - :inoremap l - :nnoremap h - :nnoremap j - :nnoremap k - :nnoremap l - :nnoremap "=strftime("%Y-%m-%d %H:%M") - :inoremap =strftime("%Y-%m-%d %H:%M") - :inoremap =strftime("%H:%M") + " moving splits with vim movements. + :tnoremap h + :tnoremap j + :tnoremap k + :tnoremap l + :inoremap h + :inoremap j + :inoremap k + :inoremap l + :nnoremap h + :nnoremap j + :nnoremap k + :nnoremap l + :nnoremap "=strftime("%Y-%m-%d %H:%M") + :inoremap =strftime("%Y-%m-%d %H:%M") + :inoremap =strftime("%H:%M") - " telescope - " Find files using Telescope command-line sugar. - nnoremap ff Telescope find_files - nnoremap fg Telescope live_grep - nnoremap fb Telescope buffers - nnoremap fh Telescope help_tags - nnoremap ft Telescope tags + " telescope + " Find files using Telescope command-line sugar. + nnoremap ff Telescope find_files + nnoremap fg Telescope live_grep + nnoremap fb Telescope buffers + nnoremap fh Telescope help_tags + nnoremap ft Telescope tags - " exit normal mode in terminal - :tnoremap + " exit normal mode in terminal + :tnoremap - " Sexp in Conjure (since it's fennel) - " let g:sexp_filetypes = [ "fennel" ] + " Sexp in Conjure (since it's fennel) + " let g:sexp_filetypes = [ "fennel" ] - let g:rainbow_active = 0 - autocmd BufReadPost,BufNewFile c,clj,cljs RainbowParenthesesToggleAll + let g:rainbow_active = 0 + autocmd BufReadPost,BufNewFile c,clj,cljs RainbowParenthesesToggleAll - " general commands - map t :NERDTreeToggle - map s :w - map q :wq - map r :RainbowParenthesesToggleAll - map :noh - nnoremap Y y$ - " center moving - nnoremap n nzzzv - nnoremap N Nzzzv - nnoremap J mzJ'z - " undo points - inoremap , ,u - inoremap . .u - inoremap ! !u - inoremap ? ?u - inoremap ( (u - inoremap ) )u - inoremap [ [u - inoremap ] ]u - inoremap { {u - inoremap } }u - " moving text - vnoremap J :m '>+1gv=gv - vnoremap K :m '>-2gv=gv - inoremap :m .+1== - inoremap :m .-2== - nnoremap j :m .+1== - nnoremap k :m .-2== - " Pasting - :map sy :!xclip -i - :vmap sy "*y - :map sp :r!xclip -o + " general commands + map t :NERDTreeToggle + map s :w + map q :wq + map r :RainbowParenthesesToggleAll + map :noh + nnoremap Y y$ + " center moving + nnoremap n nzzzv + nnoremap N Nzzzv + nnoremap J mzJ'z + " undo points + inoremap , ,u + inoremap . .u + inoremap ! !u + inoremap ? ?u + inoremap ( (u + inoremap ) )u + inoremap [ [u + inoremap ] ]u + inoremap { {u + inoremap } }u + " moving text + vnoremap J :m '>+1gv=gv + vnoremap K :m '>-2gv=gv + inoremap :m .+1== + inoremap :m .-2== + nnoremap j :m .+1== + nnoremap k :m .-2== + " Pasting + :map sy :!xclip -i + :vmap sy "*y + :map sp :r!xclip -o - " barbar - nnoremap gT :BufferPrevious - nnoremap gt :BufferNext - nnoremap gj :BufferPick - nnoremap gc :BufferClose + " barbar + nnoremap gT :BufferPrevious + nnoremap gt :BufferNext + nnoremap gj :BufferPick + nnoremap gc :BufferClose - " git - nnoremap ga :G fetch --all - nmap gs :G - nmap gh :diffget //3 - nmap gl :diffget //2 - nmap gc :GBranches - nnoremap gp :Git! push + " git + nnoremap ga :G fetch --all + nmap gs :G + nmap gh :diffget //3 + nmap gl :diffget //2 + nmap gc :GBranches + nnoremap gp :Git! push + nnoremap gd :Gdiff + nnoremap gt :Gcommit -v -q %:p + nnoremap gb :Gblame - " kitaab - map zs :ZettelSearch - map zo :ZettelOpen - map zn :ZettelNew - map zf :Telescope oldfiles only_cwd=true + " kitaab + map zs :ZettelSearch + map zo :ZettelOpen + map zn :ZettelNew + map zf :Telescope oldfiles only_cwd=true - let g:mapleader="\" - let g:dashboard_default_executive = 'telescope' - nmap ss :SessionSave - nmap sl :SessionLoad - nnoremap fh :DashboardFindHistory - nnoremap ff :DashboardFindFile - nnoremap fa :DashboardFindWord - nnoremap fm :DashboardJumpMark - nnoremap cn :DashboardNewFile - nnoremap tn :tabnew - autocmd FileType dashboard set showtabline=0 | autocmd WinLeave set showtabline=2 + let g:mapleader="\" + let g:dashboard_default_executive = 'telescope' + nmap ss :SessionSave + nmap sl :SessionLoad + nnoremap fh :DashboardFindHistory + nnoremap ff :DashboardFindFile + nnoremap fm :DashboardJumpMark + nnoremap cn :DashboardNewFile + nnoremap tn :tabnew + autocmd FileType dashboard set showtabline=0 | autocmd WinLeave set showtabline=2 - " fzf - let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.8 } } + " fzf + " not sure we even use this + let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.8 } } - " lsp commands - nnoremap vd :lua vim.lsp.buf.definition() - nnoremap vi :lua require('telescope.builtin').lsp_implementation() - nnoremap vsh :lua vim.lsp.buf.signature_help() - nnoremap vrr :lua require('telescope.builtin').lsp_references() - nnoremap vrn :lua vim.lsp.buf.rename() - nnoremap vh :lua vim.lsp.buf.hover() - nnoremap vca :lua vim.lsp.buf.code_action() - nnoremap vsd :lua vim.lsp.diagnostic.show_line_diagnostics(); vim.lsp.util.show_line_diagnostics() - nnoremap vn :lua vim.lsp.diagnostic.goto_next() - nnoremap vll :call LspLocationList() - nnoremap va :lua require('telescope.builtin').lsp_code_actions(require('telescope.themes').get_cursor()) + " lsp commands + nnoremap vd :lua vim.lsp.buf.definition() + nnoremap vi :lua require('telescope.builtin').lsp_implementation() + nnoremap vsh :lua vim.lsp.buf.signature_help() + nnoremap vrr :lua require('telescope.builtin').lsp_references() + nnoremap vrn :lua vim.lsp.buf.rename() + nnoremap vh :lua vim.lsp.buf.hover() + nnoremap vca :lua vim.lsp.buf.code_action() + nnoremap vsd :lua rim.lsp.diagnostic.show_line_diagnostics(); vim.lsp.util.show_line_diagnostics() + nnoremap vn :lua vim.lsp.diagnostic.goto_next() + nnoremap vll :call LspLocationList() + nnoremap va :lua require('telescope.builtin').lsp_code_actions(require('telescope.themes').get_cursor()) - " lua config - lua <'] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Insert, - select = true - }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, {"i", "s"}), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }, - sources = { - {name = 'buffer'}, {name = 'nvim_lsp'}, - {name = "look"}, {name = "path"}, - {name = 'cmp_tabnine'}, {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 {} - -local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) -require('lspconfig').clojure_lsp.setup {on_attach = require "lsp-format".on_attach} -require('lspconfig').rnix.setup {on_attach = require "lsp-format".on_attach} -require('lspconfig').pylsp.setup {on_attach = require "lsp-format".on_attach} -require('lspconfig').terraform_lsp.setup {on_attach = require "lsp-format".on_attach} - -require('gitsigns').setup { sign_priority=80 } - --- treesitter -require('nvim-treesitter.configs').setup { ensure_installed={'nix', 'clojure', 'python', 'typescript'}} - --- lualine -require('nvim-gps').setup {} -local gps = require('nvim-gps') -require('lualine').setup { - sections = { - lualine_c = { - 'filename', { gps.get_location, condition=gps.is_available }, - }, - lualine_y = { - function() - local msg = 'No Active Lsp' - local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype') - local clients = vim.lsp.get_active_clients() - if next(clients) == nil then - return msg - end - for _, client in ipairs(clients) do - local filetypes = client.config.filetypes - if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then - return client.name - end - end - return msg - end - }, - } -} - --- nvim-lint -require('lint').linters_by_ft = { - markdown = {'vale'}, - clojure = {'clj-kondo'}, - python = {'black'} -} - --- f_term -local map = vim.api.nvim_set_keymap -local opts = { noremap = true, silent = true } -map('n', '', 'lua require("FTerm").toggle()', opts) -map('t', '', 'lua require("FTerm").toggle()', opts) -EOF - ''; - }; - } - )]; + local luasnip = require("luasnip") + local cmp = require('cmp') + local cmp_autopairs = require('nvim-autopairs.completion.cmp') + local t = function(str) + return vim.api.nvim_replace_termcodes(str, true, true, true) + end + local check_back_space = function() + local col = vim.fn.col(".") - 1 + return col == 0 or vim.fn.getline("."):sub(col, col):match("%s") ~= nil + end + cmp.setup { + formatting = { + format = function(entry, vim_item) + -- fancy icons and a name of kind + vim_item.kind = require("lspkind").presets.default[vim_item.kind] .. + " " .. vim_item.kind + -- set a name for each source + vim_item.menu = ({ + buffer = "[Buffer]", + nvim_lsp = "[LSP]", + cmp_tabnine = "[TabNine]", + look = "[Look]", + path = "[Path]", + spell = "[Spell]", + calc = "[Calc]", + })[entry.source.name] + return vim_item + end + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Insert, + select = true + }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, {"i", "s"}), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }, + sources = { + {name = 'buffer'}, {name = 'nvim_lsp'}, + {name = "look"}, {name = "path"}, + {name = 'cmp_tabnine'}, {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 {} + + local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) + require('lspconfig').clojure_lsp.setup {on_attach = require "lsp-format".on_attach} + require('lspconfig').rnix.setup {on_attach = require "lsp-format".on_attach} + require('lspconfig').pylsp.setup {on_attach = require "lsp-format".on_attach} + require('lspconfig').terraform_lsp.setup {on_attach = require "lsp-format".on_attach} + + require('gitsigns').setup { sign_priority=80 } + + -- treesitter + require('nvim-treesitter.configs').setup { ensure_installed={'nix', 'clojure', 'python', 'typescript'}} + + -- lualine + require('nvim-gps').setup {} + local gps = require('nvim-gps') + require('lualine').setup { + sections = { + lualine_c = { + 'filename', { gps.get_location, condition=gps.is_available }, + }, + lualine_y = { + function() + local msg = 'No Active Lsp' + local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype') + local clients = vim.lsp.get_active_clients() + if next(clients) == nil then + return msg + end + for _, client in ipairs(clients) do + local filetypes = client.config.filetypes + if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then + return client.name + end + end + return msg + end + }, + } + } + + -- nvim-lint + require('lint').linters_by_ft = { + markdown = {'vale'}, + } + + -- f_term + local map = vim.api.nvim_set_keymap + local opts = { noremap = true, silent = true } + map('n', '', 'lua require("FTerm").toggle()', opts) + map('t', '', 'lua require("FTerm").toggle()', opts) + EOF + ''; + }; + } + ) + ]; }