From 0a4f535117fff7faeadab4513f5251e809b8cf0d Mon Sep 17 00:00:00 2001
From: sajenim <its.jassy@pm.me>
Date: Sun, 21 Jan 2024 22:32:25 +0800
Subject: [PATCH] refactor imports

---
 nixos/common/global/age.nix            | 7 ++++++-
 nixos/common/global/default.nix        | 3 ---
 nixos/common/users/sajenim/default.nix | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/common/global/age.nix b/nixos/common/global/age.nix
index 1c34019..a81202e 100644
--- a/nixos/common/global/age.nix
+++ b/nixos/common/global/age.nix
@@ -1,8 +1,13 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 let
   hostname = config.networking.hostName;
 in
 {
+  imports = [
+    inputs.agenix.nixosModules.default
+    inputs.agenix-rekey.nixosModules.default
+  ];
+
   environment.systemPackages = with pkgs; [
     agenix-rekey
   ];
diff --git a/nixos/common/global/default.nix b/nixos/common/global/default.nix
index f6382be..a4bd0fd 100644
--- a/nixos/common/global/default.nix
+++ b/nixos/common/global/default.nix
@@ -2,9 +2,6 @@
 
 {
   imports = [
-    inputs.home-manager.nixosModules.home-manager
-    inputs.agenix.nixosModules.default
-    inputs.agenix-rekey.nixosModules.default
     ./age.nix
     ./env.nix
     ./nix.nix
diff --git a/nixos/common/users/sajenim/default.nix b/nixos/common/users/sajenim/default.nix
index 202557e..00ee6fd 100644
--- a/nixos/common/users/sajenim/default.nix
+++ b/nixos/common/users/sajenim/default.nix
@@ -1,6 +1,9 @@
 { inputs, outputs, pkgs, config, ... }:
 
 {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+  ];
   users.users.sajenim = {
       isNormalUser = true;
       extraGroups = [ "audio" "docker" "networkmanager" "wheel" ];