summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--flake.lock112
-rw-r--r--flake.nix54
-rw-r--r--shell.nix1
-rw-r--r--system/settings/configuration/nix.nix4
4 files changed, 14 insertions, 157 deletions
diff --git a/flake.lock b/flake.lock
index e9ef843b..df914e6b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -45,26 +45,6 @@
         "type": "github"
       }
     },
-    "deploy-rs": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1711973905,
-        "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "type": "github"
-      }
-    },
     "emacs-overlay": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -103,25 +83,9 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -139,7 +103,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -260,16 +224,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702272962,
-        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
+        "lastModified": 1715266358,
+        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
+        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -324,22 +288,6 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1715266358,
-        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
         "lastModified": 1715447595,
         "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
         "owner": "NixOS",
@@ -354,7 +302,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1710765496,
         "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
@@ -372,13 +320,13 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "flake-utils": [
           "searchix",
           "flake-utils"
         ],
         "gitignore": "gitignore",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
@@ -398,22 +346,21 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "deploy-rs": "deploy-rs",
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager_2",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-small": "nixpkgs-small",
         "searchix": "searchix",
         "secrets": "secrets",
-        "utils": "utils_2"
+        "utils": "utils"
       }
     },
     "searchix": {
       "inputs": {
         "flake-utils": "flake-utils_2",
         "gomod2nix": "gomod2nix",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "simple-css": "simple-css"
       },
@@ -519,42 +466,9 @@
         "type": "github"
       }
     },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "utils": {
       "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_2": {
-      "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1710146030,
diff --git a/flake.nix b/flake.nix
index 7ff3da77..67f09c25 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,6 @@
     utils.url = "github:numtide/flake-utils";
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
-    deploy-rs.url = "github:serokell/deploy-rs";
     searchix.url = "git+https://git.alanpearce.eu/searchix";
   };
 
@@ -28,7 +27,6 @@
     , secrets
     , emacs-overlay
     , agenix
-    , deploy-rs
     , searchix
     , ...
     }:
@@ -89,55 +87,5 @@
           (secrets + "/default.nix")
         ];
       };
-
-      checks = builtins.mapAttrs
-        (system: deployLib:
-          deployLib.deployChecks self.deploy)
-        deploy-rs.lib;
-
-      deploy = {
-        remoteBuild = true;
-        nodes.linde = {
-          hostname = "linde";
-          profiles.system = {
-            user = "root";
-            interactiveSudo = true;
-            path = deploy-rs.lib.${utils.lib.system.aarch64-linux}.activate.nixos
-              self.nixosConfigurations.linde;
-          };
-          profiles.alan = {
-            user = "alan";
-            path = deploy-rs.lib.${utils.lib.system.aarch64-linux}.activate.home-manager
-              self.homeConfigurations."alan@linde";
-          };
-        };
-        nodes.nanopi = {
-          hostname = "nanopi";
-          profiles.system = {
-            user = "root";
-            interactiveSudo = true;
-            path = deploy-rs.lib.${utils.lib.system.aarch64-linux}.activate.nixos
-              self.nixosConfigurations.nanopi;
-          };
-          profiles.alan = {
-            user = "alan";
-            path = deploy-rs.lib.${utils.lib.system.aarch64-linux}.activate.home-manager
-              self.homeConfigurations."alan@nanopi";
-          };
-        };
-      };
-    } // utils.lib.eachDefaultSystem (system:
-    let
-      pkgs = import nixpkgs { inherit system; };
-    in
-    {
-      devShells = {
-        default = pkgs.mkShell {
-          packages = [
-            deploy-rs.packages.${system}.default
-            agenix.packages.${system}.default
-          ];
-        };
-      };
-    });
+    };
 }
diff --git a/shell.nix b/shell.nix
index 37aac657..7714e111 100644
--- a/shell.nix
+++ b/shell.nix
@@ -14,7 +14,6 @@ pkgs.mkShell
 
   buildInputs = with pkgs; [
     npins
-    deploy-rs
     (pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { })
     (import sources.home-manager { inherit pkgs; }).home-manager
   ];
diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix
index 6e3cb061..b28fde18 100644
--- a/system/settings/configuration/nix.nix
+++ b/system/settings/configuration/nix.nix
@@ -14,15 +14,11 @@
       warn-dirty = false;
       substituters = [
         "https://nix-community.cachix.org"
-        "https://deploy-rs.cachix.org"
         "https://binarycache.alanpearce.eu"
-        "https://deploy-rs.cachix.org"
       ];
 
       trusted-public-keys = [
-        "deploy-rs.cachix.org-1:xfNobmiwF/vzvK1gpfediPwpdIP0rpDV2rYqx40zdSI="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "deploy-rs.cachix.org-1:xfNobmiwF/vzvK1gpfediPwpdIP0rpDV2rYqx40zdSI="
         "binarycache.alanpearce.eu:ZwqO3XMuajPictjwih8OY2+RXnOKpjZEZFHJjGSxAI4="
       ];
     };