This commit is contained in:
2026-01-05 15:20:14 -06:00
parent ea3c826c63
commit 7c61d646a6
9 changed files with 23 additions and 78 deletions

View File

@@ -1,12 +1,16 @@
{ config, lib, pkgs, inputs, ... }: {
{ config, lib, pkgs, ... } @ inputs: {
imports = let
dir = builtins.readDir ./.;
in (builtins.filter
in builtins.map (x: ./${x}) (builtins.filter
(file: (dir.${file} == "directory"))
(builtins.attrNames dir)
);
/*imports = [
./nathan
];*/
options.sysconfig = with lib; {
sshHostKeys = lib.mkOption {
@@ -117,7 +121,7 @@
backupFileExtension = "backup";
extraSpecialArgs = { inherit inputs; };
useUserPackages = true;
sharedModules = [
sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
users = builtins.listToAttrs (builtins.map

View File

@@ -37,7 +37,7 @@
nh.enable = lib.mkDefault true;
minimal = lib.mkDefault false;
hyprland.enable = lib.mkDefault config.homeconfig.graphical && !config.homeconfig.standalone;
hyprland.enable = lib.mkDefault (config.homeconfig.graphical && !config.homeconfig.standalone);
hyprlock.enable = lib.mkDefault config.homeconfig.hyprland.enable;
wal.enable = lib.mkDefault config.homeconfig.graphical;
hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable;

View File

@@ -11,8 +11,8 @@
isNormalUser = true;
#hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
extraGroups = [ "networkmanager" ];
openssh.authorizedKeys.keys = lib.mkIf config.sysconfig.services.openssh.enable (cfg.ssh.keys ++ (map (z: config.sysconfig.sshHostKeys.${z}) cfg.ssh.hosts));
packages = with pkgs; lib.mkIf (cfg.home-manager.enable && cfg.home-manager.standalone) [ home-manager ];
openssh.authorizedKeys.keys = with config.sysconfig.users.nathan; lib.mkIf config.sysconfig.services.openssh.enable (ssh.keys ++ (map (z: config.sysconfig.sshHostKeys.${z}) ssh.hosts));
packages = with pkgs; with config.sysconfig.users.nathan; lib.mkIf (home-manager.enable && home-manager.standalone) [ home-manager ];
};
};