Unified Laptop and Desktop

This commit is contained in:
2025-07-07 17:16:11 -05:00
parent ddd9a53ab0
commit 6ef4ac360f
20 changed files with 1283 additions and 321 deletions

View File

@@ -14,11 +14,14 @@
zen-browser.url = "github:0xc000022070/zen-browser-flake";
master.url = "github:NixOS/nixpkgs/master";
home-manager.url = "github:nix-community/home-manager";
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-apple-silicon = {
url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs";
};
astal = {
url = "github:aylur/astal";
inputs.nixpkgs.follows = "nixpkgs";
@@ -26,7 +29,7 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, stylix, astal, nixpkgs, nixos-cosmic, home-manager, hyprpanel, zen-browser, master, nixvim }@inputs:
outputs = { self, stylix, astal, nixpkgs, nixos-cosmic, home-manager, zen-browser, master, nixos-apple-silicon, nixvim }@inputs:
{
nixosConfigurations = {
nixos = nixpkgs.lib.nixosSystem {
@@ -39,23 +42,45 @@
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
nixpkgs.overlays =
[ inputs.hyprpanel.overlay ];
_module.args = { inherit inputs; };
}
#stylix.nixosModules.stylix
nixos-cosmic.nixosModules.default
./configuration.nix
./hosts/desktop/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.users.joshuaelm = {
imports = [ ./home.nix nixvim.homeManagerModules.nixvim stylix.homeModules.stylix ];
imports = [ ./hosts/desktop/home.nix nixvim.homeManagerModules.nixvim stylix.homeModules.stylix ];
};
}
];
};
nixos-laptop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit nixvim;};
specialArgs.inputs = inputs;
modules = [
{
nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
}
nixos-apple-silicon.nixosModules.apple-silicon-support
#stylix.nixosModules.stylix
nixos-cosmic.nixosModules.default
./hosts/mac-laptop/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.users.joshuaelm = {
imports = [ ./hosts/mac-laptop/home.nix nixvim.homeManagerModules.nixvim stylix.homeModules.stylix ];
};
}
];
};
};
};
}