Update flake to include COSMIC repo, nixos-hardware for garrus and more

This commit is contained in:
Aaron Honeycutt 2024-10-11 19:19:20 -06:00
parent e2cf543c79
commit d1e769c3c3

View file

@ -2,13 +2,17 @@
description = "Generic System Flake file"; description = "Generic System Flake file";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; #nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
disko = { disko = {
url = github:nix-community/disko; url = github:nix-community/disko;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-software-center.url = "github:snowfallorg/nix-software-center"; nix-software-center.url = "github:snowfallorg/nix-software-center";
nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -16,7 +20,7 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
}; };
outputs = { self, nixpkgs, disko, home-manager, nixos-hardware, ... }@inputs: { outputs = inputs@{ self, nixpkgs, disko, nixos-cosmic, home-manager, nixos-hardware, ... }: {
nixosConfigurations = { nixosConfigurations = {
"nixos" = nixpkgs.lib.nixosSystem { "nixos" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@ -50,20 +54,29 @@
"garrus" = nixpkgs.lib.nixosSystem { "garrus" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [ modules = [
# Add Disko for disk management # Add Disko for disk management
disko.nixosModules.disko disko.nixosModules.disko
./disko-config.nix ./disko-config.nix
./gnome.nix # ./gnome.nix
./garrus.nix ./garrus.nix
./configuration.nix ./configuration.nix
./hardware-configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.aaronh = import ./home.nix; home-manager.users.aaronh = import ./home.nix;
} }
nixos-hardware.nixosModules.system76
nixos-hardware.nixosModules.system76-galp5-1650
{
nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
}
nixos-cosmic.nixosModules.default
]; ];
}; };