From 0c52e62c4e6c479bffb57416eb03f3080413f598 Mon Sep 17 00:00:00 2001
From: Xe <me@christine.website>
Date: Tue, 21 Dec 2021 18:02:15 -0500
Subject: [PATCH] simplify?

Signed-off-by: Xe <me@christine.website>
---
 flake.lock | 42 +++++++++++++++++++++++++++++++++++++-----
 flake.nix  | 26 ++++++++++++++------------
 2 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8f1ac04..e0ba747 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,9 +1,27 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1638837456,
+        "narHash": "sha256-WHLOxthAGx/wXw3QUa/lFE3mr6cQtnXfFYZ0DNyYwt4=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "57806bf7e340f4cae705c91748d4fdf8519293a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
     "deploy-rs": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "utils": "utils"
       },
       "locked": {
@@ -38,7 +56,7 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1640115895,
@@ -55,6 +73,19 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1618628710,
+        "narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=",
+        "path": "/nix/store/z1rf17q0fxj935cmplzys4gg6nxj1as0-source",
+        "rev": "7919518f0235106d050c77837df5e338fb94de5d",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1632086102,
         "narHash": "sha256-wVTcf0UclFS+zHtfPToB13jIO7n0U9N50MuRbPjQViE=",
@@ -70,7 +101,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1640090545,
         "narHash": "sha256-6qiF46uBGoSQmjDTFl8ilT+d1DuK39IRHlj0jE5gqZE=",
@@ -84,7 +115,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1640053112,
         "narHash": "sha256-7C0UQssCdAMyCNSv8szLJfZ5xYMBr9mh27zYUmo8wHQ=",
@@ -102,9 +133,10 @@
     },
     "root": {
       "inputs": {
+        "agenix": "agenix",
         "deploy-rs": "deploy-rs",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "utils": "utils_2"
       }
     },
diff --git a/flake.nix b/flake.nix
index 7a38ce9..dc89780 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,27 +2,29 @@
   description = "My deploy-rs config for logos";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager";
+    agenix.url = "github:ryantm/agenix";
     deploy-rs.url = "github:serokell/deploy-rs";
+    home-manager.url = "github:nix-community/home-manager";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, deploy-rs, home-manager, utils, ... }:
-    let pkgs = nixpkgs.legacyPackages."x86_64-linux";
+  outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, ... }:
+    let
+      pkgs = nixpkgs.legacyPackages."x86_64-linux";
+      mkSystem = extraModules:
+        nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules =
+            [ agenix.nixosModules.age home-manager.nixosModules.home-manager ]
+            ++ extraModules;
+        };
     in {
       devShell.x86_64-linux = pkgs.mkShell {
         buildInputs = [ deploy-rs.packages.x86_64-linux.deploy-rs ];
       };
 
-      nixosConfigurations.logos = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          home-manager.nixosModules.home-manager
-          ./hosts/logos
-          ./hardware/alrest
-        ];
-      };
+      nixosConfigurations.logos = mkSystem [ ./hosts/logos ./hardware/alrest ];
 
       deploy.nodes.logos = {
         hostname = "192.168.2.35";