macos shit

This commit is contained in:
2025-10-17 15:14:22 -05:00
parent 52d96b7b2d
commit d4f55ea042
4 changed files with 87 additions and 32 deletions

21
flake.lock generated
View File

@@ -265,6 +265,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1760721282,
"narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "c3211fcd0c56c11ff110d346d4487b18f7365168",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748162331, "lastModified": 1748162331,
@@ -365,6 +385,7 @@
"autoaspm": "autoaspm", "autoaspm": "autoaspm",
"copyparty": "copyparty", "copyparty": "copyparty",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nvf": "nvf", "nvf": "nvf",

View File

@@ -6,6 +6,10 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs.url = "nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
nix-darwin = {
url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -31,34 +35,48 @@
}; };
copyparty.url = "github:9001/copyparty"; copyparty.url = "github:9001/copyparty";
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, ... }@inputs: outputs = {
let self,
systems = { nixpkgs,
x86_64 = "x86_64-linux"; nixpkgs-unstable,
arm64 = "aarch64-linux"; nix-darwin,
darwin = "aarch64-darwin"; ...
}; } @ inputs: let
stable_pkgs = builtins.mapAttrs (k: v: import nixpkgs { system = v; }) systems; systems = {
unstable_pkgs = builtins.mapAttrs (k: v: import nixpkgs-unstable { system = v; }) systems; x86_64 = "x86_64-linux";
in arm64 = "aarch64-linux";
{ darwin = "aarch64-darwin";
nixosConfigurations = {
snowbelle = nixpkgs.lib.nixosSystem {
system = systems.x86_64;
specialArgs = { inherit inputs stable_pkgs unstable_pkgs; };
modules = [
./hosts/snowbelle/configuration.nix
inputs.home-manager.nixosModules.default
];
};
vaniville = nixpkgs.lib.nixosSystem {
system = systems.x86_64;
specialArgs = { inherit inputs stable_pkgs unstable_pkgs; };
modules = [
./hosts/vaniville/configuration.nix
inputs.home-manager.nixosModules.default
];
};
};
}; };
stable_pkgs = builtins.mapAttrs (k: v: import nixpkgs {system = v;}) systems;
unstable_pkgs = builtins.mapAttrs (k: v: import nixpkgs-unstable {system = v;}) systems;
in {
nixosConfigurations = {
snowbelle = nixpkgs.lib.nixosSystem {
system = systems.x86_64;
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
modules = [
./hosts/snowbelle/configuration.nix
inputs.home-manager.nixosModules.default
];
};
vaniville = nixpkgs.lib.nixosSystem {
system = systems.x86_64;
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
modules = [
./hosts/vaniville/configuration.nix
inputs.home-manager.nixosModules.default
];
};
};
darwinConfigurations = {
CEN-IT-07 = nix-darwin.lib.darwinSystem {
system = systems.darwin;
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
modules = [
./hosts/cen-it-07/configuration.nix
inputs.home-manager.darwinModules.default
];
};
};
};
} }

View File

@@ -0,0 +1,16 @@
{
pkgs,
config,
...
}: {
home.packages = with pkgs; [];
wayland.windowManager.hyprland = if pkgs.system == "x86_64-darwin" then {} else {
enable = true;
};
#
home.sessionVariables = if pkgs.system == "x86_64-darwin" then {} else {
};
}

View File

@@ -12,8 +12,8 @@
homeDirectory = "/home/blake"; homeDirectory = "/home/blake";
}; };
home_darwin = { home_darwin = {
username = "bhelderman"; username = "bdhelderman";
homeDirectory = "/Users/bhelderman"; homeDirectory = "/Users/bdhelderman";
}; };
in in
{ {
@@ -28,7 +28,7 @@ in
./dots/xdg ./dots/xdg
]; ];
# general config # set home manager config based on system type
home = (if pkgs.system == "x86_64-darwin" then home_darwin else home_linux) // { home = (if pkgs.system == "x86_64-darwin" then home_darwin else home_linux) // {
# cross party general packages here : ) # cross party general packages here : )
stateVersion = "25.05"; stateVersion = "25.05";