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

11
modules/hm/dev.nix
View file

@ -17,17 +17,6 @@ in
[ [
(lib.mkIf cfg.rust.enable { (lib.mkIf cfg.rust.enable {
home.packages = [ pkgs.rustup ] ++ cfg.rust.extraPackages; 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 = { home = {

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

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