diff --git a/config/profiles/base/home.nix b/config/profiles/base/home.nix index 22a24cd0..f80a2e7b 100644 --- a/config/profiles/base/home.nix +++ b/config/profiles/base/home.nix @@ -8,7 +8,7 @@ with lib; modules = singleton ../../modules/home; specialArgs = { inherit sources tf meta; - superConfig = config; + nixos = config; modulesPath = sources.home-manager + "/modules"; }; }); diff --git a/config/profiles/base/profiles.nix b/config/profiles/base/profiles.nix index b33fcd8c..be8b1b22 100644 --- a/config/profiles/base/profiles.nix +++ b/config/profiles/base/profiles.nix @@ -25,7 +25,7 @@ with lib; home-manager.users = mkOption { type = types.attrsOf (types.submoduleWith { modules = [ - ({ superConfig, ... }: { + ({ nixos, ... }: { options.deploy.profile = { gui = mkEnableOption "Graphical System"; vfio = mkEnableOption "VFIO"; @@ -45,7 +45,7 @@ with lib; }; }; config = { - deploy.profile = superConfig.deploy.profile; + deploy.profile = nixos.deploy.profile; }; }) ]; diff --git a/config/users/kat/gui/firefox.nix b/config/users/kat/gui/firefox.nix index 7082aaf9..7f425467 100644 --- a/config/users/kat/gui/firefox.nix +++ b/config/users/kat/gui/firefox.nix @@ -1,9 +1,9 @@ -{ config, lib, pkgs, superConfig, ... }: +{ config, lib, pkgs, nixos, ... }: let commonSettings = { "app.update.auto" = false; - "identity.fxaccounts.account.device.name" = superConfig.networking.hostName; + "identity.fxaccounts.account.device.name" = nixos.networking.hostName; "signon.rememberSignons" = false; "browser.download.lastDir" = "/home/kat/downloads"; "browser.urlbar.placeholderName" = "DuckDuckGo"; diff --git a/config/users/kat/personal/weechat.nix b/config/users/kat/personal/weechat.nix index c53ad821..9d021a37 100644 --- a/config/users/kat/personal/weechat.nix +++ b/config/users/kat/personal/weechat.nix @@ -1,4 +1,4 @@ -{ config, superConfig, pkgs, lib, ... }: +{ config, nixos, pkgs, lib, ... }: { home.file = { @@ -41,21 +41,21 @@ server = { softnet = { address = "athame.kittywit.ch/5001"; - password = "kat@${superConfig.networking.hostName}/softnet:\${sec.data.znc}"; + password = "kat@${nixos.networking.hostName}/softnet:\${sec.data.znc}"; ssl = true; ssl_verify = false; autoconnect = true; }; liberachat = { address = "athame.kittywit.ch/5001"; - password = "kat@${superConfig.networking.hostName}/liberachat:\${sec.data.znc}"; + password = "kat@${nixos.networking.hostName}/liberachat:\${sec.data.znc}"; ssl = true; ssl_verify = false; autoconnect = true; }; espernet = { address = "athame.kittywit.ch/5001"; - password = "kat@${superConfig.networking.hostName}/espernet:\${sec.data.znc}"; + password = "kat@${nixos.networking.hostName}/espernet:\${sec.data.znc}"; ssl = true; ssl_verify = false; autoconnect = true; @@ -65,7 +65,7 @@ matrix = { server.kittywitch = { address = "kittywit.ch"; - device_name = "${superConfig.networking.hostName}/weechat"; + device_name = "${nixos.networking.hostName}/weechat"; username = "kat"; password = "\${sec.data.matrix}"; }; diff --git a/config/users/kat/services/weechat/default.nix b/config/users/kat/services/weechat/default.nix index 3f085a8c..d0861543 100644 --- a/config/users/kat/services/weechat/default.nix +++ b/config/users/kat/services/weechat/default.nix @@ -1,4 +1,4 @@ -{ config, lib, superConfig, pkgs, tf, ... }: +{ config, lib, nixos, pkgs, tf, ... }: { kw.secrets = [ @@ -73,21 +73,21 @@ server = { softnet = { address = "athame.kittywit.ch/5001"; - password = "kat@${superConfig.networking.hostName}/softnet:\${sec.data.znc}"; + password = "kat@${nixos.networking.hostName}/softnet:\${sec.data.znc}"; ssl = true; ssl_verify = false; autoconnect = true; }; liberachat = { address = "athame.kittywit.ch/5001"; - password = "kat@${superConfig.networking.hostName}/liberachat:\${sec.data.znc}"; + password = "kat@${nixos.networking.hostName}/liberachat:\${sec.data.znc}"; ssl = true; ssl_verify = false; autoconnect = true; }; espernet = { address = "athame.kittywit.ch/5001"; - password = "kat@${superConfig.networking.hostName}/espernet:\${sec.data.znc}"; + password = "kat@${nixos.networking.hostName}/espernet:\${sec.data.znc}"; ssl = true; ssl_verify = false; autoconnect = true; @@ -97,7 +97,7 @@ matrix = { server.kittywitch = { address = "kittywit.ch"; - device_name = "${superConfig.networking.hostName}/weechat"; + device_name = "${nixos.networking.hostName}/weechat"; username = "kat"; password = "\${sec.data.matrix}"; };