jalil/configuration.nix
1
1
Fork 0
Code Issues 2 Pull requests 3 Projects Activity Actions

chore(deps): lock file maintenance #409

Merged
renovate merged 2 commits from renovate/lock-file-maintenance into main 2025-04-12 13:24:28 +02:00
Conversation 2 Commits 2 Files changed 3 +28 -48
3 changed files with 28 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -303,11 +303,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1744168086,
"narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=",
"lastModified": 1744309437,
"narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73",
"rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
"type": "github"
},
"original": {
@ -342,11 +342,11 @@
"nuschtosSearch": []
},
"locked": {
"lastModified": 1744272522,
"narHash": "sha256-cFuxYOLp/6L0eu5wX7xmaF4VhqEm/aT08awzEHGMMQE=",
"lastModified": 1744383153,
"narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "33c3f98fdc9a62183ec7d535bf910e04f141284b",
"rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987",
"type": "github"
},
"original": {
@ -367,11 +367,11 @@
]
},
"locked": {
"lastModified": 1743683223,
"narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=",
"lastModified": 1744375525,
"narHash": "sha256-/Wf5Ca0DmV+y+qVBDXX8HAfAvSQI6y5oE27dv6t1jXk=",
"owner": "NuschtOS",
"repo": "search",
"rev": "56a49ffef2908dad1e9a8adef1f18802bc760962",
"rev": "c0e7d3bda11e2cfad692d205d82757078475957a",
"type": "github"
},
"original": {

11
modules/hm/dev.nix
View file

@ -17,17 +17,6 @@ in
[
(lib.mkIf cfg.rust.enable {
home.packages = [ pkgs.rustup ] ++ cfg.rust.extraPackages;
# Background code checker (for Rust)
programs.bacon = {
enable = true;
settings = {
export = {
enabled = true;
path = ".bacon-locations";
line_format = "{kind} {path}:{line}:{column} {message}";
};
};
};
})
{
home = {

47
modules/nixvim/dev-plugins.nix
View file

@ -7,6 +7,7 @@
}:
let
inherit (helpers) enableExceptInTests;
inherit (lib.trivial) const;
cfg = config.jhome.nvim;
enabledLSPs = [
"basedpyright"
@ -23,21 +24,18 @@ let
"zls"
"fish_lsp"
];
enableOpt.enable = true;
noPackage.package = null;
in
{
config = lib.mkIf cfg.dev.enable (
lib.mkMerge [
# Enable LSPs
{
plugins.lsp.servers = lib.genAttrs enabledLSPs (_: {
enable = true;
});
}
{ plugins.lsp.servers = lib.genAttrs enabledLSPs (const enableOpt); }
# Remove bundled LSPs
(lib.mkIf (!cfg.dev.bundleLSPs) {
plugins.lsp.servers = lib.genAttrs enabledLSPs (_: {
package = null;
});
plugins.lsp.servers = lib.genAttrs enabledLSPs (const noPackage);
})
# Configure LSPs
{
@ -52,11 +50,12 @@ in
return vim.fs.root(0, {'flake.nix', '.git', '.jj', 'pyproject.toml', 'setup.py'})
end
'';
bashls.package = lib.mkDefault pkgs.bash-language-server;
# Adds ~2 GiB, install in a devShell instead
clangd.package = lib.mkDefault null;
# zls & other zig tools are big, install in a devShell instead
zls.package = lib.mkDefault null;
# Big but infrequently used dependencies.
#
# Configure the LSPs, but don't install the packages.
# If you need to use them, add them to your project's devShell
clangd = noPackage;
zls = noPackage;
};
};
lspkind = {
@ -82,10 +81,10 @@ in
(lib.mkIf (!cfg.dev.bundleGrammars) { plugins.treesitter.grammarPackages = [ ]; })
# Remove tools for building gramars when bundling them
(lib.mkIf cfg.dev.bundleGrammars {
plugins.treesitter = {
gccPackage = null;
nodejsPackage = null;
treesitterPackage = null;
dependencies = {
gcc.enable = false;
nodejs.enable = false;
tree-sitter.enable = false;
};
})
# Configure Formatters
@ -159,17 +158,9 @@ in
}
# Rust plugins
{
plugins = {
bacon = {
enable = true;
settings.quickfix.enabled = true;
};
rustaceanvim = {
enable = true;
# Install through rustup
rustAnalyzerPackage = null;
};
};
plugins.rustaceanvim.enable = true;
# install through rustup
dependencies.rust-analyzer.enable = false;
}
# Other plugins
{