From f5670d2c0eced84a4c90f0428d7b8db73ac1de7e Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Mon, 25 Nov 2024 12:42:21 +0100
Subject: [PATCH] Add Zsh shell to Darwin services and setup Harald's dev
 environment

Add Zsh to the list of available shells in the Darwin services module.
Introduce new Nix configurations for aarch64-darwin, including system packages and font settings.
Set up user-specific environment for Harald on aarch64-darwin system.
---
 homes/aarch64-darwin/harald@m4/default.nix | 32 ++++++++++++++++++++++
 modules/darwin/services/base/default.nix   |  1 +
 modules/darwin/system/fonts/default.nix    | 13 +++++----
 systems/aarch64-darwin/m4/default.nix      | 23 ++++++++++++++++
 4 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 homes/aarch64-darwin/harald@m4/default.nix
 create mode 100644 systems/aarch64-darwin/m4/default.nix

diff --git a/homes/aarch64-darwin/harald@m4/default.nix b/homes/aarch64-darwin/harald@m4/default.nix
new file mode 100644
index 0000000..7871e1b
--- /dev/null
+++ b/homes/aarch64-darwin/harald@m4/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
+  home = {
+    username = "harald";
+    homeDirectory = "/Users/${config.home.username}";
+    stateVersion = "23.11"; # Please read the comment before changing.
+    # sessionPath = [ "$HOME/bin" ];
+  };
+
+  metacfg = {
+
+    cli-apps = {
+      bash.enable = true;
+      fish.enable = true;
+      #neovim.enable = true;
+      bat.enable = true;
+      starship.enable = true;
+      #home-manager.enable = true;
+    };
+
+    tools = {
+      direnv.enable = true;
+      ssh.enable = true;
+      git.enable = true;
+    };
+  };
+}
diff --git a/modules/darwin/services/base/default.nix b/modules/darwin/services/base/default.nix
index 96275da..d50f779 100644
--- a/modules/darwin/services/base/default.nix
+++ b/modules/darwin/services/base/default.nix
@@ -41,6 +41,7 @@ in
       shells = [
         pkgs.fish
         pkgs.bash
+        pkgs.zsh
       ];
     };
 
diff --git a/modules/darwin/system/fonts/default.nix b/modules/darwin/system/fonts/default.nix
index 4d73854..7daa510 100644
--- a/modules/darwin/system/fonts/default.nix
+++ b/modules/darwin/system/fonts/default.nix
@@ -27,11 +27,14 @@ in
       packages =
         with pkgs;
         [
-          noto-fonts
-          noto-fonts-cjk-sans
-          noto-fonts-cjk-serif
-          noto-fonts-emoji
-          (nerdfonts.override { fonts = [ "Hack" ]; })
+          (nerdfonts.override {
+            fonts = [
+              "Hack"
+              "FiraCode"
+              "DroidSansMono"
+              "JetBrainsMono"
+            ];
+          })
         ]
         ++ cfg.fonts;
     };
diff --git a/systems/aarch64-darwin/m4/default.nix b/systems/aarch64-darwin/m4/default.nix
new file mode 100644
index 0000000..61b4a65
--- /dev/null
+++ b/systems/aarch64-darwin/m4/default.nix
@@ -0,0 +1,23 @@
+{ lib, pkgs, ... }:
+
+with lib.metacfg;
+{
+  metacfg = {
+    suites = {
+      common = enabled;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    # azure-cli
+    kubectl
+    kubectx
+    k9s
+    attic-client
+    ollama
+  ];
+
+  users.users.harald.shell = pkgs.fish;
+
+  system.stateVersion = 4;
+}