1 files changed, 16 insertions, 20 deletions

diff --git a/flake.nix b/flake.nix
index 8e33ca5..525dfcd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,7 @@
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     nix-darwin = {
       url = "path:/Users/ivi/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -26,14 +27,12 @@
     home-manager,
     sops-nix,
     deploy-rs,
-    nix-darwin,
     ...
   }: let
     lib =
-      ((nixpkgs.lib.extend
+      (nixpkgs.lib.extend
         (_: _: home-manager.lib)).extend
-        (_: _: nix-darwin.lib)).extend
-        (import ./lib inputs);
+          (import ./lib inputs);
   in
     with lib; rec {
       inherit lib;
@@ -102,38 +101,35 @@
           };
         };
 
-        vm-aarch64 = {
-          system = "aarch64-linux";
+        work = {
+          system = "aarch64-darwin";
           modules =
             [
-              ./machines/vm-aarch64.nix
+              ./machines/work.nix
             ]
-            ++ modulesIn ./profiles/core
-            ++ modulesIn ./profiles/graphical;
+            ++ modulesIn ./profiles/core;
           opts = {
-            isStation = true;
+            isDarwin = true;
             syncthing = {
               enable = true;
-              id = "LDZVZ6H-KO3BKC6-FMLZOND-MKXI4DF-SNT27OT-Q5KMN2M-A2DYFNQ-3BWUYA6";
+              id = "GR5MHK2-HDCFX4I-Y7JYKDN-EFTQFG6-24CXSHB-M5C6R3G-2GWX5ED-VEPAQA7";
             };
           };
         };
-      };
 
-      darwinConfigurations = mkSystems {
-        work = {
-          system = "aarch64-darwin";
+        vm-aarch64 = {
+          system = "aarch64-linux";
           modules =
             [
-              ./machines/work.nix
+              ./machines/vm-aarch64.nix
             ]
-            ++ modulesIn ./profiles/core;
+            ++ modulesIn ./profiles/core
+            ++ modulesIn ./profiles/graphical;
           opts = {
-            isDarwin = true;
-            configPath = "/Users/${my.username}/nix-config";
+            isStation = true;
             syncthing = {
               enable = true;
-              id = "GR5MHK2-HDCFX4I-Y7JYKDN-EFTQFG6-24CXSHB-M5C6R3G-2GWX5ED-VEPAQA7";
+              id = "LDZVZ6H-KO3BKC6-FMLZOND-MKXI4DF-SNT27OT-Q5KMN2M-A2DYFNQ-3BWUYA6";
             };
           };
         };