rewrite users

users/default.nix

@@ -0,0 +1,9 @@
+{
+  flake = {
+    nixosModules = rec {
+      root = import ./root;
+      hensoko = import ./hensoko;
+      iot = import ./iot;
+    };
+  };
+}

users/hensoko/browser.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  self,
   ...
 }:
 with lib; let

users/hensoko/default.nix

@@ -1,4 +1,4 @@
-{ config, hmUsers, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 let
   psCfg = config.pub-solar;
 in
@@ -13,8 +13,6 @@ in
   ];
 
   config = {
-    home-manager.users = { inherit (hmUsers) hensoko; };
-
     pub-solar = {
       user = {
         name = "hensoko";

users/hensoko/email.nix

@@ -1,11 +1,18 @@
-{ config, pkgs, lib, self, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  flake,
+  ...
+}:
+
 with lib;
 let
   psCfg = config.pub-solar;
 in
 {
   age.secrets.email_gssws_password = {
-    file = "${self}/secrets/email_gssws_password.age";
+    file = "${flake.self}/secrets/email_gssws_password.age";
     owner = "hensoko";
   };
 

users/hensoko/gammastep.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, self, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib;
 let
   psCfg = config.pub-solar;

users/hensoko/home.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  self,
   ...
 }:
 with lib; let
@@ -34,7 +33,6 @@ in {
 
     home.packages = with pkgs; [
       nix-output-monitor
-      obsidian
       btop
       dig
       fping

users/hensoko/htop.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, self, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with pkgs lib;
 let
   psCfg = config.pub-solar;

users/hensoko/ssh.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  self,
   ...
 }:
 with lib; let

users/iot/default.nix

@@ -1,4 +1,4 @@
-{ config, hmUsers, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 let
   psCfg = config.pub-solar;
 in
@@ -8,8 +8,6 @@ in
   ];
 
   config = {
-    home-manager.users = { inherit (hmUsers) iot; };
-
     pub-solar = {
       core.lite = true;
       user = {

users/iot/home.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, self, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib;
 let
   psCfg = config.pub-solar;

users/pub-solar/default.nix

@@ -1,6 +1,5 @@
-{hmUsers, ...}: {
-  home-manager.users = {inherit (hmUsers) pub-solar;};
-
+{ config, ... }:
+{
   pub-solar = {
     # These are your personal settings
     # The only required settings are `name` and `password`,