From 4abbd0ef3384ade0df1e3ee19d94e5cdf1619761 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Mon, 21 Jul 2025 09:18:37 -0500 Subject: [PATCH] darwin --- flake.lock | 76 +++++++++---------- flake.nix | 8 +- .../default.nix | 14 ++-- .../mac/{configuration.nix => default.nix} | 0 systems/aarch64-darwin/mac/homebrew.nix | 2 +- 5 files changed, 53 insertions(+), 47 deletions(-) rename homes/aarch64-darwin/{mattjallen@macbook-pro => mattjallen@mac}/default.nix (82%) rename systems/aarch64-darwin/mac/{configuration.nix => default.nix} (100%) diff --git a/flake.lock b/flake.lock index 865d271..03f11ac 100644 --- a/flake.lock +++ b/flake.lock @@ -155,6 +155,24 @@ "url": "https://codeberg.org/kampka/nix-flake-crowdsec.git" } }, + "darwin": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -591,7 +609,7 @@ "jovian_2": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1752662387, @@ -612,7 +630,7 @@ "crane": "crane", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_3" }, @@ -657,24 +675,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1751313918, - "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1064,6 +1064,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1747728033, + "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1751984180, "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", @@ -1079,7 +1095,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1731919951, "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", @@ -1095,22 +1111,6 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1747728033, - "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_8": { "locked": { "lastModified": 1744868846, @@ -1246,6 +1246,7 @@ "chaotic": "chaotic", "cosmic": "cosmic", "crowdsec": "crowdsec", + "darwin": "darwin", "disko": "disko", "home-manager": "home-manager_2", "homebrew-cask": "homebrew-cask", @@ -1253,7 +1254,6 @@ "impermanence": "impermanence", "jovian": "jovian_2", "lanzaboote": "lanzaboote", - "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nix-vscode-extensions": "nix-vscode-extensions", "nixai": "nixai", diff --git a/flake.nix b/flake.nix index 2a4a229..a7ddb2c 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; - nix-darwin.url = "github:LnL7/nix-darwin"; + darwin.url = "github:LnL7/nix-darwin"; nix-homebrew.url = "github:zhaofengli/nix-homebrew"; @@ -94,6 +94,12 @@ sops-nix.nixosModules.sops ]; + # common darwin modules + modules.darwin = with inputs; [ + nix-homebrew.darwinModules.nix-homebrew + home-manager.darwinModules.home-manager + ]; + # Host config hosts = { # ###################################################### diff --git a/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix b/homes/aarch64-darwin/mattjallen@mac/default.nix similarity index 82% rename from homes/aarch64-darwin/mattjallen@macbook-pro/default.nix rename to homes/aarch64-darwin/mattjallen@mac/default.nix index 698ceb7..a8e432a 100755 --- a/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix +++ b/homes/aarch64-darwin/mattjallen@mac/default.nix @@ -17,12 +17,12 @@ let ]; in { - imports = [ - ../../modules/home/defaults.nix - ../../modules/home/git.nix - ../../modules/home/shell.nix - ../../modules/home/vscode.nix - ]; + # imports = [ + # ../../modules/home/defaults.nix + # ../../modules/home/git.nix + # ../../modules/home/shell.nix + # ../../modules/home/vscode.nix + # ]; # Home Manager needs a bit of information about you and the # paths it should manage. home = { @@ -30,7 +30,7 @@ in homeDirectory = "/Users/mattjallen"; packages = lib.mkForce packages; sessionVariables = { - NH_DARWIN_FLAKE = "${home.homeDirectory}/nix-config"; + NH_DARWIN_FLAKE = "${home.homeDirectory}/nix-config#mac"; }; }; diff --git a/systems/aarch64-darwin/mac/configuration.nix b/systems/aarch64-darwin/mac/default.nix similarity index 100% rename from systems/aarch64-darwin/mac/configuration.nix rename to systems/aarch64-darwin/mac/default.nix diff --git a/systems/aarch64-darwin/mac/homebrew.nix b/systems/aarch64-darwin/mac/homebrew.nix index 009eb2f..b0fb0be 100644 --- a/systems/aarch64-darwin/mac/homebrew.nix +++ b/systems/aarch64-darwin/mac/homebrew.nix @@ -50,7 +50,7 @@ "vlc" "vscodium" "wine-stable" - "xpipe" + # "xpipe" "xquartz" ]; masApps = {