clo/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bweh

Browse source
This commit is contained in:
Natalie Marks 2024-09-27 15:15:30 -07:00
parent 09aa7681bd
commit cb933d885d
1 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
flake.nix
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,36 +74,30 @@
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
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.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 stylix;
inherit userSettings; inherit hyprland-plugins;
inherit stylix; inherit zls;
inherit hyprland-plugins; inherit ghostty;
inherit zls; };
inherit ghostty;
};
} }
]; ];
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;
}; };
@ -112,18 +105,18 @@
}; };
darwinSystem = darwin.lib.darwinSystem { darwinSystem = darwin.lib.darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";
modules = [ modules = [
./hosts/laptop/configuration.nix ./hosts/laptop/configuration.nix
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
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;};
}; };
# nixos = inputs.self.nixosConfigurations.nmarks; # nixos = inputs.self.nixosConfigurations.nmarks;
# #
# #