From 8e933e0876034276f6e7a23c42a4c84ef7198cfd Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Thu, 5 Aug 2021 21:56:49 +0100
Subject: [PATCH] trusted import refactor. state version in base.

---
 config/users/kat/base/default.nix | 2 ++
 config/users/kat/default.nix      | 8 ++++++--
 config/users/kat/nixos.nix        | 5 -----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/users/kat/base/default.nix b/config/users/kat/base/default.nix
index da44b006..810c3282 100644
--- a/config/users/kat/base/default.nix
+++ b/config/users/kat/base/default.nix
@@ -16,4 +16,6 @@
     ./rink.nix
     ./secrets.nix
   ];
+
+  home.stateVersion = "20.09";
 }
diff --git a/config/users/kat/default.nix b/config/users/kat/default.nix
index 2bc2319c..955dd0e9 100644
--- a/config/users/kat/default.nix
+++ b/config/users/kat/default.nix
@@ -1,5 +1,9 @@
 let katUser = { lib }: let
-  userImport = profile: { config, ... }: {
+  trustedImport = {
+    config.home-manager.users.kat = {
+      imports = lib.optional (builtins.pathExists ../../trusted/users/kat) (import ../../trusted/users/kat);
+    };
+  }; userImport = profile: { config, ... }: {
   config.home-manager.users.kat = {
     imports = [
       (./. + "/${profile}")
@@ -13,7 +17,7 @@ let katUser = { lib }: let
   "personal"
 ]; userProfiles = with userProfiles;
   lib.genAttrs profileNames userImport // {
-  base = { imports = [ ./nixos.nix (userImport "base") ];  };
+  base = { imports = [ ./nixos.nix (userImport "base") trustedImport ]; };
   server = { imports = [ personal ]; };
   guiFull = { imports = [ gui sway dev media personal ]; };
 }; in userProfiles;
diff --git a/config/users/kat/nixos.nix b/config/users/kat/nixos.nix
index 018cb1b0..0857d707 100644
--- a/config/users/kat/nixos.nix
+++ b/config/users/kat/nixos.nix
@@ -1,11 +1,6 @@
 { config, pkgs, lib, ... }:
 
 {
-  home-manager.users.kat = {
-    imports = lib.optional (builtins.pathExists ../../trusted/users/kat) (import ../../trusted/users/kat);
-    home.stateVersion = "20.09";
-  };
-
   users.users.kat = {
     uid = 1000;
     isNormalUser = true;