move some stuff out of flake.nix

1 files changed, 4 insertions, 18 deletions

diff --git a/flake.nix b/flake.nix
index 98aac21..5ccb5d4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,48 +17,34 @@
       self,
       nixpkgs,
       unstable,
-      disko,
-      impermanence,
-      agenix,
       ...
     }:
     let
-      pkgsFor = system: import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-        overlays = [
-          agenix.overlays.default
-        ];
-      };
       forAllSystems =
         f:
         nixpkgs.lib.genAttrs
           [ "x86_64-linux" "aarch64-linux" ]
-          (system: f (pkgsFor system));
+          (system: f { inherit system; pkgs = import nixpkgs { inherit system; }; });
     in
     {
       nixosConfigurations.oden = nixpkgs.lib.nixosSystem {
-        pkgs = pkgsFor "x86_64-linux";
         modules = [
           ./configuration.nix
-          disko.nixosModules.disko
-          impermanence.nixosModules.impermanence
-          agenix.nixosModules.default
         ];
         specialArgs = {
           inherit inputs;
         };
       };
-      packages = forAllSystems (pkgs: {
+      packages = forAllSystems ({ system, pkgs }: {
         deploy = pkgs.writeShellScriptBin "deploy" ''
           [ -n "$1" ] && action="$1" || action="switch"
           nixos-rebuild --flake .#oden "$action" --target-host oden --build-host oden --use-remote-sudo
         '';
       });
-      devShells = forAllSystems (pkgs: {
+      devShells = forAllSystems ({ system, pkgs }: {
         default = pkgs.mkShellNoCC {
           packages = [
-            pkgs.agenix
+            inputs.agenix.packages.${system}.agenix
             self.packages.${pkgs.system}.deploy
           ];
         };