From dcbd89aa224dd1f1fb37026b31954f5c0dcf8999 Mon Sep 17 00:00:00 2001 From: Baitinq Date: Fri, 9 Sep 2022 01:13:51 +0200 Subject: ISO: Set user as nixos We now declare the user in the flake.nix, overriding this in the isoConfigurations output --- flake.nix | 8 ++++++-- hosts/default.nix | 4 +--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index de8a701..a5414df 100644 --- a/flake.nix +++ b/flake.nix @@ -24,13 +24,16 @@ }; outputs = inputs @ { self, nixpkgs, home-manager, ... }: + let + user = "baitinq"; + in { nixosConfigurations = import ./hosts { isNixOS = true; extraModules = [ ]; isIso = false; inherit (nixpkgs) lib; - inherit inputs nixpkgs home-manager; + inherit inputs user nixpkgs home-manager; }; homeConfigurations = import ./hosts { @@ -39,13 +42,14 @@ isIso = false; #no COde duplication here: TODO inherit (nixpkgs) lib; - inherit inputs nixpkgs home-manager; + inherit inputs user nixpkgs home-manager; }; isoConfigurations = import ./hosts { isNixOS = true; extraModules = [ ]; isIso = true; + user = "nixos"; #no COde duplication here: TODO inherit (nixpkgs) lib; inherit inputs nixpkgs home-manager; diff --git a/hosts/default.nix b/hosts/default.nix index deaad5a..924187e 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,7 +1,5 @@ -{ lib, inputs, extraModules, isNixOS, isIso, nixpkgs, home-manager, ... }: +{ lib, inputs, extraModules, isNixOS, isIso, user, nixpkgs, home-manager, ... }: let - user = "baitinq"; - secrets = import ../secrets; hosts = [ -- cgit 1.4.1