martin/dot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix flake

Browse Source
This commit is contained in:
Martin Pander
2026-02-09 13:12:29 +01:00
parent 05c7d3443a
commit 0f534320a7
1 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
nix/flake.nix
View File

@@ -57,22 +57,19 @@
# Work WSL # Work WSL
work = nixpkgs-wsl-stable.lib.nixosSystem { work = nixpkgs-wsl-stable.lib.nixosSystem {
system = linuxSystem;
specialArgs = { inherit self inputs; }; specialArgs = { inherit self inputs; };
modules = [ modules = [
nixos-wsl.nixosModules.wsl nixos-wsl.nixosModules.wsl
./hosts/work/nixos/configuration.nix ./hosts/work/nixos/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = false; nixpkgs.hostPlatform = linuxSystem;
home-manager.useUserPackages = false; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit self inputs; inherit self inputs;
pkgs = import nixpkgs-wsl-stable {
system = linuxSystem;
config.allowUnfree = true;
overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
};
}; };
home-manager.users.pan = import ./hosts/work/nixos/home.nix; home-manager.users.pan = import ./hosts/work/nixos/home.nix;
} }
@@ -81,28 +78,20 @@
# Home # Home
home = nixpkgs-stable.lib.nixosSystem { home = nixpkgs-stable.lib.nixosSystem {
system = linuxAarchSystem;
specialArgs = { specialArgs = {
inherit self inputs; inherit self inputs;
# Provide both stable and unstable pkgs
pkgs = import nixpkgs-stable {
system = linuxAarchSystem;
config.allowUnfree = true;
};
}; };
modules = [ modules = [
./hosts/home/nixos/configuration.nix ./hosts/home/nixos/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = false; nixpkgs.hostPlatform = linuxAarchSystem;
home-manager.useUserPackages = false; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit self inputs; inherit self inputs;
pkgs = import nixpkgs-stable {
system = linuxAarchSystem;
config.allowUnfree = true;
overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
};
}; };
home-manager.users.martin = import ./hosts/home/nixos/home.nix; home-manager.users.martin = import ./hosts/home/nixos/home.nix;
} }
@@ -112,31 +101,39 @@
# --- Darwin Systems (Mac) --- # --- Darwin Systems (Mac) ---
darwinConfigurations."Martins-MacBook-Pro" = nix-darwin.lib.darwinSystem { darwinConfigurations."Martins-MacBook-Pro" = nix-darwin.lib.darwinSystem {
system = darwinSystem;
specialArgs = { inherit self inputs; }; specialArgs = { inherit self inputs; };
modules = [ ./hosts/home/darwin/configuration.nix ]; modules = [
./hosts/home/darwin/configuration.nix
{
nixpkgs.hostPlatform = darwinSystem;
}
];
}; };
# --- Standalone Home Manager --- # --- Standalone Home Manager ---
homeConfigurations = { homeConfigurations = {
"pan@work" = home-manager.lib.homeManagerConfiguration { "pan@work" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs-stable { pkgs = nixpkgs-stable.legacyPackages.${linuxSystem};
system = linuxSystem;
config.allowUnfree = true;
overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
};
extraSpecialArgs = { inherit self inputs; }; extraSpecialArgs = { inherit self inputs; };
modules = [ ./hosts/work/nix/home.nix ]; modules = [
./hosts/work/nix/home.nix
{
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
}
];
}; };
"martin@mac" = home-manager.lib.homeManagerConfiguration { "martin@mac" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs-stable { pkgs = nixpkgs-stable.legacyPackages.${darwinSystem};
system = darwinSystem;
config.allowUnfree = true;
overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
};
extraSpecialArgs = { inherit self inputs; }; extraSpecialArgs = { inherit self inputs; };
modules = [ ./hosts/home/nix/home.nix ]; modules = [
./hosts/home/nix/home.nix
{
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
}
];
}; };
}; };
}; };