fix: hostname not always set, typo

This commit is contained in:
Leon Schwarzäugl 2025-08-05 01:21:48 +02:00
parent 4fad38afdb
commit 044dbadbe1
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
4 changed files with 7 additions and 5 deletions

View file

@ -4817,6 +4817,7 @@ Here I only enable =networkmanager= and a few default networks. The rest of the
}; };
networking = { networking = {
inherit (config.swarselsystems) hostName;
wireless.iwd = { wireless.iwd = {
enable = true; enable = true;
settings = { settings = {
@ -10148,7 +10149,7 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9
options.swarselsystems = { options.swarselsystems = {
hostName = lib.mkOption { hostName = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = ""; default = configName;
}; };
fqdn = lib.mkOption { fqdn = lib.mkOption {
type = lib.types.str; type = lib.types.str;
@ -11133,7 +11134,7 @@ Sets environment variables. Here I am only setting the EDITOR variable, most var
in in
{ {
options.swarselmodules.env = lib.mkEnableOption "env settings"; options.swarselmodules.env = lib.mkEnableOption "env settings";
config =z lib.mkIf config.swarselmodules.env { config = lib.mkIf config.swarselmodules.env {
home.sessionVariables = { home.sessionVariables = {
EDITOR = "e -w"; EDITOR = "e -w";
DISPLAY = ":0"; DISPLAY = ":0";

View file

@ -8,7 +8,7 @@ let
in in
{ {
options.swarselmodules.env = lib.mkEnableOption "env settings"; options.swarselmodules.env = lib.mkEnableOption "env settings";
config = z lib.mkIf config.swarselmodules.env { config = lib.mkIf config.swarselmodules.env {
home.sessionVariables = { home.sessionVariables = {
EDITOR = "e -w"; EDITOR = "e -w";
DISPLAY = ":0"; DISPLAY = ":0";

View file

@ -49,6 +49,7 @@ in
}; };
networking = { networking = {
inherit (config.swarselsystems) hostName;
wireless.iwd = { wireless.iwd = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,4 +1,4 @@
{ self, lib, pkgs, config, ... }: { self, lib, pkgs, config, configName, ... }:
let let
inherit (config.swarselsystems) mainUser homeDir xdgDir; inherit (config.swarselsystems) mainUser homeDir xdgDir;
iwd = config.networking.networkmanager.wifi.backend == "iwd"; iwd = config.networking.networkmanager.wifi.backend == "iwd";
@ -29,7 +29,7 @@ in
options.swarselsystems = { options.swarselsystems = {
hostName = lib.mkOption { hostName = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = ""; default = configName;
}; };
fqdn = lib.mkOption { fqdn = lib.mkOption {
type = lib.types.str; type = lib.types.str;