From 22419caadd8c4eae9f5859918def1c2d85a333e2 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 19 Aug 2022 14:50:03 +0200
Subject: [PATCH] Several changes:

- Change secret outputs into home-manager and nixos specific
- Specifiy home-manager module import in flake.
---
 flake.lock       | 23 +++++++++++++----------
 flake.nix        | 19 ++++++++++++++++++-
 home/home.nix    | 11 ++++++-----
 hosts/common.nix | 12 ------------
 4 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index b25ba66..44623a8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -34,8 +34,8 @@
     "fonts": {
       "flake": false,
       "locked": {
-        "lastModified": 1649003599,
-        "narHash": "sha256-QtT+ansp3ombpdS2+jNWgZKSqpxhVq3cyrpAKkDzA9Y=",
+        "lastModified": 1651945262,
+        "narHash": "sha256-7r0hq5G/HjK6yVOt18VKaxuJcGM6GPu/jmwbkksJ7LE=",
         "path": "/home/h7x4/git/fonts",
         "type": "path"
       },
@@ -67,11 +67,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1660661643,
-        "narHash": "sha256-WlgPb7KLTZUeY31o9HWhu37pvgA76MKwakaXefkaIB4=",
+        "lastModified": 1660749083,
+        "narHash": "sha256-GHLFMGH+r3OmI4tV0x/RtxN7DkHcH2ZOhK8uzQeSLiY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a82127cea64fd801c5e138ae23dfd444ec1e06d1",
+        "rev": "a55a7db823959cf509d55325201f1864af4574b9",
         "type": "github"
       },
       "original": {
@@ -99,8 +99,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649874484,
-        "narHash": "sha256-B1MVa8TInLhivLJMcEltfzUxYFYkiq+55oteHD4DoO8=",
+        "lastModified": 1660913098,
+        "narHash": "sha256-mm27EyD2mxpPjI6KaznqB62VL7/QRkN31VcipTIxso0=",
+        "ref": "refs/heads/main",
+        "rev": "ff49c477262f5e2f499e13b32cdef3aa6920f9e7",
+        "revCount": 32,
         "type": "git",
         "url": "file:///home/h7x4/git/nix-secrets"
       },
@@ -111,11 +114,11 @@
     },
     "unstable-nixpkgs": {
       "locked": {
-        "lastModified": 1660646295,
-        "narHash": "sha256-V4G+egGRc3elXPTr7QLJ7r7yrYed0areIKDiIAlMLC8=",
+        "lastModified": 1660819943,
+        "narHash": "sha256-TRZV/mlW1eYuojqDC3ueYWj7jsTKXJCtyMLNYX/Ybtw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "762b003329510ea855b4097a37511eb19c7077f0",
+        "rev": "8ea014acc33da95ea56c902229957d8225005163",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d382530..baad91f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,13 +125,30 @@
             ./hosts/common.nix
             ./hosts/${name}/configuration.nix
             "${vscode-server}/default.nix"
+
+            secrets.outputs.nixos-config
+
             {
               config._module.args = {
                 inherit inputs;
                 inherit unstable-pkgs;
-                secrets = secrets.outputs.default;
+                secrets = secrets.outputs.settings;
               };
             }
+
+            ({ config, ... }:
+            {
+              home-manager = {
+                useGlobalPkgs = true;
+                extraSpecialArgs = { inherit inputs; secrets = secrets.outputs.settings; };
+
+                users.h7x4 = import ./home/home.nix {
+                  inherit pkgs;
+                  inherit inputs;
+                  inherit (config) machineVars colors;
+                };
+              };
+            })
           ];
         };
     in {
diff --git a/home/home.nix b/home/home.nix
index 0612d9f..782bd54 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,8 +1,11 @@
-{ pkgs, config, inputs, ... } @ args: let
+{ pkgs, inputs, machineVars, colors, ... } @ args: let
   inherit (pkgs) lib;
   inherit (pkgs.lib) mkForce mkIf optionals;
-  graphics = !config.machineVars.headless;
+  graphics = !machineVars.headless;
 in {
+  inherit machineVars;
+  inherit colors;
+
   imports = [
     ./shellOptions.nix
     ./packages.nix
@@ -23,7 +26,7 @@ in {
 
     ../modules
 
-    inputs.secrets.outputs.nixosModule
+    inputs.secrets.outputs.home-config
   ] ++ optionals graphics [
     ./config/gtk.nix
 
@@ -45,8 +48,6 @@ in {
     ./services/sxhkd.nix
   ];
 
-  inherit (config) machineVars colors;
-
   home = {
     stateVersion = "22.05";
     username = "h7x4";
diff --git a/hosts/common.nix b/hosts/common.nix
index 8ea5916..b0f7b98 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -198,18 +198,6 @@ in {
     };
   };
 
-  home-manager = {
-    useGlobalPkgs = true;
-    extraSpecialArgs = { inherit inputs; inherit secrets; };
-
-    # TODO: figure out why specialArgs isn't accessible from the root home file.
-    users.h7x4 = import ../home/home.nix {
-      inherit pkgs;
-      inherit inputs;
-      inherit config;
-    };
-  };
-
   services = {
     tumbler.enable = !config.machineVars.headless;
     gnome.gnome-keyring.enable = !config.machineVars.headless;