From 4bcfbd826b0d2fc46ca78e3c779fc6522f4abc9b Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Fri, 27 Dec 2024 21:12:09 -0800
Subject: [PATCH] chore: migrate callisto configuration

---
 reference/hosts/callisto/configuration.nix | 13 -------------
 reference/hosts/callisto/default.nix       |  1 -
 reference/modules/default.nix              |  2 ++
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/reference/hosts/callisto/configuration.nix b/reference/hosts/callisto/configuration.nix
index 83b96ba..e480596 100755
--- a/reference/hosts/callisto/configuration.nix
+++ b/reference/hosts/callisto/configuration.nix
@@ -33,13 +33,6 @@
     };
   };
 
-  users.users.youwen = {
-    isNormalUser = true;
-    description = "Youwen Wu";
-    extraGroups = [ "wheel" ];
-    shell = pkgs.fish;
-  };
-
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = false;
@@ -60,12 +53,6 @@
     inputs.vesktop-bin.overlays.default
   ];
 
-  nix.settings = {
-    trusted-users = [
-      "youwen"
-    ];
-  };
-
   services.udev.extraRules = ''
     KERNEL=="macsmc-battery", SUBSYSTEM=="power_supply", ATTR{charge_control_end_threshold}="90", ATTR{charge_control_start_threshold}="85"
   '';
diff --git a/reference/hosts/callisto/default.nix b/reference/hosts/callisto/default.nix
index f72086c..df38136 100644
--- a/reference/hosts/callisto/default.nix
+++ b/reference/hosts/callisto/default.nix
@@ -8,7 +8,6 @@
     [
       ./configuration.nix
       ../../modules
-      ../../secrets
       self.nixosModules.liminalOS
       {
         home-manager.users.youwen = {
diff --git a/reference/modules/default.nix b/reference/modules/default.nix
index d245f7e..9fc5790 100644
--- a/reference/modules/default.nix
+++ b/reference/modules/default.nix
@@ -8,4 +8,6 @@
   nix.extraOptions = ''
     !include ${config.age.secrets.nix_config_github_pat.path}
   '';
+
+  nix.settings.trusted-users = [ "youwen" ];
 }