From 0cf06f8541ef62a5a15f6b51e92c4ed96752d9b4 Mon Sep 17 00:00:00 2001
From: William <baduhai@proton.me>
Date: Thu, 16 Oct 2025 15:30:01 -0300
Subject: [PATCH] som more deploy-rs mods

---
 deploy.nix                   | 15 +++++++++------
 devShells.nix                |  4 +++-
 hosts/modules/common/nix.nix | 12 +++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/deploy.nix b/deploy.nix
index 865e4c9..2e69377 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -1,10 +1,11 @@
 { inputs, self, ... }:
 {
   flake.deploy.nodes = {
+    remoteBuild = true;
     alexandria = {
       hostname = "alexandria";
       profiles.system = {
-        sshUser = "root";
+        sshUser = "user";
         path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.alexandria;
         user = "root";
       };
@@ -13,7 +14,7 @@
     trantor = {
       hostname = "trantor";
       profiles.system = {
-        sshUser = "root";
+        sshUser = "user";
         path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.trantor;
         user = "root";
       };
@@ -23,7 +24,7 @@
       hostname = "io";
       profiles = {
         system = {
-          sshUser = "root";
+          sshUser = "user";
           path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.io;
           user = "root";
         };
@@ -35,7 +36,9 @@
       };
     };
   };
-
-  # Optional: Add deploy-rs checks
-  flake.checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
+  perSystem =
+    { system, ... }:
+    {
+      checks = inputs.deploy-rs.lib.${system}.deployChecks self.deploy;
+    };
 }
diff --git a/devShells.nix b/devShells.nix
index 25ee80d..82f97e9 100644
--- a/devShells.nix
+++ b/devShells.nix
@@ -8,8 +8,10 @@
         packages = with pkgs; [
           nil
           nixfmt-rfc-style
-          inputs.deploy-rs.packages.${pkgs.system}.default
         ];
+        shellHook = ''
+          alias deploy='${inputs.deploy-rs.packages.${pkgs.system}.default}/bin/deploy --skip-checks'
+        '';
       };
     };
 }
diff --git a/hosts/modules/common/nix.nix b/hosts/modules/common/nix.nix
index ff0b474..5ef9c4c 100644
--- a/hosts/modules/common/nix.nix
+++ b/hosts/modules/common/nix.nix
@@ -26,13 +26,11 @@
     buildDocs = false;
   };
 
-  services = {
-    nixos-cli = {
-      enable = true;
-      config = {
-        use_nvd = true;
-        ignore_dirty_tree = true;
-      };
+  services.nixos-cli = {
+    enable = true;
+    config = {
+      use_nvd = true;
+      ignore_dirty_tree = true;
     };
   };