This commit is contained in:
Daniel Winkler 2025-08-18 23:16:43 +10:00
commit 7e73bb44bb
No known key found for this signature in database

View file

@ -26,11 +26,14 @@
... ...
} @ inputs: let } @ inputs: let
forSystems = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all; forSystems = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all;
in { defaultPackageName = "p";
packages = forSystems ( projectConfig = forSystems (
system: let system: let
inherit (nixCats) utils; inherit (nixCats) utils;
finalPackage = nixCats.packages.${system}.default.override (prev: { inherit defaultPackageName;
prevPackage = nixCats.packages.${system}.default;
finalPackage = prevPackage.override (prev: {
name = "p";
dependencyOverlays = dependencyOverlays =
prev.dependencyOverlays prev.dependencyOverlays
++ [ ++ [
@ -51,6 +54,7 @@
data_table data_table
devtools devtools
janitor janitor
konfound
languageserver languageserver
quarto quarto
reprex reprex
@ -143,7 +147,22 @@
]; ];
}; };
optionalLuaPreInit = { optionalLuaPreInit = {
project = []; project = [
''
local predicate = function(notif)
if not (notif.data.source == "lsp_progress" and notif.data.client_name == "lua_ls") then
return true
end
-- Filter out some LSP progress notifications from 'lua_ls'
return notif.msg:find("Diagnosing") == nil and notif.msg:find("semantic tokens") == nil
end
local custom_sort = function(notif_arr)
return MiniNotify.default_sort(vim.tbl_filter(predicate, notif_arr))
end
require("mini.notify").setup({ content = { sort = custom_sort } })
vim.notify = MiniNotify.make_notify()
''
];
}; };
optionalLuaAdditions = { optionalLuaAdditions = {
project = [ project = [
@ -180,7 +199,6 @@
packageDefinitions = packageDefinitions =
prev.packageDefinitions prev.packageDefinitions
// { // {
## p => project, n => neovim (global) from nixCats
p = utils.mergeCatDefs prev.packageDefinitions.n ( p = utils.mergeCatDefs prev.packageDefinitions.n (
{ {
pkgs, pkgs,
@ -190,7 +208,19 @@
settings = { settings = {
suffix-path = false; suffix-path = false;
suffix-LD = false; suffix-LD = false;
# your alias may not conflict with your other packages.
aliases = ["newvim"];
hosts = { hosts = {
g = {
enable = true;
path = {
value = "${pkgs.neovide}/bin/neovide";
args = [
"--add-flags"
"--neovim-bin ${name}"
];
};
};
m = { m = {
enable = true; enable = true;
path = { path = {
@ -201,7 +231,7 @@
}; };
}; };
categories = { categories = {
julia = true; julia = false;
python = true; python = true;
r = true; r = true;
project = true; project = true;
@ -214,5 +244,18 @@
in in
utils.mkAllWithDefault finalPackage utils.mkAllWithDefault finalPackage
); );
in {
packages = projectConfig;
devShells = forSystems (system: let
pkgs = import nixpkgs {inherit system;};
in {
default = pkgs.mkShell {
name = defaultPackageName;
packages = [projectConfig.${system}.default];
inputsFrom = [];
shellHook = ''
'';
};
});
}; };
} }