mirror of
https://github.com/Swarsel/.dotfiles.git
synced 2025-12-06 09:07:21 +01:00
fix: hostname not always set, typo
This commit is contained in:
parent
4fad38afdb
commit
044dbadbe1
4 changed files with 7 additions and 5 deletions
|
|
@ -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";
|
||||||
|
|
|
||||||
|
|
@ -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";
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
inherit (config.swarselsystems) hostName;
|
||||||
wireless.iwd = {
|
wireless.iwd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue