MacBook.local-2024-11-28-10-56-04

configs/common.nix

@@ -75,7 +75,7 @@
   };
 
   sops = {
-    defaultSopsFile = lib.mkDefault ../secrets.yaml;
+    defaultSopsFile = lib.mkDefault ../secrets/secrets.yaml;
     validateSopsFiles = true;
     age = {
       sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
@@ -86,7 +86,7 @@
     secrets = {
       hashedPassword = {
         neededForUsers = true;
-        sopsFile = ../secrets.yaml;
+        sopsFile = ../secrets/secrets.yaml;
       };
     };
   };

flake.lock

@@ -174,6 +174,26 @@
         "type": "github"
       }
     },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732603785,
+        "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -252,6 +272,7 @@
         "home-manager": "home-manager_2",
         "impermanence": "impermanence",
         "kwin-effects-forceblur": "kwin-effects-forceblur",
+        "nix-darwin": "nix-darwin",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix"

flake.nix

@@ -28,6 +28,11 @@
       url = "github:TamtamHero/fw-fanctrl/packaging/nix";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+
+    nix-darwin = {
+      url = "github:LnL7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
   };
 
   outputs = {
@@ -40,6 +45,7 @@
     nixpkgs-unstable,
     sops-nix,
     impermanence,
+    nix-darwin,
     ...
   } @ inputs: let
     inherit (self) outputs;
@@ -121,5 +127,18 @@
         ];
       };
     };
+
+    darwinConfigurations."MacBook" = nix-darwin.lib.darwinSystem {
+      system = "aarch64-darwin";
+      modules = [
+          ./machine/macbook/configuration.nix
+        # home-manager.darwinModules.home-manager
+        # {
+        #   home-manager.useGlobalPkgs = true;
+        #   home-manager.useUserPackages = true;
+        #   home-manager.users.omerxx = import ./home.nix;
+        # }
+      ];
+    };
   };
 }

machine/desktop/configuration.nix

@@ -22,7 +22,7 @@ in {
   ];
 
   sops = {
-    defaultSopsFile = ../../secrets.yaml;
+    defaultSopsFile = ../../secrets/secrets.yaml;
     validateSopsFiles = true;
     age = {
       sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
@@ -32,7 +32,7 @@ in {
 
     secrets = {
       borg-key = {
-        sopsFile = ../../secrets-desktop.yaml;
+        sopsFile = ../../secrets/secrets-desktop.yaml;
         owner = config.users.users.alex.name;
         group = config.users.users.alex.group;
       };
@@ -158,7 +158,7 @@ in {
     graphics = {
       enable = true;
       enable32Bit = true;
-      extraPackages = with pkgs; [ rocmPackages.clr.icd ];
+      extraPackages = with pkgs; [rocmPackages.clr.icd];
     };
 
     # cpu.x86.msr = {

machine/framework/configuration.nix

@@ -21,7 +21,7 @@ in {
   ];
 
   sops = {
-    defaultSopsFile = ../../secrets.yaml;
+    defaultSopsFile = ../../secrets/secrets.yaml;
     validateSopsFiles = true;
     age = {
       sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
@@ -31,7 +31,7 @@ in {
 
     secrets = {
       borg-key = {
-        sopsFile = ../../secrets-framework.yaml;
+        sopsFile = ../../secrets/secrets-framework.yaml;
         owner = config.users.users.alex.name;
         group = config.users.users.alex.group;
       };

machine/macbook/configuration.nix

@@ -0,0 +1,30 @@
+{
+  config,
+  pkgs,
+  lib,
+  outputs,
+  inputs,
+  ...
+}: {
+  nixpkgs.hostPlatform = "aarch64-darwin";
+
+  system.defaults = {
+    dock.autohide = true;
+    dock.mru-spaces = false;
+    # finder.AppleShowAllExtensions = true;
+    # finder.FXPreferredViewStyle = "clmv";
+    screencapture.location = "~/Pictures/screenshots";
+    screensaver.askForPasswordDelay = 10;
+  };
+
+  services.nix-daemon.enable = true;
+  nix.settings.experimental-features = "nix-command flakes";
+
+  nix = {
+    configureBuildUsers = true;
+  useDaemon = true;
+  };
+
+  homebrew.enable = true;
+  system.stateVersion = 5;
+}

machine/mini/configuration.nix

@@ -13,7 +13,7 @@
   ];
 
   sops = {
-    defaultSopsFile = ../../secrets.yaml;
+    defaultSopsFile = ../../secrets/secrets.yaml;
     validateSopsFiles = true;
     age = {
       sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
@@ -23,7 +23,7 @@
 
     secrets = {
       borg-key = {
-        sopsFile = ../../secrets-mini.yaml;
+        sopsFile = ../../secrets/secrets-mini.yaml;
         owner = config.users.users.alex.name;
         group = config.users.users.alex.group;
       };

machine/nixos-virtualbox/configuration.nix

@@ -13,7 +13,7 @@
   ];
 
   sops = {
-    defaultSopsFile = ../../secrets.yaml;
+    defaultSopsFile = ../../secrets/secrets.yaml;
     validateSopsFiles = true;
     age = {
       sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];

machine/nixos-vm/configuration.nix

@@ -34,10 +34,10 @@
   # replicates the default behaviour.
   networking.useDHCP = false;
 
-#  hardware.parallels = {
-#    enable = true;
-    # autoMountShares = true;
-#  };
+  #  hardware.parallels = {
+  #    enable = true;
+  # autoMountShares = true;
+  #  };
 
   services = {
     k3s = {

machine/vps-arm/configuration.nix

@@ -26,7 +26,7 @@ in {
   ];
 
   sops = {
-    defaultSopsFile = ../../secrets-vps-arm.yaml;
+    defaultSopsFile = ../../secrets/secrets-vps-arm.yaml;
     secrets = {
       borg-key = {
         owner = config.users.users.alex.name;