awsomearvinder/nix-config - Change 66COC6TI5UGIYQMWHOTONDBSH63AQYAHYP5UKYZR65Y6VEVJIPZQC

Make autocomplete work again!

This also moved away from nvim-compe as it's deprecated in favor of nvim-cmp.

Created by awesomearvinder on October 17, 2021

66COC6TI5UGIYQMWHOTONDBSH63AQYAHYP5UKYZR65Y6VEVJIPZQC

Dependencies

In channels

main

Change contents

Deletion in bender/applications/neovim.nix at line 30 [6.1663]
B:BD[5.106] → [5.106:124]
```
      nvim-compe
```

Insertion in bender/applications/neovim.nix at line 42 [6.1663]

[7.429]

      };
    })
    (buildVimPlugin {
      pname = "nvim-cmp";
      version = "2021-10-16";
      buildInputs = [pkgs.nixpkgs-unstable.stylua];
      src = pkgs.fetchFromGitHub {
        owner = "hrsh7th";
        repo = "nvim-cmp";
        rev = "4ecf2a24265626a2c00427394deb4747c7b9d5dc";
        sha256 = "pJ1bEmOEsW8fDZLNawGwpbPsiIEaYnXsA3GKlxYnI9w=";
      };
    })
    (buildVimPlugin {
      pname = "cmp-nvim-lsp";
      version = "2021-10-17";
      src = pkgs.fetchFromGitHub {
        owner = "hrsh7th";
        repo = "cmp-nvim-lsp";
        rev = "accbe6d97548d8d3471c04d512d36fa61d0e4be8";
        sha256 = "lVcTATtmUu1dL9CvX/GR0b5fNj9IyWsls6kD07I3Hbc=";
      };
    })
    (buildVimPlugin {
      pname = "cmp-buffer";
      version = "2021-10-17";
      src = pkgs.fetchFromGitHub {
        owner = "hrsh7th";
        repo = "cmp-buffer";
        rev = "5dde5430757696be4169ad409210cf5088554ed6";
        sha256 = "lLP6gnuSN/tJiJ1sb2u6Xm5G2P59pz6tnOGDRfbivjk=";

Replacement in bender/dotfiles/nvim/lua/config/lsp.lua at line 1 [8.21]
B:BD[8.21] → [8.22:55]
```
local t = require('../utils').t
```
[8.21]
[8.55]
```
vim.opt.completeopt = "menu,menuone,noselect";
```

Replacement in bender/dotfiles/nvim/lua/config/lsp.lua at line 3 [8.21]

B:BD[8.57] → [8.57:571]

vim.opt.completeopt = "menuone,noselect";
vim.opt.inccommand = "nosplit";
-- go to the following link to see docs or do :help compe
-- https://github.com/hrsh7th/nvim-compe/blob/master/doc/compe.txt
require'compe'.setup {
    enabled = true;
    autocomplete = true;
    debug = false;
    preselect = 'enabled';
    throttle_timeout = 80;
    source_timeout = 200;
    incomplete_delay = 400;
    max_abbr_width = 100;
    max_kind_width = 100;
    max_menu_width = 100;
    documentation = true;

[8.57]

[8.571]

local cmp = require'cmp';
cmp.setup({
  snippet = {
    expand = function(args)
      -- For `vsnip` user.
      vim.fn["vsnip#anonymous"](args.body)

Replacement in bender/dotfiles/nvim/lua/config/lsp.lua at line 10 [8.21]

B:BD[8.573] → [8.573:819]

    source = {
        path = true;
	buffer = true;
	vsnip = true;
        tags = true;
        spell = true;
        calc = true;
	omni = true;
        emoji = true;
	nvim_lsp = true;
	nvim_lua = true;
	treesitter = true;
    };
}

[8.573]

[8.819]

      -- For `luasnip` user.
      -- require('luasnip').lsp_expand(args.body)

Replacement in bender/dotfiles/nvim/lua/config/lsp.lua at line 13 [8.21]

B:BD[8.821] → [8.821:1129]

--shamelessly copied from nvim-compe's readme here:
--https://github.com/hrsh7th/nvim-compe
local check_back_space = function()
    local col = vim.fn.col('.') - 1
    if col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then
        return true
    else
        return false
    end
end

[8.821]

[8.1129]

      -- For `ultisnips` user.
      -- vim.fn["UltiSnips#Anon"](args.body)
    end,
  },
  mapping = {
    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
    ['<C-f>'] = cmp.mapping.scroll_docs(4),
    ['<C-Space>'] = cmp.mapping.complete(),
    ['<C-e>'] = cmp.mapping.close(),
    ['<CR>'] = cmp.mapping.confirm({ select = true }),
  },
  sources = {
    { name = 'nvim_lsp' },
    { name = 'buffer' },
  }
})

Deletion in bender/dotfiles/nvim/lua/config/lsp.lua at line 30 [8.21]

B:BD[8.1131] → [8.1131:3324]

B:BD[8.3324] → [4.18:103]

∅:D[4.103] → [8.3406:3413]

B:BD[8.3406] → [8.3406:3413]

-- Use (s-)tab to:
--- move to prev/next item in completion menuone
--- jump to prev/next snippet's placeholder
_G.tab_complete = function()
  if vim.fn.pumvisible() == 1 then
    return t "<C-n>"
  elseif vim.fn.call("vsnip#available", {1}) == 1 then -- gonna be honest here, I don't use snippets
    return t "<Plug>(vsnip-expand-or-jump)"
  elseif check_back_space() then
    return t "<Tab>"
  else
    return vim.fn['compe#complete']()
  end
end
_G.s_tab_complete = function()
  if vim.fn.pumvisible() == 1 then
    return t "<C-p>"
  elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then
    return t "<Plug>(vsnip-jump-prev)"
  else
    -- If <S-Tab> is not working in your terminal, change it to <C-h>
    return t "<S-Tab>"
  end
end
local function on_attach(_client, bufnr)
  local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
  local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
  --Enable completion triggered by <c-x><c-o>
  buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
  -- Mappings.
  local opts = { noremap=true, silent=true }
  -- See `:help vim.lsp.*` for documentation on any of the below functions
  buf_set_keymap('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
  buf_set_keymap('n', 'gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
  buf_set_keymap('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
  buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
  buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
  buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
  buf_set_keymap('n', 'ga', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
  buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
  buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
  buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
  buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
  buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
  -- buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
end

Replacement in bender/dotfiles/nvim/lua/config/lsp.lua at line 31 [8.21]
B:BD[8.3451] → [4.104:151]
```
local servers = {"rust_analyzer", "pyright"};
```
[8.3451]
[8.3510]
```
local servers = {"rust_analyzer", "pyright", "tsserver"};
```

Replacement in bender/dotfiles/nvim/lua/config/lsp.lua at line 34 [8.21]

B:BD[4.180] → [4.180:209]

    on_attach =  on_attach;

[4.180]

[4.209]

    capabilities = require('cmp_nvim_lsp')
      .update_capabilities(vim.lsp.protocol.make_client_capabilities());

Deletion in bender/dotfiles/nvim/lua/config/lsp.lua at line 38 [8.21]

B:BD[8.3616] → [8.3616:3618]

B:BD[8.3618] → [4.215:390]


nvim_lsp["tsserver"].setup {
  on_attach = function(client, bufnr)
    client.resolved_capabilities.document_formatting = false;
    on_attach(client, bufnr)
  end;
}

Replacement in bender/dotfiles/nvim/lua/config/lsp.lua at line 45 [8.21]

B:BD[4.403] → [4.403:467]

'autocmd BufWritePre *.js,*.ts,*.tsx,*.jsx Neoformat prettier'

[4.403]

[4.467]

  'autocmd BufWritePre *.js,*.ts,*.tsx,*.jsx Neoformat prettier'

Insertion in bender/overlays/neovimOverlay.nix at line 2 [6.4297011]
[9.350]
[3.0]
```
  neovim = self.nixpkgs-master.neovim;
```

Replacement in flake.lock at line 24 [6.4313312]

B:BD[6.4313876] → [2.245:357]

        "lastModified": 1634175939,
        "narHash": "sha256-Wccbdwil6N6N+1chASL/aufGz89eRajAZRMFKUVlYCc=",

[6.4313876]

[6.4313988]

        "lastModified": 1634436779,
        "narHash": "sha256-D/nrXTWpe1bPIjFy85sgiLHYqu+AeaC6v5/+KlA9PRg=",

Replacement in flake.lock at line 28 [6.4313312]

B:BD[6.4314043] → [2.358:418]

        "rev": "74c63a11cd4b0b67cf6645fde52d5d6fd8ba47a5",

[6.4314043]

[6.4314103]

        "rev": "9aeeb7574fb784eaf6395f4400705b5f619e6cc3",

Replacement in flake.lock at line 38 [6.4313312]

B:BD[2.480] → [2.480:592]

        "lastModified": 1634175939,
        "narHash": "sha256-Wccbdwil6N6N+1chASL/aufGz89eRajAZRMFKUVlYCc=",

[2.480]

[2.592]

        "lastModified": 1634436779,
        "narHash": "sha256-D/nrXTWpe1bPIjFy85sgiLHYqu+AeaC6v5/+KlA9PRg=",

Replacement in flake.lock at line 42 [6.4313312]

B:BD[2.647] → [2.647:707]

        "rev": "74c63a11cd4b0b67cf6645fde52d5d6fd8ba47a5",

[2.647]

[2.707]

        "rev": "9aeeb7574fb784eaf6395f4400705b5f619e6cc3",

Insertion in flake.lock at line 52 [6.4313312]

[6.4314231]

    "nixpkgs-unstable": {
      "locked": {
        "lastModified": 1634172192,
        "narHash": "sha256-FBF4U/T+bMg4sEyT/zkgasvVquGzgdAf4y8uCosKMmo=",
        "owner": "nixos",
        "repo": "nixpkgs",
        "rev": "2cf9db0e3d45b9d00f16f2836cb1297bcadc475e",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },

Replacement in flake.lock at line 70 [6.4313312]

B:BD[6.4314270] → [2.872:984]

        "lastModified": 1633853057,
        "narHash": "sha256-TUf/NYJlIw7wVMLFt5G4TRwtrnbz+uuXtTEbulxxI8Y=",

[6.4314270]

[6.4314382]

        "lastModified": 1634327140,
        "narHash": "sha256-d5L7oMjUVC6VU0cQMsF0tceAPkmzuAQ51DWBFNChbEQ=",

Replacement in flake.lock at line 74 [6.4313312]

B:BD[6.4314437] → [2.985:1045]

        "rev": "93ca5ab64f78ce778c0bcecf9458263f0f6289b6",

[6.4314437]

[6.4314497]

        "rev": "83667ff60a88e22b76ef4b0bdf5334670b39c2b6",

Replacement in flake.lock at line 88 [6.4313312]

B:BD[2.1111] → [2.1111:1155]

        "nixpkgs-master": "nixpkgs-master"

[2.1111]

[6.4314793]

        "nixpkgs-master": "nixpkgs-master",
        "nixpkgs-unstable": "nixpkgs-unstable"

Insertion in flake.nix at line 8 [6.4314890]

[2.1343]

[6.4315072]

    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

Replacement in flake.nix at line 11 [6.4314890]

B:BD[6.4315080] → [2.1344:1410]

  outputs = {self, home-manager, nixpkgs, nixpkgs-master, ... }:

[6.4315080]

[10.496]

  outputs = {self, home-manager, nixpkgs, nixpkgs-master, nixpkgs-unstable, ... }:

Replacement in flake.nix at line 25 [6.4314890]

B:BD[9.508] → [2.1520:1618]

      overlay = final: prev: { nixpkgs-master = nixpkgs-master.legacyPackages."x86_64-linux"; };

[9.508]

[10.870]

      overlay = final: prev: { 
        nixpkgs-master = nixpkgs-master.legacyPackages."x86_64-linux"; 
        nixpkgs-unstable = nixpkgs-unstable.legacyPackages."x86_64-linux"; 
      };