Merge branch 'main' into stylix

This commit is contained in:
Tyler Mayoff 2025-02-14 20:01:09 -05:00
commit d1055552bc
60 changed files with 3863 additions and 248 deletions

View file

@ -4,20 +4,28 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
nixgl.url = "github:nix-community/nixGL";
helix.url = "github:helix-editor/helix/25.01";
helix.url = "github:helix-editor/helix/25.01.1";
stylix.url = "github:danth/stylix/release-24.11";
darwin.url = "github:lnl7/nix-darwin";
darwin = {
url = "github:lnl7/nix-darwin/nix-darwin-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
self,
nixpkgs,
nixpkgs-unstable,
lix-module,
home-manager,
darwin,
helix,
@ -44,11 +52,44 @@
specialArgs = {inherit inputs outputs;};
modules = [./nixos/mal/configuration.nix];
};
wash = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
modules = [
lix-module.nixosModules.default
./nixos/wash/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs outputs;};
home-manager.users.tyler = import ./home/wash/wash.nix;
}
];
};
};
darwinConfigurations."MAC-C57KK2TC69" = darwin.lib.darwinSystem {
specialArgs = {inherit inputs outputs;};
modules = [./home/hinge/darwin.nix];
pkgs = allPkgs."aarch64-darwin";
specialArgs = {inherit inputs;};
modules = [
lix-module.nixosModules.default
./home/hinge/darwin.nix
home-manager.darwinModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs outputs;};
home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix;
users.users."tyler.mayoff".home = "/Users/tyler.mayoff";
}
];
};
homeConfigurations = {
@ -64,17 +105,17 @@
modules = [stylix.homeManagerModules.stylix ./home/wash/wash.nix];
};
"tyler@mal" = home-manager.lib.homeManagerConfiguration {
pkgs = allPkgs;
extraSpecialArgs = {inherit inputs outputs;};
modules = [./home/mal/mal.nix];
};
# "tyler@mal" = home-manager.lib.homeManagerConfiguration {
# pkgs = allPkgs;
# extraSpecialArgs = {inherit inputs outputs;};
# modules = [./home/mal/mal.nix];
# };
"tyler.mayoff@MAC-C57KK2TC69" = home-manager.lib.homeManagerConfiguration {
pkgs = allPkgs."aarch64-darwin";
extraSpecialArgs = {inherit inputs outputs;};
modules = [stylix.homeManagerModules.stylix ./home/hinge/hinge.nix];
};
# "tyler.mayoff@MAC-C57KK2TC69" = home-manager.lib.homeManagerConfiguration {
# pkgs = allPkgs."aarch64-darwin";
# extraSpecialArgs = {inherit inputs outputs;};
# modules = [./home/hinge/hinge.nix];
# };
};
};
}