Compare commits
5 Commits
e7fd307bfb
...
ed1c1a6f69
Author | SHA1 | Date |
---|---|---|
Moritz Böhme | ed1c1a6f69 | |
Moritz Böhme | 07dfe50be0 | |
Moritz Böhme | d6c97b11c5 | |
Moritz Böhme | 09b7d43847 | |
Moritz Böhme | d23863f934 |
24
flake.lock
|
@ -71,29 +71,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"codeium-nvim": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": [
|
|
||||||
"flake-utils"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1701196468,
|
|
||||||
"narHash": "sha256-xZ1S+8NgxOurbYqh7n3wR3cw+FTP8DyCdb5lg7X+8kw=",
|
|
||||||
"owner": "jcdickinson",
|
|
||||||
"repo": "codeium.nvim",
|
|
||||||
"rev": "fd9c9030d402baf2a01cc9db08c39772c0a60324",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "jcdickinson",
|
|
||||||
"repo": "codeium.nvim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"darwin": {
|
"darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -1054,7 +1031,6 @@
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"arkenfox-userjs": "arkenfox-userjs",
|
"arkenfox-userjs": "arkenfox-userjs",
|
||||||
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
|
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
|
||||||
"codeium-nvim": "codeium-nvim",
|
|
||||||
"devshell": "devshell",
|
"devshell": "devshell",
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
|
|
|
@ -29,11 +29,6 @@
|
||||||
# Neovim
|
# Neovim
|
||||||
actions-preview-nvim.flake = false;
|
actions-preview-nvim.flake = false;
|
||||||
actions-preview-nvim.url = "github:aznhe21/actions-preview.nvim";
|
actions-preview-nvim.url = "github:aznhe21/actions-preview.nvim";
|
||||||
codeium-nvim = {
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
inputs.flake-utils.follows = "flake-utils";
|
|
||||||
url = "github:jcdickinson/codeium.nvim";
|
|
||||||
};
|
|
||||||
hmts-nvim.flake = false;
|
hmts-nvim.flake = false;
|
||||||
hmts-nvim.url = "github:calops/hmts.nvim";
|
hmts-nvim.url = "github:calops/hmts.nvim";
|
||||||
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
|
|
||||||
home-manager.users.moritz.home.packages = with pkgs; [
|
home-manager.users.moritz.home.packages = with pkgs; [
|
||||||
anki
|
anki
|
||||||
|
calibre
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
|
|
After Width: | Height: | Size: 1.4 MiB |
Before Width: | Height: | Size: 12 MiB |
Before Width: | Height: | Size: 4.6 MiB After Width: | Height: | Size: 1.1 MiB |
After Width: | Height: | Size: 1.2 MiB |
Before Width: | Height: | Size: 10 MiB |
After Width: | Height: | Size: 1.8 MiB |
|
@ -25,7 +25,7 @@ in
|
||||||
"/var/lib/NetworkManager/"
|
"/var/lib/NetworkManager/"
|
||||||
"/var/lib/bluetooth"
|
"/var/lib/bluetooth"
|
||||||
"/var/lib/nixos"
|
"/var/lib/nixos"
|
||||||
"/var/lib/systemd/coredump"
|
"/var/lib/systemd"
|
||||||
"/var/log"
|
"/var/log"
|
||||||
];
|
];
|
||||||
files = [
|
files = [
|
||||||
|
@ -49,6 +49,7 @@ in
|
||||||
".local/share/zoxide"
|
".local/share/zoxide"
|
||||||
".local/share/JetBrains"
|
".local/share/JetBrains"
|
||||||
".config/JetBrains"
|
".config/JetBrains"
|
||||||
|
".config/calibre"
|
||||||
".local/state/nvim"
|
".local/state/nvim"
|
||||||
".config/kdeconnect"
|
".config/kdeconnect"
|
||||||
".cat_installer" # eduroam
|
".cat_installer" # eduroam
|
||||||
|
|
|
@ -29,9 +29,7 @@ in
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
setSearchEngines = mkEnableOption "firefox search engines" // {
|
setSearchEngines = mkEnableOption "firefox search engines";
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
|
@ -76,8 +76,21 @@ with builtins;
|
||||||
{ plugin = cmp-nvim-lsp; }
|
{ plugin = cmp-nvim-lsp; }
|
||||||
{ plugin = cmp_luasnip; }
|
{ plugin = cmp_luasnip; }
|
||||||
{
|
{
|
||||||
plugin = codeium-nvim;
|
plugin = copilot-cmp;
|
||||||
opts = { };
|
opts = { };
|
||||||
|
dependencies = [
|
||||||
|
{
|
||||||
|
plugin = copilot-lua;
|
||||||
|
opts = {
|
||||||
|
suggestion = { enabled = false; };
|
||||||
|
panel = { enabled = false; };
|
||||||
|
};
|
||||||
|
conf = /* lua */ ''
|
||||||
|
require("copilot").setup(opts)
|
||||||
|
vim.cmd("Copilot disable")
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
];
|
||||||
}
|
}
|
||||||
{ plugin = friendly-snippets; }
|
{ plugin = friendly-snippets; }
|
||||||
{ plugin = lspkind-nvim; }
|
{ plugin = lspkind-nvim; }
|
||||||
|
|
|
@ -17,7 +17,7 @@ cmp.setup({
|
||||||
maxwidth = 50, -- prevent the popup from showing more than provided characters
|
maxwidth = 50, -- prevent the popup from showing more than provided characters
|
||||||
ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
|
ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
|
||||||
symbol_map = {
|
symbol_map = {
|
||||||
Codeium = "",
|
Copilot = "",
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -56,7 +56,7 @@ cmp.setup({
|
||||||
{ name = "async_path", priority = 1 },
|
{ name = "async_path", priority = 1 },
|
||||||
{ name = "buffer", priority = 1 },
|
{ name = "buffer", priority = 1 },
|
||||||
{ name = "luasnip", priority = 2 },
|
{ name = "luasnip", priority = 2 },
|
||||||
{ name = "codeium", priority = 3 },
|
{ name = "copilot", priority = 3 },
|
||||||
{ name = "nvim_lsp", priority = 3 },
|
{ name = "nvim_lsp", priority = 3 },
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
@ -213,4 +213,4 @@ end
|
||||||
vim.api.nvim_create_user_command("CmpToggle", sources_picker, {})
|
vim.api.nvim_create_user_command("CmpToggle", sources_picker, {})
|
||||||
|
|
||||||
-- disable sources by default
|
-- disable sources by default
|
||||||
disable_source("codeium")
|
-- disable_source("codeium")
|
||||||
|
|
|
@ -4,8 +4,6 @@ _: prev:
|
||||||
with lib.my;
|
with lib.my;
|
||||||
{
|
{
|
||||||
vimPlugins = prev.vimPlugins // {
|
vimPlugins = prev.vimPlugins // {
|
||||||
inherit (inputs.codeium-nvim.packages.${prev.system}.vimPlugins) codeium-nvim;
|
|
||||||
|
|
||||||
smartcolumn-nvim = prev.vimUtils.buildVimPlugin {
|
smartcolumn-nvim = prev.vimUtils.buildVimPlugin {
|
||||||
pname = "smartcolumn-nvim";
|
pname = "smartcolumn-nvim";
|
||||||
version = mkVersionInput inputs.smartcolumn-nvim;
|
version = mkVersionInput inputs.smartcolumn-nvim;
|
||||||
|
|