refactored a bit

This commit is contained in:
Richard Mauer 2024-12-31 19:59:16 -05:00
parent 3eaeee3ecf
commit 4ef33abd45
2 changed files with 6 additions and 3 deletions

View File

@ -49,6 +49,7 @@
pkgs.nixos-install-tools pkgs.nixos-install-tools
pkgs.util-linux pkgs.util-linux
pkgs.nettools pkgs.nettools
pkgs.nixos-facter
config.myPackages.installFiles config.myPackages.installFiles
]; ];
system.stateVersion = "24.05"; system.stateVersion = "24.05";

View File

@ -2,13 +2,14 @@
inputs ={ inputs ={
nixpkgs.url = <nixpkgs>; nixpkgs.url = <nixpkgs>;
#nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; #nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
disko.url = "../../pkgs/disko"; disko = <nixpkgs>.disko.nixosModules.disko;
#disko.inputs.nixpkgs.follows = "nixpkgs"; #disko.inputs.nixpkgs.follows = "nixpkgs";
#nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixos-facter-modules = <nixpkgs>.nixos-facter.nixosmodules.nixos-facter;
}; };
outputs = outputs =
{ {
nixpkgs, nixpkgs,
self,
disko, disko,
nixos-facter-modules, nixos-facter-modules,
... ...
@ -16,9 +17,10 @@
{ {
nixosConfigurations.zabbixProxy = nixpkgs.lib.nixosSystem { nixosConfigurations.zabbixProxy = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit self nixpkgs;};
# to pass this flake into your configuration (see the example below) # to pass this flake into your configuration (see the example below)
modules = [ modules = [
disko.nixosModules.disko #imports = [ nixpkgs.disko.nixosModules.disko nixpkgs.nixos-facter.nixosmodules.nixos-facter ]
./disko.nix ./disko.nix
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix