reorganization

This commit is contained in:
Daniel Winkler 2026-01-31 03:09:40 +11:00
commit 5646308c21
2 changed files with 25 additions and 16 deletions

View file

@ -3,7 +3,6 @@
"fran": { "fran": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nvimConfig",
"rixpkgs" "rixpkgs"
] ]
}, },
@ -39,7 +38,9 @@
}, },
"nvimConfig": { "nvimConfig": {
"inputs": { "inputs": {
"fran": "fran", "fran": [
"fran"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -114,6 +115,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"fran": "fran",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nvimConfig": "nvimConfig", "nvimConfig": "nvimConfig",
"rixpkgs": "rixpkgs" "rixpkgs": "rixpkgs"

View file

@ -1,26 +1,12 @@
{ {
description = "Project Editor"; description = "Project Editor";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26";
nvimConfig = {
url = "github:dwinkler1/nvimConfig";
inputs = {
rixpkgs.follows = "rixpkgs";
nixpkgs.follows = "nixpkgs";
};
};
};
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
nvimConfig, nvimConfig,
... ...
} @ inputs: let } @ inputs: let
systems = nixpkgs.lib.systems.flakeExposed;
forAllSystems = nixpkgs.lib.genAttrs systems;
projectSettings = {pkgs}: { projectSettings = {pkgs}: {
cats = { cats = {
clickhouse = false; clickhouse = false;
@ -103,6 +89,8 @@
}; };
}; };
systems = nixpkgs.lib.systems.flakeExposed;
forAllSystems = nixpkgs.lib.genAttrs systems;
overlays = [inputs.nvimConfig.overlays.dependencies]; overlays = [inputs.nvimConfig.overlays.dependencies];
in { in {
packages = forAllSystems (system: let packages = forAllSystems (system: let
@ -124,4 +112,23 @@
}; };
}); });
}; };
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26";
fran = {
url = "github:dwinkler1/fran";
inputs = {
nixpkgs.follows = "rixpkgs";
};
};
nvimConfig = {
url = "github:dwinkler1/nvimConfig";
inputs = {
rixpkgs.follows = "rixpkgs";
nixpkgs.follows = "nixpkgs";
fran.follows = "fran";
};
};
};
} }