mwahahahaha, got everything building again, deskop is also in working state. so lets hope that my work laptop will also work tomorrow!!!

This commit is contained in:
Chris Kruining 2025-03-24 01:09:06 +01:00
parent b0dc4d9fe4
commit bf3ca86089
Signed by: chris
SSH key fingerprint: SHA256:nG82MUfuVdRVyCKKWqhY+pCrbz9nbX6uzUns4RKa1Pg
6 changed files with 83 additions and 70 deletions

View file

@ -1,17 +1,11 @@
args@{
inputs,
lib,
pkgs,
self,
...
}: let
{ inputs, lib, pkgs, self, ... }: let
inherit (inputs.nixpkgs.lib) nixosSystem;
inherit (builtins) baseNameOf elem map listToAttrs;
inherit (builtins) baseNameOf elem map listToAttrs pathExists;
inherit (lib) filterAttrs nameValuePair attrNames;
inherit (lib.modules) mkAliasOptionModule mkDefault mkIf;
inherit (lib.modules) mkDefault mkIf;
inherit (lib.strings) removeSuffix;
inherit (self.modules) mapModules mapModulesRec';
inherit (self) mkSysUser mkHmUser;
inherit (self) mkSysUser;
in rec
{
mkHost = path: attrs @ {system ? "x86_64-linux", ...}:
@ -22,17 +16,17 @@ in rec
modules = let
stateVersion = "23.11";
users = attrNames (mapModules "${path}/users" (p: p));
users = if (pathExists "${path}/users") then attrNames (mapModules "${path}/users" (p: p)) else [];
in [
inputs.nixos-boot.nixosModules.default
({ options, config, ...}: {
({ ... }: {
nixpkgs.pkgs = pkgs;
networking.hostName = mkDefault (removeSuffix ".nix" (baseNameOf path));
system = {
inherit stateVersion;
configurationRevision = with inputs; mkIf (self ? rev) self.rev;
configurationRevision = mkIf (self ? rev) self.rev;
};
imports = [
@ -43,7 +37,7 @@ in rec
users = {
mutableUsers = true; # Set this to false when I get sops with passwords set up properly
users = mapModules "${path}/users" mkSysUser;
users = mkIf (pathExists "${path}/users") (mapModules "${path}/users" mkSysUser);
};
home-manager = {