This commit is contained in:
Natalie Marks 2024-09-27 15:15:30 -07:00
parent 09aa7681bd
commit cb933d885d

View file

@ -46,6 +46,7 @@
nixpkgs-stable, nixpkgs-stable,
home-manager, home-manager,
stylix, stylix,
darwin,
blocklist-hosts, blocklist-hosts,
hyprland-plugins, hyprland-plugins,
zig, zig,
@ -58,7 +59,6 @@
inputs.zig.overlays.default inputs.zig.overlays.default
]; ];
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = systemSettings.system;
config = { config = {
allowUnfree = true; allowUnfree = true;
allowUnfreePredicate = _: true; allowUnfreePredicate = _: true;
@ -67,7 +67,6 @@
}; };
pkgs-stable = import nixpkgs-stable { pkgs-stable = import nixpkgs-stable {
system = systemSettings.system;
config = { config = {
allowUnfree = true; allowUnfree = true;
allowUnfreePredicate = _: true; allowUnfreePredicate = _: true;
@ -75,12 +74,10 @@
overlays = []; overlays = [];
}; };
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in {
nixosConfigurations = { nixosConfigurations = {
nixos = lib.nixosSystem { nixos = lib.nixosSystem {
system = systemSettings.system;
modules = [ modules = [
nixos-cosmic.nixosModules.default nixos-cosmic.nixosModules.default
./configuration.nix ./configuration.nix
@ -91,8 +88,6 @@
home-manager.users.nmarks = import ./hosts/desktop/home.nix; home-manager.users.nmarks = import ./hosts/desktop/home.nix;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit pkgs-stable; inherit pkgs-stable;
inherit systemSettings;
inherit userSettings;
inherit stylix; inherit stylix;
inherit hyprland-plugins; inherit hyprland-plugins;
inherit zls; inherit zls;
@ -103,8 +98,6 @@
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit pkgs-stable; inherit pkgs-stable;
inherit systemSettings;
inherit userSettings;
inherit stylix; inherit stylix;
inherit blocklist-hosts; inherit blocklist-hosts;
}; };
@ -120,7 +113,7 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.nmarks = import ./hosts/laptop/home.nix; home-manager.users.nmarks = import ./hosts/laptop/home.nix;
users.users.nmarks.home = "/Users/nmarks"; users.users.nmarks.home = "/Users/nmarks";
}; }
]; ];
specialArgs = {inherit nixpkgs;}; specialArgs = {inherit nixpkgs;};
}; };