wymiller/nix-config-v2
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Wyatt J. Miller
2025-05-29 13:01:56 -04:00
parent 7c79fe1169 b15c89f55c
commit 0d9e0ff10d
13 changed files with 382 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
flake.nix
View File

@ -1,16 +1,22 @@
{
description = "Wyatt's nix configuration suite";
inputs = {
<<<<<<< HEAD
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
=======
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
>>>>>>> origin
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
darwin = {
url = "github:lnl7/nix-darwin/nix-darwin-24.11";
url = "github:lnl7/nix-darwin/nix-darwin-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
ghostty.url = "github:ghostty-org/ghostty";
};
outputs = inputs @ {
@ -19,20 +25,22 @@
nix-flatpak,
darwin,
home-manager,
ghostty,
...
}: let
userName = "wyatt";
userEmail = "wyatt@wyattjmiller.com";
extraSpecialArgs = {
inherit userName userEmail;
inherit userName userEmail ghostty;
};
in {
# Primary laptop - MacBook Pro (2023, M3)
darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
system = "aarch64-darwin";
specialArgs = {
inherit userName userEmail;
inherit userName userEmail ghostty;
hostname = "sephiroth";
role = "devel";
};
modules = [
./modules/common
@ -52,8 +60,9 @@
nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit userName userEmail;
inherit userName userEmail ghostty;
hostname = "cloud";
role = "devel";
};
modules = [
nix-flatpak.nixosModules.nix-flatpak
@ -78,6 +87,7 @@
specialArgs = {
inherit userName userEmail;
hostname = "valefor";
role = "server";
};
modules = [
./modules/common
@ -101,6 +111,7 @@
specialArgs = {
inherit userName userEmail;
hostname = "ixion";
role = "server";
};
# modules = [
# nix-flatpak.nixosModules.nix-flatpak