Merge branch 'nixos' into nixos-work
BIN
modules/config/wallpapers/wallpapers/a_short_walk.jpg
Normal file
|
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 |
BIN
modules/config/wallpapers/wallpapers/little-ships.jpg
Normal file
|
After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 10 MiB |
BIN
modules/config/wallpapers/wallpapers/red_beetle.jpg
Normal file
|
After Width: | Height: | Size: 1.8 MiB |
|
|
@ -25,7 +25,7 @@ in
|
|||
"/var/lib/NetworkManager/"
|
||||
"/var/lib/bluetooth"
|
||||
"/var/lib/nixos"
|
||||
"/var/lib/systemd/coredump"
|
||||
"/var/lib/systemd"
|
||||
"/var/log"
|
||||
];
|
||||
files = [
|
||||
|
|
@ -49,6 +49,7 @@ in
|
|||
".local/share/zoxide"
|
||||
".local/share/JetBrains"
|
||||
".config/JetBrains"
|
||||
".config/calibre"
|
||||
".local/state/nvim"
|
||||
".config/kdeconnect"
|
||||
".cat_installer" # eduroam
|
||||
|
|
|
|||
|
|
@ -29,9 +29,7 @@ in
|
|||
);
|
||||
};
|
||||
};
|
||||
setSearchEngines = mkEnableOption "firefox search engines" // {
|
||||
default = true;
|
||||
};
|
||||
setSearchEngines = mkEnableOption "firefox search engines";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
|
|
|||
|
|
@ -21,8 +21,16 @@ with builtins;
|
|||
plugin = trouble-nvim;
|
||||
cmd = [ "TodoTelescope" ];
|
||||
keys = [
|
||||
{ key = "<leader>cD"; cmd = "<cmd>TroubleToggle document_diagnostics<cr>"; desc = "Document Diagnostics (Trouble)"; }
|
||||
{ key = "<leader>cW"; cmd = "<cmd>TroubleToggle workspace_diagnostics<cr>"; desc = "Workspace Diagnostics (Trouble)"; }
|
||||
{
|
||||
key = "<leader>cD";
|
||||
cmd = "<cmd>TroubleToggle document_diagnostics<cr>";
|
||||
desc = "Document Diagnostics (Trouble)";
|
||||
}
|
||||
{
|
||||
key = "<leader>cW";
|
||||
cmd = "<cmd>TroubleToggle workspace_diagnostics<cr>";
|
||||
desc = "Workspace Diagnostics (Trouble)";
|
||||
}
|
||||
{ key = "<leader>cl"; cmd = "<cmd>TroubleToggle loclist<cr>"; desc = "Location List (Trouble)"; }
|
||||
{ key = "<leader>cq"; cmd = "<cmd>TroubleToggle quickfix<cr>"; desc = "Quickfix List (Trouble)"; }
|
||||
{ key = "<leader>ft"; cmd = "<cmd>TodoTelescope<cr>"; desc = "Todo"; }
|
||||
|
|
@ -76,8 +84,21 @@ with builtins;
|
|||
{ plugin = cmp-nvim-lsp; }
|
||||
{ plugin = cmp_luasnip; }
|
||||
{
|
||||
plugin = codeium-nvim;
|
||||
plugin = copilot-cmp;
|
||||
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 = lspkind-nvim; }
|
||||
|
|
@ -175,8 +196,21 @@ with builtins;
|
|||
{ key = "<leader>ff"; cmd = "<cmd>Telescope find_files<cr>"; desc = "Find files"; }
|
||||
{ key = "<leader>fb"; cmd = "<cmd>Telescope buffers<cr>"; desc = "Find buffers"; }
|
||||
{ key = "<leader>fl"; cmd = "<cmd>Telescope current_buffer_fuzzy_find<cr>"; desc = "Search lines"; }
|
||||
{
|
||||
key = "<leader>fl";
|
||||
cmd = "y<ESC>:Telescope current_buffer_fuzzy_find default_text=<c-r>0<CR>";
|
||||
desc = "Search lines (selection)";
|
||||
mode = [ "v" ];
|
||||
}
|
||||
{ key = "<leader>fg"; cmd = "<cmd>Telescope live_grep<cr>"; desc = "Live grep"; }
|
||||
{
|
||||
key = "<leader>fg";
|
||||
cmd = "y<ESC>:Telescope live_grep default_text=<c-r>0<CR>";
|
||||
desc = "Live grep (selection)";
|
||||
mode = [ "v" ];
|
||||
}
|
||||
{ key = "<leader>fh"; cmd = "<cmd>Telescope help_tags<cr>"; desc = "Help tags"; }
|
||||
{ key = "<leader>fr"; cmd = "<cmd>Telescope oldfiles<cr>"; desc = "Recent files"; }
|
||||
];
|
||||
dependencies = [
|
||||
{ plugin = plenary-nvim; }
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ cmp.setup({
|
|||
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
|
||||
symbol_map = {
|
||||
Codeium = "",
|
||||
Copilot = "",
|
||||
},
|
||||
}),
|
||||
},
|
||||
|
|
@ -56,7 +56,7 @@ cmp.setup({
|
|||
{ name = "async_path", priority = 1 },
|
||||
{ name = "buffer", priority = 1 },
|
||||
{ name = "luasnip", priority = 2 },
|
||||
{ name = "codeium", priority = 3 },
|
||||
{ name = "copilot", priority = 3 },
|
||||
{ name = "nvim_lsp", priority = 3 },
|
||||
},
|
||||
})
|
||||
|
|
@ -213,4 +213,4 @@ end
|
|||
vim.api.nvim_create_user_command("CmpToggle", sources_picker, {})
|
||||
|
||||
-- disable sources by default
|
||||
disable_source("codeium")
|
||||
-- disable_source("codeium")
|
||||
|
|
|
|||