some changes

This commit is contained in:
tx0 2025-03-14 16:51:07 +00:00
parent 1c543e97f0
commit f0916dd015
6 changed files with 21 additions and 11 deletions

View file

@ -18,10 +18,9 @@
flake = let
machineConf = import ./machines/earth/earth.nix {inherit self;};
system = machineConf.universe.system.arch;
u = import ./ulib {inherit inputs system;};
in {
nixosConfigurations."earth" = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit system inputs u;};
specialArgs = {inherit system inputs;};
modules = [
machineConf
./modules

View file

@ -2,7 +2,6 @@
config,
system,
inputs,
u,
...
}: {
home-manager = {
@ -10,6 +9,6 @@
useUserPackages = true;
backupFileExtension = "hm-old";
users.${config.universe.system.username} = import ./users/${config.universe.system.username};
extraSpecialArgs = {inherit system inputs u;};
extraSpecialArgs = {inherit system inputs;};
};
}

View file

@ -1,5 +1,9 @@
{u, ...}: {
imports = u.umport {
{
inputs,
system,
...
}: {
imports = inputs.nypkgs.legacyPackages.${system}.lib.umport {
path = ./.;
include = [

View file

@ -1,6 +1,10 @@
{u, ...}: {
{
inputs,
system,
...
}: {
system.stateVersion = "24.11";
imports = u.umport {
imports = inputs.nypkgs.legacyPackages.${system}.lib.umport {
path = ./.;
exclude = [

View file

@ -1,5 +1,9 @@
{u, ...}: {
imports = u.umport {
{
inputs,
system,
...
}: {
imports = inputs.nypkgs.legacyPackages.${system}.lib.umport {
path = ./.;
exclude = [

View file

@ -3,5 +3,5 @@
system,
...
}: {
umport = inputs.nypkgs.legacyPackages.${system}.lib.umport;
umport = ;
}