Update

takeokunn · Oct 21, 2024 · 04f67ef · 04f67ef
1 parent f87bdf9
commit 04f67ef
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 47 deletions.
diff --git a/flake.nix b/flake.nix
@@ -37,8 +37,14 @@
   };
 
   outputs = inputs: {
-    darwinConfigurations = (import ./hosts/OPL2212-2 { inherit inputs; });
-    nixosConfigurations = (import ./hosts/X13Gen2 { inherit inputs; });
-    nixOnDroidConfigurations = (import ./hosts/OPPO-A79 { inherit inputs; });
+    darwinConfigurations = {
+      OPL2212-2 = import ./hosts/OPL2212-2 { inherit inputs; };
+    };
+    nixosConfigurations = {
+      X13Gen2 = import ./hosts/X13Gen2 { inherit inputs; };
+    };
+    nixOnDroidConfigurations = {
+      OPPO-A79 = import ./hosts/OPPO-A79 { inherit inputs; };
+    };
   };
 }
diff --git a/hosts/OPL2212-2/default.nix b/hosts/OPL2212-2/default.nix
@@ -6,23 +6,21 @@ let
   configuration = { ... }: {
     users.users.${username}.home = "/Users/${username}";
   };
-in {
-  OPL2212-2 = nix-darwin.lib.darwinSystem {
-    inherit system;
-    inherit (inputs.nixpkgs) lib;
-    specialArgs = { inherit username; };
-    modules = [
-      configuration
-      ../../nix-darwin
-      home-manager.darwinModules.home-manager
-      {
-        home-manager.useUserPackages = true;
-        home-manager.users."${username}" =
-          import ../../home-manager/advanced.nix {
-            inherit system;
-            inherit (inputs) nixpkgs emacs-overlay org-babel;
-          };
-      }
-    ];
-  };
+in nix-darwin.lib.darwinSystem {
+  inherit system;
+  inherit (inputs.nixpkgs) lib;
+  specialArgs = { inherit username; };
+  modules = [
+    configuration
+    ../../nix-darwin
+    home-manager.darwinModules.home-manager
+    {
+      home-manager.useUserPackages = true;
+      home-manager.users."${username}" =
+        import ../../home-manager/advanced.nix {
+          inherit system;
+          inherit (inputs) nixpkgs emacs-overlay org-babel;
+        };
+    }
+  ];
 }
diff --git a/hosts/OPPO-A79/default.nix b/hosts/OPPO-A79/default.nix
@@ -2,10 +2,8 @@
 let
   inherit (inputs) nixpkgs nix-on-droid;
   system = "aarch64-linux";
-in {
-  OPPO-A79 = nix-on-droid.lib.nixOnDroidConfiguration {
-    modules = [ ../../nix-on-droid ];
-    pkgs = import nixpkgs { inherit system; };
-    extraSpecialArgs = { inherit nixpkgs system; };
-  };
+in nix-on-droid.lib.nixOnDroidConfiguration {
+  modules = [ ../../nix-on-droid ];
+  pkgs = import nixpkgs { inherit system; };
+  extraSpecialArgs = { inherit nixpkgs system; };
 }
diff --git a/hosts/X13Gen2/default.nix b/hosts/X13Gen2/default.nix
@@ -3,23 +3,21 @@ let
   inherit (inputs) nixpkgs xremap sops-nix home-manager;
   username = "take";
   system = "x86_64-linux";
-in {
-  X13Gen2 = nixpkgs.lib.nixosSystem {
-    inherit system;
-    specialArgs = { inherit username xremap; };
-    modules = [
-      ../../nixos
-      ./hardware-configuration.nix
-      sops-nix.nixosModules.sops
-      home-manager.nixosModules.home-manager
-      {
-        home-manager.useUserPackages = true;
-        home-manager.users."${username}" =
-          import ../../home-manager/advanced.nix {
-            inherit system;
-            inherit (inputs) nixpkgs org-babel emacs-overlay;
-          };
-      }
-    ];
-  };
+in nixpkgs.lib.nixosSystem {
+  inherit system;
+  specialArgs = { inherit username xremap; };
+  modules = [
+    ../../nixos
+    ./hardware-configuration.nix
+    sops-nix.nixosModules.sops
+    home-manager.nixosModules.home-manager
+    {
+      home-manager.useUserPackages = true;
+      home-manager.users."${username}" =
+        import ../../home-manager/advanced.nix {
+          inherit system;
+          inherit (inputs) nixpkgs org-babel emacs-overlay;
+        };
+    }
+  ];
 }