updates from makefile

This commit is contained in:
Don Harper 2024-04-02 21:49:05 -05:00
parent 384f11a5a9
commit 3c279b3432
2 changed files with 17 additions and 18 deletions

View file

@ -3,11 +3,6 @@
disko.url = "github:nix-community/disko";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-2311.url = "github:nixos/nixpkgs/23.11";
home-manager-2311 = {
url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs-2311";
};
home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
@ -21,7 +16,6 @@
outputs = inputs@{
self,
nixpkgs,
nixpkgs-2311,
nix,
disko,
nixos-hardware,
@ -46,7 +40,6 @@
templates = import ./templates;
overlays = import ./overlays { inherit inputs outputs; };
hydraJobs = import ./hydra.nix { inherit inputs outputs; };
# packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
# devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
@ -67,7 +60,10 @@
specialArgs = { inherit inputs outputs; };
};
loki = lib.nixosSystem {
modules = [ ./hosts/loki ];
modules = [
nixos-hardware.nixosModules.dell-xps-13-9310
./hosts/loki
];
specialArgs = { inherit inputs outputs; };
};
pocket2 = lib.nixosSystem {
@ -75,7 +71,10 @@
specialArgs = { inherit inputs outputs; };
};
smaug = lib.nixosSystem {
modules = [ ./hosts/smaug ];
modules = [
nixos-hardware.nixosModules.lenovo-thinkpad-x260
./hosts/smaug
];
specialArgs = { inherit inputs outputs; };
};
# t2 = lib.nixosSystem {