From 1280cf993970c2913769ebfe771c4da9c64e9813 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 19 Dec 2025 16:59:01 -0600 Subject: [PATCH] darwin --- flake.lock | 6 +++--- modules/home/stylix/default.nix | 7 ++++--- systems/aarch64-darwin/macbook-pro/default.nix | 6 +++--- systems/aarch64-linux/pi4/default.nix | 1 - 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index ec8d2f0..5a06c7d 100644 --- a/flake.lock +++ b/flake.lock @@ -997,11 +997,11 @@ ] }, "locked": { - "lastModified": 1765667832, - "narHash": "sha256-6KEF19MMbrVAs9OgWzmrqq9fI2h0BQDA8VHtszRn2bk=", + "lastModified": 1765832983, + "narHash": "sha256-9kZOSTJ6ITCoHs9gz4I06IJ2vb2S4gQd3WR4aTnWovI=", "owner": "mjallen18", "repo": "nixos-raspberrypi", - "rev": "ae5d1b993413b17dd664c4f0a114bc872c4e1303", + "rev": "8b00ff4f0b156eabd86f946fa7964efda04e2713", "type": "github" }, "original": { diff --git a/modules/home/stylix/default.nix b/modules/home/stylix/default.nix index f782c05..beeb03c 100644 --- a/modules/home/stylix/default.nix +++ b/modules/home/stylix/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, system, ... }: let # # Pull from global theme options # themeSize = "standard"; # "standard" | "compact" @@ -23,6 +23,7 @@ let # schemeVariants = [ iconScheme ]; # colorVariants = [ iconThemeVariant ]; # }; + isDarwin = system == "aarch64_darwin"; in { stylix = { @@ -59,8 +60,8 @@ in }; sizes = { - applications = 12; - desktop = 14; + applications = if isDarwin then 10 else 12; + desktop = if isDarwin then 12 else 14; popups = config.stylix.fonts.sizes.desktop; terminal = config.stylix.fonts.sizes.applications; }; diff --git a/systems/aarch64-darwin/macbook-pro/default.nix b/systems/aarch64-darwin/macbook-pro/default.nix index 84d43ae..fc47913 100755 --- a/systems/aarch64-darwin/macbook-pro/default.nix +++ b/systems/aarch64-darwin/macbook-pro/default.nix @@ -31,9 +31,9 @@ home = "/Users/mattjallen"; }; - # nix = { - # linux-builder.enable = true; - # }; + nix = { + linux-builder.enable = true; + }; nix-rosetta-builder = { enable = true; diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix index 536b3d2..d8b3f0f 100755 --- a/systems/aarch64-linux/pi4/default.nix +++ b/systems/aarch64-linux/pi4/default.nix @@ -38,7 +38,6 @@ }; user = { name = "matt"; - hashedPasswordFile = null; mutableUsers = false; extraGroups = [ "docker"