From 08f7e3bf4adf1b2448a4ca6f7ebc01a133a117c9 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Tue, 20 Aug 2024 21:14:45 +0800
Subject: [PATCH] fix ci

---
 flake.nix | 162 +++++++++++++++++++++++++++---------------------------
 1 file changed, 82 insertions(+), 80 deletions(-)

diff --git a/flake.nix b/flake.nix
index 61a65a3..eeccc83 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,8 @@
     , nur
     , catppuccin
     , my-nixvim
-    , ... }@inputs:
+    , ...
+    }@inputs:
     let
       nixvimOverlay = (final: prev: {
         nixvim = self.packages.${prev.stdenv.system}.nixvim;
@@ -106,6 +107,7 @@
           pkgs = import nixpkgs { system = "x86_64-linux"; };
           modules = [
             (import ./home).${user}.${host}
+            overlayModule
           ] ++ sharedHmModules;
           extraSpecialArgs = {
             inherit inputs;
@@ -129,79 +131,79 @@
       homeConfigurations = builtins.listToAttrs [ (mkHomeConfiguration "xin" "calcite") ];
 
       colmenaHive = inputs.colmena.lib.makeHive {
-          meta = {
-            nixpkgs = import nixpkgs {
-              system = "x86_64-linux";
-            };
-            specialArgs = {
-              inherit inputs;
-            };
+        meta = {
+          nixpkgs = import nixpkgs {
+            system = "x86_64-linux";
           };
-
-          massicot = { ... }: {
-            deployment.targetHost = "49.13.13.122";
-            deployment.buildOnTarget = true;
-
-            imports = [
-              { nixpkgs.system = "aarch64-linux"; }
-              machines/massicot
-            ] ++ sharedColmenaModules;
-          };
-
-          tok-00 = { ... }: {
-            imports = [
-              machines/dolomite
-            ] ++ sharedColmenaModules;
-            nixpkgs.system = "x86_64-linux";
-            networking.hostName = "tok-00";
-            system.stateVersion = "23.11";
-            deployment = {
-              targetHost = "video01.namely.icu";
-              buildOnTarget = false;
-              tags = [ "proxy" ];
-            };
-          };
-
-          la-00 = { ... }: {
-            imports = [
-              machines/dolomite
-            ] ++ sharedColmenaModules;
-            nixpkgs.system = "x86_64-linux";
-            networking.hostName = "la-00";
-            system.stateVersion = "21.05";
-            deployment = {
-              targetHost = "la-00.video.namely.icu";
-              buildOnTarget = false;
-              tags = [ "proxy" ];
-            };
-          };
-
-          raspite = { ... }: {
-            deployment = {
-              targetHost = "raspite.local";
-              buildOnTarget = false;
-            };
-            nixpkgs.system = "aarch64-linux";
-            imports = [
-              "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-              nixos-hardware.nixosModules.raspberry-pi-4
-              machines/raspite/configuration.nix
-            ] ++ sharedColmenaModules;
-          };
-
-          weilite = { ... }: {
-            imports = [
-              machines/weilite
-            ] ++ sharedColmenaModules;
-            deployment = {
-              targetHost = "weilite.coho-tet.ts.net";
-              targetPort = 22;
-              buildOnTarget = false;
-            };
-            nixpkgs.system = "x86_64-linux";
+          specialArgs = {
+            inherit inputs;
           };
         };
 
+        massicot = { ... }: {
+          deployment.targetHost = "49.13.13.122";
+          deployment.buildOnTarget = true;
+
+          imports = [
+            { nixpkgs.system = "aarch64-linux"; }
+            machines/massicot
+          ] ++ sharedColmenaModules;
+        };
+
+        tok-00 = { ... }: {
+          imports = [
+            machines/dolomite
+          ] ++ sharedColmenaModules;
+          nixpkgs.system = "x86_64-linux";
+          networking.hostName = "tok-00";
+          system.stateVersion = "23.11";
+          deployment = {
+            targetHost = "video01.namely.icu";
+            buildOnTarget = false;
+            tags = [ "proxy" ];
+          };
+        };
+
+        la-00 = { ... }: {
+          imports = [
+            machines/dolomite
+          ] ++ sharedColmenaModules;
+          nixpkgs.system = "x86_64-linux";
+          networking.hostName = "la-00";
+          system.stateVersion = "21.05";
+          deployment = {
+            targetHost = "la-00.video.namely.icu";
+            buildOnTarget = false;
+            tags = [ "proxy" ];
+          };
+        };
+
+        raspite = { ... }: {
+          deployment = {
+            targetHost = "raspite.local";
+            buildOnTarget = false;
+          };
+          nixpkgs.system = "aarch64-linux";
+          imports = [
+            "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
+            nixos-hardware.nixosModules.raspberry-pi-4
+            machines/raspite/configuration.nix
+          ] ++ sharedColmenaModules;
+        };
+
+        weilite = { ... }: {
+          imports = [
+            machines/weilite
+          ] ++ sharedColmenaModules;
+          deployment = {
+            targetHost = "weilite.coho-tet.ts.net";
+            targetPort = 22;
+            buildOnTarget = false;
+          };
+          nixpkgs.system = "x86_64-linux";
+        };
+      };
+
       nixosConfigurations = {
         calcite = mkNixos {
           system = "x86_64-linux";
@@ -214,17 +216,17 @@
       } // self.colmenaHive.nodes;
 
     } // flake-utils.lib.eachDefaultSystem (system:
-      let pkgs = nixpkgs.legacyPackages.${system}; in
-      {
-        devShells = {
-          default = pkgs.mkShell {
-            packages = with pkgs; [ nix git colmena sops nix-output-monitor nil nvd ];
-          };
+    let pkgs = nixpkgs.legacyPackages.${system}; in
+    {
+      devShells = {
+        default = pkgs.mkShell {
+          packages = with pkgs; [ nix git colmena sops nix-output-monitor nil nvd ];
         };
+      };
 
-        packages = {
-          nixvim = my-nixvim.packages.${system}.default;
-        };
-      }
+      packages = {
+        nixvim = my-nixvim.packages.${system}.default;
+      };
+    }
     );
 }