[user module] actually call the module
Some checks failed
Check flake syntax / flake-check (push) Failing after 2m1s

and fix some issues
This commit is contained in:
ahtlon
2025-01-28 12:39:05 +01:00
parent fdb9980176
commit eb61088dc9
3 changed files with 7 additions and 5 deletions

View File

@@ -8,12 +8,11 @@ in
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
#./hardware-configuration.nix #./hardware-configuration.nix
../modules/xserver.nix ../modules/xserver.nix
../modules/malobeo_user.nix
../modules/sshd.nix ../modules/sshd.nix
../modules/minimal_tools.nix
../modules/autoupdate.nix ../modules/autoupdate.nix
inputs.self.nixosModules.malobeo.disko inputs.self.nixosModules.malobeo.disko
inputs.self.nixosModules.malobeo.initssh inputs.self.nixosModules.malobeo.initssh
inputs.self.nixosModules.malobeo.users
]; ];
malobeo.autoUpdate = { malobeo.autoUpdate = {
@@ -38,6 +37,8 @@ in
ethernetDrivers = ["r8169"]; ethernetDrivers = ["r8169"];
}; };
malobeo.users.malobeo = true;
hardware.sane.enable = true; #scanner support hardware.sane.enable = true; #scanner support
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];

View File

@@ -1,7 +1,7 @@
{config, lib, pkgs, ...}: {config, lib, pkgs, inputs, ...}:
let let
cfg = config.malobeo.users; cfg = config.malobeo.users;
sshKeys = import ../ssh_keys.nix; sshKeys = import ( inputs.self + /machines/ssh_keys.nix);
in in
{ {
options.malobeo.users = { options.malobeo.users = {
@@ -21,7 +21,7 @@ in
environment.systemPackages = with pkgs; []; environment.systemPackages = with pkgs; [];
}) })
(lib.mkIf cfg.admin { (lib.mkIf cfg.admin {
users.user.admin = { users.users.admin = {
isNormalUser = true; isNormalUser = true;
description = "admin user, passwordless sudo access, only ssh"; description = "admin user, passwordless sudo access, only ssh";
hashedPassword = null; hashedPassword = null;

View File

@@ -113,6 +113,7 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
initssh.imports = [ ./machines/modules/malobeo/initssh.nix ]; initssh.imports = [ ./machines/modules/malobeo/initssh.nix ];
metrics.imports = [ ./machines/modules/malobeo/metrics.nix ]; metrics.imports = [ ./machines/modules/malobeo/metrics.nix ];
disko.imports = [ ./machines/modules/disko ]; disko.imports = [ ./machines/modules/disko ];
users.imports = [ ./machines/modules/malobeo/users.nix ];
}; };
hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) ( hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) (