icecube config and new colmena

flake.nix

@@ -9,7 +9,6 @@
     };
 
     # deployment
-    colmena.url = "github:zhaofengli/colmena";
     deploy-rs.url = "github:serokell/deploy-rs";
 
     # websites
@@ -75,7 +74,6 @@
     {
       self,
       nixpkgs,
-      colmena,
       flake-utils,
       sops-nix,
       vpn-confinement,
@@ -131,6 +129,21 @@
         ];
         specialArgs = specialArgsForSystem system;
       };
+      nixosConfigurations.ragdoll = home-manager.lib.homeManagerConfiguration (
+        let
+          system = "x86_64-linux";
+        in
+        {
+          modules = [
+            inputs.home-manager.nixosModules.default
+            { home-manager.extraSpecialArgs = specialArgsForSystem system; }
+
+            ./hosts/ragdoll/configuration.nix
+            ./default-machine-config.nix
+          ];
+          pkgs = pkgsForSystem system;
+        }
+      );
 
       deploy.nodes.fili = {
         hostname = "fili";
@@ -152,56 +165,13 @@
         };
       };
 
-      colmenaHive = colmena.lib.makeHive self.outputs.colmena;
-
-      colmena = {
-        meta =
-          let
-            system = "x86_64-linux";
-          in
-          {
-            nixpkgs = pkgsForSystem system;
-            specialArgs = {
-              flakes = inputs;
-              inherit inputs;
-              inherit (inputs.secrets.packages.${system}) secrets;
-            };
-          };
-
-        fili = {
-          deployment = {
-            targetHost = "donsz.nl";
-            targetPort = 22;
-            replaceUnknownProfiles = false;
-            tags = [ "server" ];
-            # buildOnTarget = true;
-            targetUser = "jana";
-          };
-
-          imports = [
-            home-manager.nixosModules.home-manager
-            ./hosts/fili/configuration.nix
-            ./users
-            ./default-machine-config.nix
-            sops-nix.nixosModules.sops
-            vpn-confinement.nixosModules.default
-          ];
-        };
-
-        kili = {
-          deployment = {
-            allowLocalDeployment = true;
-            targetHost = null;
-            replaceUnknownProfiles = false;
-            tags = [ "laptop" ];
-            # buildOnTarget = true;
-            targetUser = "jana";
-          };
-          imports = [
-            home-manager.nixosModules.home-manager
-            ./hosts/kili/configuration.nix
-            ./users
-          ];
+      deploy.nodes.ragdoll = {
+        hostname = "ragdoll";
+        fastConnection = true;
+        profiles.system = {
+          user = "jana";
+          path = deploy-rs.lib.x86_64-linux.activate.home-manager self.nixosConfigurations.ragdoll;
+          sshUser = "jana";
         };
       };
     }
@@ -214,12 +184,18 @@
         devShells.default = pkgs.mkShell {
           buildInputs = with pkgs; [
             lix
-            colmena.packages.${system}.colmena
             (pkgs.writeShellScriptBin "apply" ''
-              colmena apply --no-substitute
-            '')
-            (pkgs.writeShellScriptBin "apply-local" ''
-              colmena apply-local --sudo
+              set -e
+              if [ $# -eq 0 ]
+                then
+                    deploy
+              elif [ $# -eq 1 ]
+                then
+                  deploy ".#$@"
+              else
+                  echo "too many parameters"
+                  exit 1
+              fi
             '')
             deploy-rs.packages.${system}.deploy-rs
           ];