Initial commit for phosphorous branch

This commit is contained in:
2025-07-29 12:17:29 -04:00
parent caeb108974
commit 82d34571c8
23 changed files with 720 additions and 501 deletions

View File

@@ -1,3 +1,9 @@
{ env, config, pkgs, host, self, ... }: {
programs.nixvim.extraPackages = [
pkgs.cargo
pkgs.rustc
pkgs.rustup
pkgs.rust-analyzer
];
imports = [ ./plugins ./options.nix ./keymaps.nix ./autocmd.nix ];
}

View File

@@ -3,7 +3,7 @@
keymaps = [
{
action = "<cmd>Telescope find_files<CR>"; # select entire document
key = "!fs";
key = "<F3>";
mode = "n";
}
{
@@ -46,11 +46,6 @@
key = "<F2>";
mode = [ "n" "t" ];
}
{
action = "<cmd>NvimTreeToggle<CR>";
key = "<F3>";
mode = "n";
}
{
action = "<cmd>COQnow<CR>";
key = "!cq";

View File

@@ -26,15 +26,17 @@ in {
#};
};
enable = true;
diagnostic.settings.signs = false;
diagnostic.settings = {
virtual_text = true;
signs = false;
};
extraConfigLua = ''
if vim.g.started_by_firenvim == true then
vim.o.laststatus = 0
end
if vim.g.neovide then
vim.g.neovide_refresh_rate = 144
vim.g.neovide_cursor_vfx_mode = "sonicboom"
vim.g.neovide_cursor_animate_in_insert_mode = false
vim.g.neovide_cursor_animate_in_insert_mode = true
end
vim.g.vimwiki_list = {{path = '~/vimwiki/', syntax = 'markdown', ext = '.md'}}

View File

@@ -2,8 +2,19 @@
programs.nixvim = {
plugins.cmp = {
autoEnableSources = true;
settings.sources =
[ { name = "nvim_lsp"; } { name = "path"; } { name = "buffer"; } ];
settings = {
sources = [
{
name = "nvim_lsp";
}
{
name = "path";
}
{
name = "buffer";
}
];
};
};
plugins.cmp-nvim-lsp.enable = true;
plugins.cmp-nvim-lsp-document-symbol.enable = true;

View File

@@ -0,0 +1,10 @@
{
programs.nixvim.plugins.copilot-lua = {
enable = true;
settings = {
suggestion = {
auto_trigger = false;
};
};
};
}

View File

@@ -16,6 +16,7 @@
./airline.nix
./nvim-lightbulb.nix
./neocord.nix
./copilot.nix
./plugins.nix
./nvim-tree.nix
./telescope.nix

View File

@@ -13,28 +13,51 @@
['<C-j>'] = cmp.mapping.scroll_docs(-4),
['<C-k>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(),
['<C-Enter>'] = function()
local copilot = require("copilot.suggestion")
cmp.abort()
copilot.next()
end,
['<CR>'] = function(fallback)
if cmp.visible() then
cmp.confirm()
else
fallback()
end
end, -- Added a comma here
end,
['<Tab>'] = function(fallback)
local copilot = require("copilot.suggestion")
if cmp.visible() then
cmp.select_next_item()
elseif copilot.is_visible() then
cmp.abort()
copilot.accept()
else
fallback()
end
end, -- Added a comma here
['<S-Tab>'] = function(fallback)
end,
['<A-Tab>'] = function(fallback)
local copilot = require("copilot.suggestion")
if cmp.visible() then
cmp.select_prev_item()
elseif copilot.is_visible() then
cmp.abort()
copilot.accept_word()
else
fallback()
end
end -- No comma needed for the last item
end,
['<S-Tab>'] = function(fallback)
local copilot = require("copilot.suggestion")
if cmp.visible() then
cmp.select_prev_item()
elseif copilot.is_visible() then
cmp.abort()
copilot.accept_line()
else
fallback()
end
end
})
'';
};