Compare commits

...

2 Commits

Author SHA1 Message Date
e57b3e6937 Avoid warning about darwin-x86_64 expiring 2026-06-05 06:21:39 +00:00
0938c76f1b Extract "artem" into a variable 2026-06-05 06:21:05 +00:00

View File

@@ -41,6 +41,7 @@
... ...
}@inputs: }@inputs:
let let
homeManagerUser = "artem";
eachSystem = nixpkgs.lib.genAttrs (import systems); eachSystem = nixpkgs.lib.genAttrs (import systems);
overlay-master = _: prev: { overlay-master = _: prev: {
inherit inherit
@@ -48,6 +49,9 @@
system = prev.stdenv.hostPlatform.system; system = prev.stdenv.hostPlatform.system;
config = { config = {
allowUnfree = true; allowUnfree = true;
}
// nixpkgs.lib.optionalAttrs (prev.stdenv.hostPlatform.system == "x86_64-darwin") {
allowDeprecatedx86_64Darwin = true;
}; };
}) })
antigravity-cli antigravity-cli
@@ -76,12 +80,12 @@
linux-lxc = import ./modules/nixos/linux-lxc.nix; linux-lxc = import ./modules/nixos/linux-lxc.nix;
}; };
homeConfigurations."artem@deimos" = home-manager.lib.homeManagerConfiguration { homeConfigurations."${homeManagerUser}@deimos" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ overlay-master ]; overlays = [ overlay-master ];
}; };
extraSpecialArgs.primaryUser = "artem"; extraSpecialArgs.primaryUser = homeManagerUser;
modules = [ modules = [
inputs.fw_nix.nixosModules.identities inputs.fw_nix.nixosModules.identities
vscode-server.homeModules.default vscode-server.homeModules.default
@@ -90,13 +94,14 @@
]; ];
}; };
homeConfigurations."artem@mars" = home-manager.lib.homeManagerConfiguration { homeConfigurations."${homeManagerUser}@mars" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "x86_64-darwin"; system = "x86_64-darwin";
overlays = [ overlay-master ]; overlays = [ overlay-master ];
config.allowDeprecatedx86_64Darwin = true;
}; };
extraSpecialArgs = { extraSpecialArgs = {
primaryUser = "artem"; primaryUser = homeManagerUser;
}; };
modules = [ modules = [
inputs.fw_nix.nixosModules.identities inputs.fw_nix.nixosModules.identities
@@ -107,7 +112,7 @@
darwinConfigurations.mars = darwin.lib.darwinSystem { darwinConfigurations.mars = darwin.lib.darwinSystem {
system = "x86_64-darwin"; system = "x86_64-darwin";
specialArgs.primaryUser = "artem"; specialArgs.primaryUser = homeManagerUser;
modules = [ modules = [
inputs.fw_nix.nixosModules.identities inputs.fw_nix.nixosModules.identities
self.darwinModules.mac-portable self.darwinModules.mac-portable
@@ -119,6 +124,7 @@
./hosts/mars/darwin.nix ./hosts/mars/darwin.nix
(_: { (_: {
nixpkgs.overlays = [ overlay-master ]; nixpkgs.overlays = [ overlay-master ];
nixpkgs.config.allowDeprecatedx86_64Darwin = true;
}) })
]; ];
}; };
@@ -126,7 +132,7 @@
nixosConfigurations.deimos = nixpkgs.lib.nixosSystem { nixosConfigurations.deimos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
primaryUser = "artem"; primaryUser = homeManagerUser;
inherit (inputs) jail-nix; inherit (inputs) jail-nix;
}; };
modules = [ modules = [