cy/nixos-config
cy/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't use flake-parts

Browse source
This commit is contained in:
cy 2025-04-01 12:17:57 -04:00
parent 08a75b8b8f
commit ecc20e71f3
Signed by: cy
SSH key fingerprint: SHA256:o/geVWV4om1QhUSkKvDQeW/eAihwnjyXkqMwrVdbuts
2 changed files with 75 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
flake.lock generated
View file

@ -273,9 +273,7 @@
}, },
"flake-parts_2": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1741352980, "lastModified": 1741352980,
@ -763,6 +761,21 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1743296961,
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1730741070, "lastModified": 1730741070,

158
flake.nix
View file

@ -29,10 +29,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts"; inputs.flake-parts.follows = "flake-parts";
}; };
flake-parts = {
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -101,6 +97,7 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
crane.url = "github:ipetkov/crane"; crane.url = "github:ipetkov/crane";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
flake-parts.url = "github:hercules-ci/flake-parts";
}; };
nixConfig = { nixConfig = {
@ -119,111 +116,74 @@
self, self,
nixpkgs, nixpkgs,
home-manager, home-manager,
flake-parts,
... ...
}@inputs: }@inputs:
flake-parts.lib.mkFlake { inherit inputs; } ( let
{ ... }: pkgs = import nixpkgs {
config.allowUnfree = true;
system = "x86_64-linux";
overlays = [
inputs.rust-overlay.overlays.default
inputs.vscode-extensions.overlays.default
] ++ (import ./overlay { inherit inputs; });
};
in
{ {
imports = [ nixosConfigurations =
inputs.treefmt.flakeModule let
]; lib = nixpkgs.lib;
systems = [ in
"x86_64-linux"
];
perSystem =
{ {
inputs', ytnix = lib.nixosSystem {
... specialArgs = { inherit inputs; };
}: modules = [
{ {
treefmt = { nixpkgs = { inherit pkgs; };
projectRootFile = "flake.nix"; }
programs.nixfmt.enable = true; ./hosts/ytnix
programs.typos.enable = true; ./modules
programs.shellcheck.enable = true; inputs.sops-nix.nixosModules.sops
inputs.lanzaboote.nixosModules.lanzaboote
programs.yamlfmt = { inputs.lix-module.nixosModules.default
enable = true; inputs.nix-ld.nixosModules.nix-ld
settings.retain_line_breaks = true; ];
}; };
chunk = lib.nixosSystem {
settings.global.excludes = [ specialArgs = { inherit inputs; };
"secrets/*" modules = [
"**/*.png" # tries to format a png file {
nixpkgs = { inherit pkgs; };
}
./hosts/chunk
./modules
inputs.sops-nix.nixosModules.sops
inputs.lix-module.nixosModules.default
]; ];
}; };
}; };
homeConfigurations =
flake =
let let
pkgs = import nixpkgs { lib = home-manager.lib;
config.allowUnfree = true;
system = "x86_64-linux";
overlays = [
inputs.rust-overlay.overlays.default
inputs.vscode-extensions.overlays.default
] ++ (import ./overlay { inherit inputs; });
};
in in
{ {
nixosConfigurations = "yt@ytnix" = lib.homeManagerConfiguration {
let inherit pkgs;
lib = nixpkgs.lib; extraSpecialArgs = { inherit inputs; };
in modules = [
{ ./home/yt/ytnix.nix
ytnix = lib.nixosSystem { inputs.nixvim.homeManagerModules.nixvim
specialArgs = { inherit inputs; }; inputs.nix-index-database.hmModules.nix-index
modules = [ ];
{ };
nixpkgs = { inherit pkgs; };
}
./hosts/ytnix
./modules
inputs.sops-nix.nixosModules.sops
inputs.lanzaboote.nixosModules.lanzaboote
inputs.lix-module.nixosModules.default
inputs.nix-ld.nixosModules.nix-ld
];
};
chunk = lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
{
nixpkgs = { inherit pkgs; };
}
./hosts/chunk
./modules
inputs.sops-nix.nixosModules.sops
inputs.lix-module.nixosModules.default
];
};
};
homeConfigurations =
let
lib = home-manager.lib;
in
{
"yt@ytnix" = lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = { inherit inputs; };
modules = [
./home/yt/ytnix.nix
inputs.nixvim.homeManagerModules.nixvim
inputs.nix-index-database.hmModules.nix-index
];
};
"yt@chunk" = lib.homeManagerConfiguration { "yt@chunk" = lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
modules = [ modules = [
./home/yt/chunk.nix ./home/yt/chunk.nix
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
]; ];
}; };
};
}; };
} };
);
} }