Compare commits

..

No commits in common. "69454aba5244ff7445005ff2e756e40af411ba72" and "5cffc8c06cdca81150ec553969480cf51c1dc32c" have entirely different histories.

6 changed files with 14 additions and 41 deletions

View File

@ -98,22 +98,6 @@
"type": "github"
}
},
"cmp-async-path": {
"flake": false,
"locked": {
"lastModified": 1673896803,
"narHash": "sha256-dgAiVbdMiKjiKWk+dJf/Zz8T20+D4OalGH5dTzYi5aM=",
"owner": "FelipeLema",
"repo": "cmp-async-path",
"rev": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d",
"type": "github"
},
"original": {
"owner": "FelipeLema",
"repo": "cmp-async-path",
"type": "github"
}
},
"comment-box-nvim": {
"flake": false,
"locked": {
@ -685,7 +669,6 @@
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
"attic": "attic",
"bufferline-nvim": "bufferline-nvim",
"cmp-async-path": "cmp-async-path",
"comment-box-nvim": "comment-box-nvim",
"copilot-lua": "copilot-lua",
"flake-utils": "flake-utils",

View File

@ -39,9 +39,6 @@
bufferline-nvim.flake = false;
bufferline-nvim.url = "github:akinsho/bufferline.nvim";
cmp-async-path.url = "github:FelipeLema/cmp-async-path";
cmp-async-path.flake = false;
comment-box-nvim.flake = false;
comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim";

View File

@ -27,7 +27,9 @@ in
fish = {
enable = true;
shellAbbrs = shellConfig.abbreviations;
shellAliases = shellConfig.aliases;
shellInit = ''
# Vi Mode
fish_vi_key_bindings

View File

@ -66,7 +66,6 @@ in
yamlfmt
];
plugins = with pkgs.vimPlugins; [
cmp-async-path
cmp-nvim-lsp
cmp_luasnip
copilot-cmp

View File

@ -21,13 +21,6 @@ vim.api.nvim_create_autocmd("InsertEnter", {
require("luasnip.loaders.from_vscode").lazy_load()
require("copilot_cmp").setup()
local default_sources = {
{ name = "async_path", priority = 4 },
{ name = "copilot", priority = 3 },
{ name = "luasnip", priority = 2 },
{ name = "nvim_lsp", priority = 4 },
}
cmp.setup({
formatting = {
format = require("lspkind").cmp_format({
@ -70,14 +63,13 @@ vim.api.nvim_create_autocmd("InsertEnter", {
end
end, { "i", "s" }),
}),
sources = default_sources,
})
cmp.setup.filetype("org", {
sources = vim.tbl_deep_extend("force", default_sources, {
{ name = "buffer", priority = 5 },
{ name = "orgmode", priority = 5 },
}),
sources = {
{ name = "buffer", priority = 1 },
{ name = "copilot", priority = 8 },
{ name = "luasnip", priority = 7 },
{ name = "nvim_lsp", priority = 9 },
{ name = "orgmode", priority = 9 },
},
})
end,
})

View File

@ -26,11 +26,11 @@ with lib.my;
src = inputs.lspsaga-nvim;
});
cmp-async-path = prev.vimPlugins.cmp-path.overrideAttrs (old: {
pname = "cmp-async-path";
version = mkVersionInput inputs.cmp-async-path;
src = inputs.cmp-async-path;
});
advanced-git-search-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
pname = "advanced-git-search-nvim";
version = mkVersionInput inputs.advanced-git-search-nvim;
src = inputs.advanced-git-search-nvim;
};
comment-box-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
pname = "comment-box-nvim";