mirror of
https://codeberg.org/leana8959/.files.git
synced 2025-12-06 06:39:14 +00:00
Drop flake parts
Use native nix functions to speed up and reduce complexity
This commit is contained in:
parent
85e2bd6728
commit
daefd1534f
15 changed files with 501 additions and 423 deletions
73
flake.nix
73
flake.nix
|
|
@ -2,32 +2,8 @@
|
|||
|
||||
outputs =
|
||||
inputs:
|
||||
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
flake.nixConfig = {
|
||||
extra-substituters = [ "https://leana8959.cachix.org" ];
|
||||
extra-trusted-substituters = [ "https://leana8959.cachix.org" ];
|
||||
extra-trusted-public-keys = [
|
||||
"leana8959.cachix.org-1:CxQSAp8lcgMv8Me459of0jdXRW2tcyeYRKTiiUq8z0M="
|
||||
];
|
||||
};
|
||||
|
||||
imports = [
|
||||
./nix/configurations
|
||||
./nix/deploy
|
||||
|
||||
./nix/homeModules
|
||||
./nix/nixosModules
|
||||
./nix/darwinModules
|
||||
./nix/flakeModules
|
||||
./nix/disko
|
||||
|
||||
./nix/overlays
|
||||
./nix/packages
|
||||
|
||||
./nix/pre-commit
|
||||
./nix/devShells
|
||||
];
|
||||
|
||||
let
|
||||
systems = [
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
|
|
@ -35,12 +11,42 @@
|
|||
"x86_64-linux"
|
||||
];
|
||||
|
||||
perSystem =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
formatter = pkgs.nixfmt-rfc-style;
|
||||
};
|
||||
};
|
||||
ctx = inputs // {
|
||||
inherit systems;
|
||||
};
|
||||
in
|
||||
|
||||
{
|
||||
nixConfig = {
|
||||
extra-substituters = [ "https://leana8959.cachix.org" ];
|
||||
extra-trusted-substituters = [ "https://leana8959.cachix.org" ];
|
||||
extra-trusted-public-keys = [
|
||||
"leana8959.cachix.org-1:CxQSAp8lcgMv8Me459of0jdXRW2tcyeYRKTiiUq8z0M="
|
||||
];
|
||||
};
|
||||
|
||||
lib = import ./nix/lib ctx;
|
||||
|
||||
nixosModules = import ./nix/nixosModules ctx;
|
||||
homeModules = import ./nix/homeModules ctx;
|
||||
darwinModules = import ./nix/darwinModules ctx;
|
||||
}
|
||||
|
||||
// import ./nix/disko
|
||||
// import ./nix/configurations ctx
|
||||
// import ./nix/deploy ctx
|
||||
|
||||
// (
|
||||
let
|
||||
inherit (import ./nix/packages ctx) packageOverlays packages;
|
||||
inherit (import ./nix/overlays ctx) overlays;
|
||||
in
|
||||
{
|
||||
inherit packages;
|
||||
overlays = packageOverlays // overlays;
|
||||
}
|
||||
)
|
||||
// import ./nix/devShells ctx;
|
||||
|
||||
inputs = {
|
||||
# At next release (25.05), pin 24.11 for nix-darwin
|
||||
|
|
@ -62,8 +68,6 @@
|
|||
|
||||
nur.url = "github:nix-community/nur";
|
||||
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
|
||||
agenix.url = "github:ryantm/agenix/0.15.0";
|
||||
|
||||
pre-commit-hooks = {
|
||||
|
|
@ -85,14 +89,12 @@
|
|||
wallpapers = {
|
||||
url = "git+https://codeberg.org/leana8959/wallpapers";
|
||||
inputs."nixpkgs".follows = "nixpkgs-stable";
|
||||
inputs."flake-parts".follows = "flake-parts";
|
||||
inputs."pre-commit-hooks".follows = "pre-commit-hooks";
|
||||
};
|
||||
|
||||
wired-notify = {
|
||||
url = "github:Toqozz/wired-notify/0.10.6";
|
||||
inputs."nixpkgs".follows = "nixpkgs-stable";
|
||||
inputs."flake-parts".follows = "flake-parts";
|
||||
};
|
||||
|
||||
boomer = {
|
||||
|
|
@ -108,7 +110,6 @@
|
|||
hoot = {
|
||||
url = "git+https://codeberg.org/leana8959/hoot";
|
||||
inputs."nixpkgs".follows = "nixpkgs-stable";
|
||||
inputs."flake-parts".follows = "flake-parts";
|
||||
inputs."pre-commit-hooks".follows = "pre-commit-hooks";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue