Begin Dendritic rewrite

This commit is contained in:
2026-03-06 19:05:37 -06:00
parent eb5b08c8f0
commit f656be3dfb
7 changed files with 16 additions and 23 deletions

View File

@@ -1,6 +1,6 @@
{ ... }: { { inputs, ... }: {
flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: let flake.homeModules.nathan = { config, lib, pkgs, ... }: let
system = "x86_64-linux"; system = "x86_64-linux";

View File

@@ -1,6 +1,6 @@
{ ... }: { { inputs, ... }: {
flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: { flake.homeModules.nathan = { config, lib, pkgs, ... }: {
config = { config = {

View File

@@ -1,6 +1,6 @@
{ ... }: { { inputs, ... }: {
flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: { flake.homeModules.nathan = { config, lib, pkgs, ... }: {
options.homeconfig.firefox.enable = lib.options.mkOption { options.homeconfig.firefox.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;

View File

@@ -1,6 +1,6 @@
{ ... }: { { inputs, ... }: {
flake.homeModules.nathan = { config, lib, inputs, ... }: { flake.homeModules.nathan = { config, lib, ... }: {
options.homeconfig.nh.enable = lib.options.mkOption { options.homeconfig.nh.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;

View File

@@ -1,6 +1,6 @@
{ ... }: { { inputs, ... }: {
flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: { flake.homeModules.nathan = { config, lib, pkgs, ... }: {
options.homeconfig.wal.enable = lib.options.mkOption { options.homeconfig.wal.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;

View File

@@ -1,6 +1,6 @@
{ ... }: { { self, ... }: {
flake.nixosModules.default = { config, lib, pkgs, ... } @ inputs: { flake.nixosModules.default = { config, lib, pkgs, ... }: {
options.sysconfig = with lib; { options.sysconfig = with lib; {
@@ -92,7 +92,7 @@
}; };
config = lib.mkIf (config.sysconfig.host != "android") { config = {
users.users = builtins.mapAttrs (x: y: let users.users = builtins.mapAttrs (x: y: let
cfg = config.sysconfig.users.${x}; cfg = config.sysconfig.users.${x};
in { in {
@@ -110,7 +110,6 @@
home-manager = { home-manager = {
backupFileExtension = "backup"; backupFileExtension = "backup";
extraSpecialArgs = { inherit inputs; };
useUserPackages = true; useUserPackages = true;
sharedModules = []; sharedModules = [];
users = builtins.listToAttrs (builtins.map users = builtins.listToAttrs (builtins.map
@@ -118,13 +117,7 @@
name = x; name = x;
value = (lib.mkMerge ([ value = (lib.mkMerge ([
(if let (if self.homeModules ? ${x} then self.homeModules.${x} else {})
dir = builtins.readDir ./.;
in dir ? ${x} && dir.${x} == "directory" then
import ../../homes/${x}/home-manager
else {})
(if inputs ? ${x} then inputs.${x} else {})
] ++ config.sysconfig.users.${x}.home-manager.extraModules)); ] ++ config.sysconfig.users.${x}.home-manager.extraModules));
}) })