youwen5/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/nixos.git synced 2024-11-24 17:53:51 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: reorganize some stuff

Browse source
This commit is contained in:
Youwen Wu 2024-08-18 14:21:23 -07:00
parent 37caaa036d
commit bbe6adc498
Signed by: youwen5
GPG key ID: 865658ED1FE61EC3
1 changed files with 68 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
users/youwen/common/neovim/default.nix
View file

@ -19,6 +19,7 @@
opts = {
laststatus = 3;
relativenumber = true;
number = true;
};
globals = {
@ -356,6 +357,7 @@
];
plugins = {
# LSP and Treesitter related
lsp = {
enable = true;
inlayHints = true;
@ -368,30 +370,9 @@
svelte.enable = true;
tailwindcss.enable = true;
typst-lsp.enable = true;
rust-analyzer = {
enable = true;
installCargo = true;
installRustc = true;
};
marksman.enable = true;
};
};
typescript-tools.enable = true;
presence-nvim = {
enable = true;
editingText = "Hacking %s";
workspaceText = "The One True Text Editor";
buttons = [
{
label = "GitHub";
url = "https://github.com/youwen5";
}
{
label = "Code Forge";
url = "https://code.youwen.dev/";
}
];
};
treesitter = {
enable = true;
settings = {
@ -399,17 +380,26 @@
indent.enable = true;
};
};
lsp-lines.enable = true;
crates-nvim.enable = true;
treesitter-context.enable = true;
wakatime.enable = true;
# Language specific tools
markdown-preview.enable = true;
# rustaceanvim.enable = true;
typescript-tools.enable = true;
# git stuff
lazygit.enable = true;
gitsigns.enable = true;
# QoL and utility
intellitab.enable = true;
guess-indent.enable = true;
vim-bbye.enable = true;
indent-blankline.enable = true;
which-key.enable = true;
zen-mode.enable = true;
markdown-preview.enable = true;
yanky = {
enable = true;
enableTelescope = true;
@ -417,6 +407,34 @@
telescope = {
enable = true;
};
trouble.enable = true;
direnv.enable = true;
yazi = {
enable = true;
settings = {
open_for_directories = true;
};
};
# Code formatting
conform-nvim = {
enable = true;
formatOnSave = {
timeoutMs = 500;
lspFallback = true;
};
formattersByFt = {
lua = ["stylua"];
python = ["black"];
nix = ["alejandra"];
svelte = ["prettier"];
rust = ["rust-analyzer"];
"*" = ["codespell"];
"_" = ["trim_whitespace"];
};
};
# mini.nvim
mini = {
enable = true;
modules = {
@ -430,25 +448,8 @@
comment = {};
};
};
trouble.enable = true;
direnv.enable = true;
# cmp = {
# enable = true;
# settings = {
# mapping = {
# "<C-Space>" = "cmp.mapping.complete()";
# "<C-b>" = "cmp.mapping.scroll_docs(-4)";
# "<C-e>" = "cmp.mapping.close()";
# "<C-f>" = "cmp.mapping.scroll_docs(4)";
# "<C-p>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
# "<C-n>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
# "<Tab>" = "cmp.mapping.confirm({ select = true })";
# };
# completion.autocomplete = [
# "require('cmp.types').cmp.TriggerEvent.TextChanged"
# ];
# };
# };
# Completion
cmp-async-path.enable = true;
cmp = {
enable = true;
@ -511,28 +512,23 @@
cmp-cmdline = {
enable = true; # autocomplete for cmdline
};
crates-nvim.enable = true;
conform-nvim = {
# Extra (stuff that doesn't affect editing)
wakatime.enable = true;
presence-nvim = {
enable = true;
formatOnSave = {
timeoutMs = 500;
lspFallback = true;
};
formattersByFt = {
lua = ["stylua"];
python = ["black"];
nix = ["alejandra"];
svelte = ["prettier"];
rust = ["rust-analyzer"];
"*" = ["codespell"];
"_" = ["trim_whitespace"];
};
};
yazi = {
enable = true;
settings = {
open_for_directories = true;
};
editingText = "Hacking %s";
workspaceText = "The One True Text Editor";
buttons = [
{
label = "GitHub";
url = "https://github.com/youwen5";
}
{
label = "Code Forge";
url = "https://code.youwen.dev/";
}
];
};
};
@ -564,6 +560,15 @@
hash = "sha256-5CS5kvUSqQJe7iFFpicinBjCQXgFPL0ElGgnrZHTT+Y=";
};
})
(pkgs.vimUtils.buildVimPlugin {
name = "rustaceanvim";
src = pkgs.fetchFromGitHub {
owner = "mrcjkb";
repo = "rustaceanvim";
rev = "7cba8e599deca98d4b44cac1bcbd720c62937d90";
hash = "sha256-OYfeJuo4FZUBdW9wGGCT0lZGYr/ur1uy8frcyUJMF3k=";
};
})
];
};
programs.yazi = {