Cleanup for macOS

Makefile

@@ -8,7 +8,7 @@ HOSTNAME ?= $(shell hostname)
 UNAME_S := $(shell uname -s)
 
 ifeq ($(UNAME_S),Linux)
-	SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' \
+	SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' \
 								--impure # Impure because of: https://discourse.nixos.org/t/vscode-remote-wsl-extension-works-on-nixos-without-patching-thanks-to-nix-ld/14615
 endif
 ifeq ($(UNAME_S),Darwin)

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688898859,
+        "lastModified": 1688999459,
-        "narHash": "sha256-NjvwXnMp8oMQ86FHVhzlmgGy2dVDMGVLpZ4+YVsJgMU=",
+        "narHash": "sha256-b0rFzeHWXGq2rrx+W93I1Lpb0HFq0T5Pfx7QLVcZ/jE=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "66a3047fa88eb6aa5c5a2e675de91f0431fbe561",
+        "rev": "83620edf499ba8033ad43d4f5edc50fdf3eeee5f",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1688798314,
+        "lastModified": 1689060619,
-        "narHash": "sha256-MFG5rx7L756rtrPHsL662m64AZ4sKqUcApaiYgSKfNM=",
+        "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "47dca15d86fdd2eabcf434d7cc0b5baa8d1a463c",
+        "rev": "44bc025007e5fcc10dbc3d9f96dcbf06fc0e8c1c",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
     },
     "nixpkgs-latest": {
       "locked": {
-        "lastModified": 1688918189,
+        "lastModified": 1689063170,
-        "narHash": "sha256-f8ZlJ67LgEUDnN7ZsAyd1/Fyby1VdOXWg4XY/irSGrQ=",
+        "narHash": "sha256-3UZHKrY2WYFlHFRFzvajea4yGLmyWgNhXbAyA24eaMY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "408c0e8c15a1c9cf5c3226931b6f283c9867c484",
+        "rev": "065b7e7ba66d5822d7ddd94b5d9553bea93accef",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1688868408,
+        "lastModified": 1688939073,
-        "narHash": "sha256-RR9N5XTAxSBhK8MCvLq9uxfdkd7etC//seVXldy0k48=",
+        "narHash": "sha256-jYhYjeK5s6k8QS3i+ovq9VZqBJaWbxm7awTKNhHL9d0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "510d721ce097150ae3b80f84b04b13b039186571",
+        "rev": "8df7a67abaf8aefc8a2839e0b48f92fdcf69a38b",
         "type": "github"
       },
       "original": {

outputs.nix

@@ -64,15 +64,15 @@
       ./modules/common/printing.nix
       ./modules/packages/linux-desktop.nix
       ./modules/packages/linux.nix
-      ./services/netdata/default.nix
+      ./modules/services/netdata/default.nix
     ];
   in {
     hephaestus = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules =
         [
-          ./machines/hephaestus/configuration.nix
+          ./modules/machines/hephaestus/configuration.nix
-          ./machines/hephaestus/hardware.nix
+          ./modules/machines/hephaestus/hardware.nix
         ]
         ++ defaultModules
         ++ desktopLinuxModules;
@@ -81,39 +81,38 @@
       system = "x86_64-linux";
       modules =
         [
-          ./machines/aether/configuration.nix
+          ./modules/machines/aether/configuration.nix
           nix-ld.nixosModules.nix-ld
         ]
         ++ defaultModules;
     };
+  };
 
-    darwinConfigurations = {
+  darwinConfigurations = {
-      zelus = darwin.lib.darwinSystem {
+    zelus = darwin.lib.darwinSystem {
-        system = "aarch64-darwin";
+      system = "aarch64-darwin";
 
-        modules = [
+      modules = [
-          home-manager.darwinModules.home-manager
+        home-manager.darwinModules.home-manager
-          ./modules/common/darwin.nix
+        ./modules/common/darwin.nix
-          ./modules/packages/common.nix
+        ./modules/packages/common.nix
+        ./modules/machines/zelus/configuration.nix
+        ./modules/darwin/default.nix
+        ./modules/upgrade-diff.nix
 
-          ./machines/zelus/configuration.nix
+        ({config, ...}: {
-
+          config = {
-          ./modules/darwin/default.nix
+            nixpkgs.overlays = [
-
+              (import ./modules/overlays)
-          ({config, ...}: {
+            ];
-            config = {
+            home-manager = {
-              nixpkgs.overlays = [
+              useGlobalPkgs = true;
-                (import ./modules/overlays)
+              useUserPackages = true;
-              ];
+              users."dave.gallant".imports = [./home/default.nix];
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                users."dave.gallant".imports = [./home/default.nix];
-              };
             };
-          })
+          };
-        ];
+        })
-      };
+      ];
     };
   };
 }