v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions 1

various updates

Browse source
This commit is contained in:
Vivian 2024-03-18 17:12:51 +01:00
parent 89ce2c97d9
commit 636e23deb7
11 changed files with 149 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/desktop/home.nix
View file

@ -4,7 +4,7 @@ let
inherit (pkgs.texlive) scheme-full;
dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; };
};
my-python-packages = ps: with ps; [ pandas requests numpy scapy pyshark cryptography ];
my-python-packages = ps: with ps; [ pandas requests numpy scapy pyshark cryptography flask ];
in {
home.packages = with pkgs; [
(python3.withPackages my-python-packages)

106
common/hm-modules/nvim.nix
View file

@ -75,11 +75,25 @@ in with lib; {
key = "<S-C-Tab>";
action = ":bp<CR>";
}
{
mode = "n";
key = "<S-Tab>";
action = "<<_";
}
{
mode = "v";
key = "<Tab>";
action = ">gv";
}
{
mode = "v";
key = "<S-Tab>";
action = "<gv";
}
];
extraPlugins = with pkgs.vimPlugins; [
FixCursorHold-nvim
luasnip
plenary-nvim
neotest
neotest-plenary
@ -104,18 +118,8 @@ in with lib; {
plugins = {
bufferline.enable = true;
none-ls = {
enable = true;
sources = {
formatting.nixpkgs_fmt.enable = true;
code_actions.statix.enable = true;
diagnostics = {
statix.enable = true;
deadnix.enable = true;
};
};
};
nix.enable = true;
luasnip.enable = true;
treesitter = {
enable = true;
nixGrammars = true;
@ -138,11 +142,22 @@ in with lib; {
enable = true;
servers = {
nil_ls.enable = true;
dockerls.enable = true;
rust-analyzer = {
installCargo = false;
installRustc = false;
};
pyright.enable = true;
pylsp = {
enable = true;
settings.plugins = {
black = {
enabled = true;
cache_config = true;
};
pycodestyle = { maxLineLength = 100; };
};
};
elixirls.enable = true;
clangd.enable = true;
yamlls.enable = true;
@ -150,48 +165,37 @@ in with lib; {
};
trouble.enable = true;
lspkind.enable = true;
vimtex.enable = true;
floaterm.enable = true;
# cmp = {
# enable = true;
# autoEnableSources = true;
# extraOptions.sources = [
# { name = "nvim_lsp"; }
# {
# name = "luasnip";
# option = { show_autosnippets = true; };
# }
# { name = "cmp-spell"; }
# { name = "cmp-rg"; }
# { name = "path"; }
# { name = "buffer"; }
# ];
# extraOptions.snippet.expand = "luasnip";
# # mappingPresets = [ "insert" "cmdline" ];
# extraOptions.mapping = {
# "<CR>" = "cmp.mapping.confirm({ select = true })";
# "<Tab>" = {
# modes = [ "i" "s" ];
# action = ''
# function(fallback)
# local luasnip = require('luasnip')
# if cmp.visible() then
# cmp.select_next_item()
# elseif luasnip.expandable() then
# luasnip.expand()
# elseif luasnip.expand_or_jumpable() then
# luasnip.expand_or_jump()
# else
# fallback()
# end
# end
# '';
# };
# };
# };
cmp = {
enable = true;
autoEnableSources = true;
settings = {
snippet.expand =
"function(args) require('luasnip').lsp_expand(args.body) end";
mapping = {
"<S-Tab>" =
"cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
"<Tab>" =
"cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
"<CR>" = "cmp.mapping.confirm({ select = true })";
"<C-Space>" = "cmp.mapping.complete()";
"<C-e>" = "cmp.mapping.close()";
};
sources = [
{ name = "nvim_lsp_signature_help"; }
{ name = "path"; }
{ name = "nvim_lsp"; }
{ name = "luasnip"; }
{
name = "buffer";
# Words from other open buffers can also be suggested.
option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
}
];
};
};
};
};
};