1 files changed, 20 insertions, 43 deletions

diff --git a/flake.nix b/flake.nix
index db038c2..7211c98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Nixos server config";
+  description = "NixOS server config";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05-small";
@@ -19,14 +19,6 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
-    deploy-rs = {
-      url = "github:serokell/deploy-rs";
-      inputs = {
-        flake-compat.follows = "flake-compat";
-        nixpkgs.follows = "nixpkgs";
-        utils.follows = "flake-utils";
-      };
-    };
 
     # inputs for following
     systems = {
@@ -62,13 +54,10 @@
         home-manager.follows = "home-manager";
       };
     };
-    back = {
-      url = "git+https://git.foss-syndicate.org/vhack.eu/git_bug/back?ref=prime";
+    turtle = {
+      url = "git+https://git.foss-syndicate.org/bpeetz/forks/atuin?ref=main";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        systems.follows = "systems";
-        flake-utils.follows = "flake-utils";
-        treefmt-nix.follows = "treefmt-nix";
       };
     };
     disko = {
@@ -108,10 +97,9 @@
     nixpkgs-unstable,
     library,
     treefmt-nix,
-    deploy-rs,
     # modules
     agenix,
-    back,
+    turtle,
     disko,
     impermanence,
     simple-nixos-mailserver,
@@ -122,30 +110,24 @@
     nixos-lib = import (nixpkgs + "/nixos/lib") {};
     pkgs = nixpkgs.legacyPackages.${system};
     pkgsUnstable = nixpkgs-unstable.legacyPackages.${system};
-    deployPackage =
-      (import nixpkgs {
-        inherit system;
-        overlays = [
-          deploy-rs.overlays.default
-          (self: super: {
-            deploy-rs = {
-              inherit (pkgs) deploy-rs;
-              inherit (super.deploy-rs) lib;
-            };
-          })
-        ];
-      })
-      .deploy-rs;
 
     specialArgs =
       attrs
       // {
-        inherit pkgsUnstable vhackPackages nixpkgs-unstable nixos-lib extraModules nixLib;
+        inherit
+          pkgsUnstable
+          vhackPackages
+          nixpkgs-unstable
+          nixos-lib
+          extraModules
+          nixLib
+          turtle
+          ;
       };
 
     extraModules = [
       agenix.nixosModules.default
-      back.nixosModules.default
+      turtle.nixosModules.default
       disko.nixosModules.default
       impermanence.nixosModules.impermanence
       simple-nixos-mailserver.nixosModule
@@ -155,18 +137,15 @@
     tests = import ./tests {inherit pkgs specialArgs nixLib;};
     vhackPackages = import ./pkgs {inherit pkgs nixLib pkgsUnstable;};
 
-    hosts = import ./hosts {inherit pkgs nixLib nixpkgs specialArgs extraModules deployPackage;};
+    hosts = import ./hosts {inherit pkgs nixLib nixpkgs specialArgs extraModules;};
 
     inherit (library) nixLib;
     treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;};
   in {
-    checks."${system}" =
-      nixLib.warnMerge (nixLib.warnMerge tests {
-        formatting =
-          treefmtEval.config.build.check self;
-      } "the flake checks and formatting")
-      (deployPackage.lib.deployChecks self.deploy)
-      "the flake checks and deploy-rs";
+    checks."${system}" = nixLib.warnMerge tests {
+      formatting =
+        treefmtEval.config.build.check self;
+    } "the flake checks and formatting";
 
     packages."${system}" = vhackPackages;
     formatter."${system}" = treefmtEval.config.build.wrapper;
@@ -174,8 +153,6 @@
     devShells."${system}" = {
       default = pkgs.mkShell {
         packages = [
-          pkgs.deploy-rs
-
           pkgs.git-bug
 
           # Used to update the stalwart-mail spamfilter
@@ -187,6 +164,6 @@
       };
     };
 
-    inherit (hosts) nixosConfigurations deploy;
+    inherit (hosts) nixosConfigurations;
   };
 }