diff --git a/flake.nix b/flake.nix index 0343963..c02c9a6 100644 --- a/flake.nix +++ b/flake.nix @@ -58,11 +58,11 @@ inherit inputs; src = ./.; - snowfall.namespace = "plusultra"; + snowfall.namespace = "metacfg"; snowfall = { meta = { - name = "plusultra"; + name = "metacfg"; title = "Plus Ultra"; }; }; diff --git a/homes/x86_64-darwin/harald@mpro/default.nix b/homes/x86_64-darwin/harald@mpro/default.nix index 3315022..f7f8d31 100644 --- a/homes/x86_64-darwin/harald@mpro/default.nix +++ b/homes/x86_64-darwin/harald@mpro/default.nix @@ -11,7 +11,7 @@ sessionPath = [ "$HOME/bin" ]; }; - plusultra = { + metacfg = { cli-apps = { bash.enable = true; fish.enable = true; diff --git a/homes/x86_64-linux/harald@sgx-azure/default.nix b/homes/x86_64-linux/harald@sgx-azure/default.nix index 9667487..228958e 100644 --- a/homes/x86_64-linux/harald@sgx-azure/default.nix +++ b/homes/x86_64-linux/harald@sgx-azure/default.nix @@ -19,7 +19,7 @@ ]; }; - plusultra = { + metacfg = { cli-apps = { bash.enable = true; fish.enable = true; diff --git a/homes/x86_64-linux/harald@sgx-nixos/default.nix b/homes/x86_64-linux/harald@sgx-nixos/default.nix index 1c9175e..59320c9 100644 --- a/homes/x86_64-linux/harald@sgx-nixos/default.nix +++ b/homes/x86_64-linux/harald@sgx-nixos/default.nix @@ -5,7 +5,7 @@ { home.sessionPath = [ "$HOME/bin" ]; - plusultra = { + metacfg = { user = { enable = true; name = config.snowfallorg.user.name; diff --git a/homes/x86_64-linux/harald@sgx/default.nix b/homes/x86_64-linux/harald@sgx/default.nix index 1c9175e..59320c9 100644 --- a/homes/x86_64-linux/harald@sgx/default.nix +++ b/homes/x86_64-linux/harald@sgx/default.nix @@ -5,7 +5,7 @@ { home.sessionPath = [ "$HOME/bin" ]; - plusultra = { + metacfg = { user = { enable = true; name = config.snowfallorg.user.name; diff --git a/homes/x86_64-linux/harald@t15/default.nix b/homes/x86_64-linux/harald@t15/default.nix index c1d73cf..de75cc8 100644 --- a/homes/x86_64-linux/harald@t15/default.nix +++ b/homes/x86_64-linux/harald@t15/default.nix @@ -5,7 +5,7 @@ { home.sessionPath = [ "$HOME/bin" ]; - plusultra = { + metacfg = { user = { enable = true; name = config.snowfallorg.user.name; diff --git a/homes/x86_64-linux/harald@x1/default.nix b/homes/x86_64-linux/harald@x1/default.nix index c1d73cf..de75cc8 100644 --- a/homes/x86_64-linux/harald@x1/default.nix +++ b/homes/x86_64-linux/harald@x1/default.nix @@ -5,7 +5,7 @@ { home.sessionPath = [ "$HOME/bin" ]; - plusultra = { + metacfg = { user = { enable = true; name = config.snowfallorg.user.name; diff --git a/lib/deploy/default.nix b/lib/deploy/default.nix index 478d7d1..ea2b05f 100644 --- a/lib/deploy/default.nix +++ b/lib/deploy/default.nix @@ -24,7 +24,7 @@ rec { (result: name: let host = hosts.${name}; - user = host.config.plusultra.user.name or null; + user = host.config.metacfg.user.name or null; inherit (host.pkgs) system; in result // { @@ -37,7 +37,7 @@ rec { user = "root"; sshUser = user; } // lib.optionalAttrs - (host.config.plusultra.security.doas.enable or false) + (host.config.metacfg.security.doas.enable or false) { sudo = "doas -u"; }; diff --git a/modules/darwin/home/default.nix b/modules/darwin/home/default.nix index ccbd39e..d75b42c 100644 --- a/modules/darwin/home/default.nix +++ b/modules/darwin/home/default.nix @@ -1,16 +1,16 @@ { options, config, pkgs, lib, inputs, ... }: with lib; -with lib.plusultra; +with lib.metacfg; let - cfg = config.plusultra.home; + cfg = config.metacfg.home; in { # imports = with inputs; [ # home-manager.darwinModules.home-manager # ]; - options.plusultra.home = with types; { + options.metacfg.home = with types; { file = mkOpt attrs { } "A set of files to be managed by home-manager's ."; configFile = mkOpt attrs { } @@ -20,21 +20,21 @@ in }; config = { - plusultra.home.extraOptions = { + metacfg.home.extraOptions = { home.stateVersion = mkDefault "23.11"; - home.file = mkAliasDefinitions options.plusultra.home.file; + home.file = mkAliasDefinitions options.metacfg.home.file; xdg.enable = true; - xdg.configFile = mkAliasDefinitions options.plusultra.home.configFile; + xdg.configFile = mkAliasDefinitions options.metacfg.home.configFile; }; - snowfallorg.users.${config.plusultra.user.name}.home.config = mkAliasDefinitions options.plusultra.home.extraOptions; + snowfallorg.users.${config.metacfg.user.name}.home.config = mkAliasDefinitions options.metacfg.home.extraOptions; home-manager = { useUserPackages = true; useGlobalPkgs = true; - # users.${config.plusultra.user.name} = args: - # mkAliasDefinitions options.plusultra.home.extraOptions; + # users.${config.metacfg.user.name} = args: + # mkAliasDefinitions options.metacfg.home.extraOptions; }; }; } diff --git a/modules/darwin/nix/default.nix b/modules/darwin/nix/default.nix index 995aebc..ea488df 100644 --- a/modules/darwin/nix/default.nix +++ b/modules/darwin/nix/default.nix @@ -5,11 +5,11 @@ , ... }: with lib; -with lib.plusultra; let - cfg = config.plusultra.nix; +with lib.metacfg; let + cfg = config.metacfg.nix; in { - options.plusultra.nix = with types; { + options.metacfg.nix = with types; { enable = mkBoolOpt true "Whether or not to manage nix configuration."; package = mkOpt package pkgs.nixUnstable "Which nix package to use."; }; @@ -24,7 +24,7 @@ in nix = let - users = [ "root" config.plusultra.user.name ]; + users = [ "root" config.metacfg.user.name ]; in { package = cfg.package; @@ -53,7 +53,7 @@ in extra-nix-path = "nixpkgs=flake:nixpkgs"; build-users-group = "nixbld"; }; - #// (lib.optionalAttrs config.plusultra.tools.direnv.enable { + #// (lib.optionalAttrs config.metacfg.tools.direnv.enable { # keep-outputs = true; # keep-derivations = true; #}); @@ -62,7 +62,7 @@ in automatic = true; interval = { Day = 7; }; options = "--delete-older-than 30d"; - user = config.plusultra.user.name; + user = config.metacfg.user.name; }; # flake-utils-plus diff --git a/modules/darwin/security/gpg/default.nix b/modules/darwin/security/gpg/default.nix index 45b11d2..0b3248d 100644 --- a/modules/darwin/security/gpg/default.nix +++ b/modules/darwin/security/gpg/default.nix @@ -2,11 +2,11 @@ let inherit (lib) types mkEnableOption mkIf; - inherit (lib.plusultra) mkOpt; + inherit (lib.metacfg) mkOpt; - cfg = config.plusultra.security.gpg; - gpg = config.plusultra.security.gpg; - user = config.plusultra.user; + cfg = config.metacfg.security.gpg; + gpg = config.metacfg.security.gpg; + user = config.metacfg.user; gpgConf = "${inputs.gpg-base-conf}/gpg.conf"; gpgAgentConf = '' @@ -43,7 +43,7 @@ let ''; in { - options.plusultra.security.gpg = { + options.metacfg.security.gpg = { enable = mkEnableOption "GPG"; agentTimeout = mkOpt types.int 5 "The amount of time to wait before continuing with shell init."; }; @@ -72,7 +72,7 @@ in enableSSHSupport = true; }; - plusultra.home.file = { + metacfg.home.file = { ".gnupg/.keep".text = ""; ".gnupg/yubikey-guide.md".source = guide; diff --git a/modules/darwin/services/nix-daemon/default.nix b/modules/darwin/services/nix-daemon/default.nix index 020ea6d..0efa94d 100644 --- a/modules/darwin/services/nix-daemon/default.nix +++ b/modules/darwin/services/nix-daemon/default.nix @@ -2,12 +2,12 @@ let inherit (lib) types mkIf; - inherit (lib.plusultra) mkOpt enabled; + inherit (lib.metacfg) mkOpt enabled; - cfg = config.plusultra.services.nix-daemon; + cfg = config.metacfg.services.nix-daemon; in { - options.plusultra.services.nix-daemon = { + options.metacfg.services.nix-daemon = { enable = mkOpt types.bool true "Whether to enable the Nix daemon."; }; diff --git a/modules/darwin/suites/common/default.nix b/modules/darwin/suites/common/default.nix index ec00f79..64686a2 100644 --- a/modules/darwin/suites/common/default.nix +++ b/modules/darwin/suites/common/default.nix @@ -1,19 +1,19 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; +with lib.metacfg; let - cfg = config.plusultra.suites.common; + cfg = config.metacfg.suites.common; in { - options.plusultra.suites.common = with types; { + options.metacfg.suites.common = with types; { enable = mkBoolOpt false "Whether or not to enable common configuration."; }; config = mkIf cfg.enable { programs.fish = enabled; - plusultra = { + metacfg = { nix = enabled; system = { diff --git a/modules/darwin/system/fonts/default.nix b/modules/darwin/system/fonts/default.nix index b1483e0..0c90510 100644 --- a/modules/darwin/system/fonts/default.nix +++ b/modules/darwin/system/fonts/default.nix @@ -1,11 +1,11 @@ { options, config, pkgs, lib, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.system.fonts; +with lib.metacfg; +let cfg = config.metacfg.system.fonts; in { - options.plusultra.system.fonts = with types; { + options.metacfg.system.fonts = with types; { enable = mkBoolOpt false "Whether or not to manage fonts."; fonts = mkOpt (listOf package) [ ] "Custom font packages to install."; }; diff --git a/modules/darwin/system/interface/default.nix b/modules/darwin/system/interface/default.nix index 4ecfdf5..2f14504 100644 --- a/modules/darwin/system/interface/default.nix +++ b/modules/darwin/system/interface/default.nix @@ -1,11 +1,11 @@ { options, config, pkgs, lib, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.system.interface; +with lib.metacfg; +let cfg = config.metacfg.system.interface; in { - options.plusultra.system.interface = with types; { + options.metacfg.system.interface = with types; { enable = mkEnableOption "macOS interface"; }; @@ -24,6 +24,6 @@ in }; }; - plusultra.home.file.".hushlogin".text = ""; + metacfg.home.file.".hushlogin".text = ""; }; } diff --git a/modules/darwin/user/default.nix b/modules/darwin/user/default.nix index 1554974..78a3813 100644 --- a/modules/darwin/user/default.nix +++ b/modules/darwin/user/default.nix @@ -5,15 +5,15 @@ }: let inherit (lib) types mkIf mkDefault; - inherit (lib.plusultra) mkOpt; + inherit (lib.metacfg) mkOpt; - cfg = config.plusultra.user; + cfg = config.metacfg.user; is-linux = pkgs.stdenv.isLinux; is-darwin = pkgs.stdenv.isDarwin; in { - options.plusultra.user = { + options.metacfg.user = { name = mkOpt types.str "harald" "The user account."; fullName = mkOpt types.str "Harald Hoyer" "The full name of the user."; @@ -26,11 +26,11 @@ in users.users.${cfg.name} = { # NOTE: Setting the uid here is required for another # module to evaluate successfully since it reads - # `users.users.${plusultra.user.name}.uid`. + # `users.users.${metacfg.user.name}.uid`. uid = mkIf (cfg.uid != null) cfg.uid; }; - snowfallorg.users.${config.plusultra.user.name}.home.config = { + snowfallorg.users.${config.metacfg.user.name}.home.config = { home = { file = { ".profile".text = '' diff --git a/modules/home/cli-apps/bash/default.nix b/modules/home/cli-apps/bash/default.nix index 11c923b..eb850b8 100644 --- a/modules/home/cli-apps/bash/default.nix +++ b/modules/home/cli-apps/bash/default.nix @@ -6,10 +6,10 @@ let inherit (lib) mkEnableOption mkIf; - cfg = config.plusultra.cli-apps.bash; + cfg = config.metacfg.cli-apps.bash; in { - options.plusultra.cli-apps.bash = { + options.metacfg.cli-apps.bash = { enable = mkEnableOption "BASH shell"; }; diff --git a/modules/home/cli-apps/bat/default.nix b/modules/home/cli-apps/bat/default.nix index 4eadb9c..5b99051 100644 --- a/modules/home/cli-apps/bat/default.nix +++ b/modules/home/cli-apps/bat/default.nix @@ -4,11 +4,11 @@ , ... }: with lib; -with lib.plusultra; let - cfg = config.plusultra.cli-apps.bat; +with lib.metacfg; let + cfg = config.metacfg.cli-apps.bat; in { - options.plusultra.cli-apps.bat = { + options.metacfg.cli-apps.bat = { enable = mkEnableOption "bat"; }; diff --git a/modules/home/cli-apps/fish/default.nix b/modules/home/cli-apps/fish/default.nix index a6f2354..3a62572 100644 --- a/modules/home/cli-apps/fish/default.nix +++ b/modules/home/cli-apps/fish/default.nix @@ -6,10 +6,10 @@ let inherit (lib) mkEnableOption mkIf; - cfg = config.plusultra.cli-apps.fish; + cfg = config.metacfg.cli-apps.fish; in { - options.plusultra.cli-apps.fish = { + options.metacfg.cli-apps.fish = { enable = mkEnableOption "FISH shell"; }; diff --git a/modules/home/cli-apps/home-manager/default.nix b/modules/home/cli-apps/home-manager/default.nix index ab7ae34..de21236 100644 --- a/modules/home/cli-apps/home-manager/default.nix +++ b/modules/home/cli-apps/home-manager/default.nix @@ -2,12 +2,12 @@ let inherit (lib) mkEnableOption mkIf; - inherit (lib.plusultra) enabled; + inherit (lib.metacfg) enabled; - cfg = config.plusultra.cli-apps.home-manager; + cfg = config.metacfg.cli-apps.home-manager; in { - options.plusultra.cli-apps.home-manager = { + options.metacfg.cli-apps.home-manager = { enable = mkEnableOption "home-manager"; }; diff --git a/modules/home/cli-apps/neovim/default.nix b/modules/home/cli-apps/neovim/default.nix index 1b08bcb..9f82fda 100644 --- a/modules/home/cli-apps/neovim/default.nix +++ b/modules/home/cli-apps/neovim/default.nix @@ -3,10 +3,10 @@ let inherit (lib) mkEnableOption mkIf; - cfg = config.plusultra.cli-apps.neovim; + cfg = config.metacfg.cli-apps.neovim; in { - options.plusultra.cli-apps.neovim = { + options.metacfg.cli-apps.neovim = { enable = mkEnableOption "Neovim"; }; diff --git a/modules/home/cli-apps/starship/default.nix b/modules/home/cli-apps/starship/default.nix index 82bc343..4f0d6d3 100644 --- a/modules/home/cli-apps/starship/default.nix +++ b/modules/home/cli-apps/starship/default.nix @@ -6,10 +6,10 @@ let inherit (lib) mkEnableOption mkIf; - cfg = config.plusultra.cli-apps.starship; + cfg = config.metacfg.cli-apps.starship; in { - options.plusultra.cli-apps.starship = { + options.metacfg.cli-apps.starship = { enable = mkEnableOption "starship"; }; diff --git a/modules/home/cli-apps/tmux/default.nix b/modules/home/cli-apps/tmux/default.nix index 89218d7..336e82f 100644 --- a/modules/home/cli-apps/tmux/default.nix +++ b/modules/home/cli-apps/tmux/default.nix @@ -4,11 +4,11 @@ , ... }: with lib; -with lib.plusultra; let - cfg = config.plusultra.cli-apps.tmux; +with lib.metacfg; let + cfg = config.metacfg.cli-apps.tmux; in { - options.plusultra.cli-apps.tmux = { + options.metacfg.cli-apps.tmux = { enable = mkEnableOption "Tmux"; }; diff --git a/modules/home/host/default.nix b/modules/home/host/default.nix index 9c22b68..4aaba8a 100644 --- a/modules/home/host/default.nix +++ b/modules/home/host/default.nix @@ -2,10 +2,10 @@ let inherit (lib) types; - inherit (lib.plusultra) mkOpt; + inherit (lib.metacfg) mkOpt; in { - options.plusultra.host = { + options.metacfg.host = { name = mkOpt (types.nullOr types.str) host "The host name."; }; } diff --git a/modules/home/tools/alacritty/default.nix b/modules/home/tools/alacritty/default.nix index 73829a2..aad2262 100644 --- a/modules/home/tools/alacritty/default.nix +++ b/modules/home/tools/alacritty/default.nix @@ -6,10 +6,10 @@ let inherit (lib) mkEnableOption mkIf; - cfg = config.plusultra.tools.alacritty; + cfg = config.metacfg.tools.alacritty; in { - options.plusultra.tools.alacritty = { + options.metacfg.tools.alacritty = { enable = mkEnableOption "alacritty"; }; diff --git a/modules/home/tools/direnv/default.nix b/modules/home/tools/direnv/default.nix index f9a77c7..a1c83bf 100644 --- a/modules/home/tools/direnv/default.nix +++ b/modules/home/tools/direnv/default.nix @@ -1,11 +1,11 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.tools.direnv; +with lib.metacfg; +let cfg = config.metacfg.tools.direnv; in { - options.plusultra.tools.direnv = with types; { + options.metacfg.tools.direnv = with types; { enable = mkBoolOpt false "Whether or not to enable direnv."; }; diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix index d275ab1..e72d040 100644 --- a/modules/home/tools/git/default.nix +++ b/modules/home/tools/git/default.nix @@ -2,13 +2,13 @@ let inherit (lib) types mkEnableOption mkIf; - inherit (lib.plusultra) mkOpt enabled; + inherit (lib.metacfg) mkOpt enabled; - cfg = config.plusultra.tools.git; - user = config.plusultra.user; + cfg = config.metacfg.tools.git; + user = config.metacfg.user; in { - options.plusultra.tools.git = { + options.metacfg.tools.git = { enable = mkEnableOption "Git"; userName = mkOpt types.str user.fullName "The name to configure git with."; userEmail = mkOpt types.str user.email "The email to configure git with."; diff --git a/modules/home/tools/jetbrains/default.nix b/modules/home/tools/jetbrains/default.nix index 03159d2..e2f934b 100644 --- a/modules/home/tools/jetbrains/default.nix +++ b/modules/home/tools/jetbrains/default.nix @@ -1,11 +1,11 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.tools.jetbrains; +with lib.metacfg; +let cfg = config.metacfg.tools.jetbrains; in { - options.plusultra.tools.jetbrains = with types; { + options.metacfg.tools.jetbrains = with types; { enable = mkBoolOpt false "Whether or not to enable jetbrains."; }; diff --git a/modules/home/tools/ssh/default.nix b/modules/home/tools/ssh/default.nix index 5bedc41..9278a73 100644 --- a/modules/home/tools/ssh/default.nix +++ b/modules/home/tools/ssh/default.nix @@ -2,10 +2,10 @@ let inherit (lib) types mkEnableOption mkIf; - cfg = config.plusultra.tools.ssh; + cfg = config.metacfg.tools.ssh; in { - options.plusultra.tools.ssh = { + options.metacfg.tools.ssh = { enable = mkEnableOption "SSH"; }; diff --git a/modules/home/user/default.nix b/modules/home/user/default.nix index ac5d18b..49dcd68 100644 --- a/modules/home/user/default.nix +++ b/modules/home/user/default.nix @@ -2,9 +2,9 @@ let inherit (lib) types mkIf mkDefault mkMerge; - inherit (lib.plusultra) mkOpt; + inherit (lib.metacfg) mkOpt; - cfg = config.plusultra.user; + cfg = config.metacfg.user; is-linux = pkgs.stdenv.isLinux; is-darwin = pkgs.stdenv.isDarwin; @@ -18,7 +18,7 @@ let "/home/${cfg.name}"; in { - options.plusultra.user = { + options.metacfg.user = { enable = mkOpt types.bool false "Whether to configure the user account."; name = mkOpt (types.nullOr types.str) config.snowfallorg.user.name "The user account."; @@ -33,11 +33,11 @@ in assertions = [ { assertion = cfg.name != null; - message = "plusultra.user.name must be set"; + message = "metacfg.user.name must be set"; } { assertion = cfg.home != null; - message = "plusultra.user.home must be set"; + message = "metacfg.user.home must be set"; } ]; diff --git a/modules/nixos/home/default.nix b/modules/nixos/home/default.nix index 4c53a0e..c7e9591 100644 --- a/modules/nixos/home/default.nix +++ b/modules/nixos/home/default.nix @@ -1,11 +1,11 @@ { options, config, pkgs, lib, inputs, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.home; +with lib.metacfg; +let cfg = config.metacfg.home; in { - options.plusultra.home = with types; { + options.metacfg.home = with types; { file = mkOpt attrs { } (mdDoc "A set of files to be managed by home-manager's `home.file`."); configFile = mkOpt attrs { } @@ -14,19 +14,19 @@ in }; config = { - plusultra.home.extraOptions = { + metacfg.home.extraOptions = { home.stateVersion = config.system.stateVersion; - home.file = mkAliasDefinitions options.plusultra.home.file; + home.file = mkAliasDefinitions options.metacfg.home.file; xdg.enable = true; - xdg.configFile = mkAliasDefinitions options.plusultra.home.configFile; + xdg.configFile = mkAliasDefinitions options.metacfg.home.configFile; }; home-manager = { useUserPackages = true; useGlobalPkgs = true; - users.${config.plusultra.user.name} = - mkAliasDefinitions options.plusultra.home.extraOptions; + users.${config.metacfg.user.name} = + mkAliasDefinitions options.metacfg.home.extraOptions; }; }; } diff --git a/modules/nixos/nix-ld/default.nix b/modules/nixos/nix-ld/default.nix index 2d1b3f7..3878c83 100644 --- a/modules/nixos/nix-ld/default.nix +++ b/modules/nixos/nix-ld/default.nix @@ -1,11 +1,11 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.nix-ld; +with lib.metacfg; +let cfg = config.metacfg.nix-ld; in { - options.plusultra.nix-ld = with types; { + options.metacfg.nix-ld = with types; { enable = mkBoolOpt false "Whether or not to enable nix-ld."; }; diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 1211345..fff517b 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -1,9 +1,9 @@ { options, config, pkgs, lib, inputs, ... }: with lib; -with lib.plusultra; +with lib.metacfg; let - cfg = config.plusultra.nix; + cfg = config.metacfg.nix; substituters-submodule = types.submodule ({ name, ... }: { options = with types; { @@ -12,7 +12,7 @@ let }); in { - options.plusultra.nix = with types; { + options.metacfg.nix = with types; { enable = mkBoolOpt false "Whether or not to manage nix configuration."; package = mkOpt package pkgs.nix "Which nix package to use."; @@ -28,13 +28,13 @@ in assertions = mapAttrsToList (name: value: { assertion = value.key != null; - message = "plusultra.nix.extra-substituters.${name}.key must be set"; + message = "metacfg.nix.extra-substituters.${name}.key must be set"; }) cfg.extra-substituters; environment.systemPackages = with pkgs; [ - plusultra.nixos-revision - (plusultra.nixos-hosts.override { + metacfg.nixos-revision + (metacfg.nixos-hosts.override { hosts = inputs.self.nixosConfigurations; }) deploy-rs @@ -46,7 +46,7 @@ in nix = let - users = [ "root" config.plusultra.user.name ] ++ + users = [ "root" config.metacfg.user.name ] ++ optional config.services.hydra.enable "hydra"; extra-substituters = cfg.extra-substituters // { "https://nixsgx.cachix.org".key = "nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE="; @@ -74,7 +74,7 @@ in ++ (mapAttrsToList (name: value: value.key) extra-substituters); - } // (lib.optionalAttrs config.plusultra.tools.direnv.enable { + } // (lib.optionalAttrs config.metacfg.tools.direnv.enable { keep-outputs = true; keep-derivations = true; }); diff --git a/modules/nixos/services/base/default.nix b/modules/nixos/services/base/default.nix index aff0444..f892988 100644 --- a/modules/nixos/services/base/default.nix +++ b/modules/nixos/services/base/default.nix @@ -1,11 +1,11 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.base; +with lib.metacfg; +let cfg = config.metacfg.base; in { - options.plusultra.base = with types; { + options.metacfg.base = with types; { enable = mkBoolOpt false "Whether or not to enable the base config."; }; diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix index d133016..2512a40 100644 --- a/modules/nixos/services/gui/default.nix +++ b/modules/nixos/services/gui/default.nix @@ -1,11 +1,11 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.gui; +with lib.metacfg; +let cfg = config.metacfg.gui; in { - options.plusultra.gui = with types; { + options.metacfg.gui = with types; { enable = mkBoolOpt false "Whether or not to enable a GUI."; }; diff --git a/modules/nixos/services/podman/default.nix b/modules/nixos/services/podman/default.nix index 9746e18..51e0d63 100644 --- a/modules/nixos/services/podman/default.nix +++ b/modules/nixos/services/podman/default.nix @@ -1,11 +1,11 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.podman; +with lib.metacfg; +let cfg = config.metacfg.podman; in { - options.plusultra.podman = with types; { + options.metacfg.podman = with types; { enable = mkBoolOpt false "Whether or not to enable podman."; }; diff --git a/modules/nixos/services/secureboot/default.nix b/modules/nixos/services/secureboot/default.nix index e76b4d0..e0e51d4 100644 --- a/modules/nixos/services/secureboot/default.nix +++ b/modules/nixos/services/secureboot/default.nix @@ -1,11 +1,11 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.secureboot; +with lib.metacfg; +let cfg = config.metacfg.secureboot; in { - options.plusultra.secureboot = with types; { + options.metacfg.secureboot = with types; { enable = mkBoolOpt false "Whether or not to enable secureboot."; }; diff --git a/modules/nixos/sgx/pccs/default.nix b/modules/nixos/sgx/pccs/default.nix index 5cd540a..86c715a 100644 --- a/modules/nixos/sgx/pccs/default.nix +++ b/modules/nixos/sgx/pccs/default.nix @@ -1,13 +1,13 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; +with lib.metacfg; let - cfg = config.plusultra.pccs; - cfg_podman = config.plusultra.podman; + cfg = config.metacfg.pccs; + cfg_podman = config.metacfg.podman; in { - options.plusultra.pccs = with types; { + options.metacfg.pccs = with types; { enable = mkBoolOpt false "Whether or not to enable a SGX-DCAP."; secret = mkOption { type = with types; nullOr path; @@ -29,7 +29,7 @@ in } ]; - plusultra = { + metacfg = { nix.extra-substituters = { "https://nixsgx.cachix.org".key = "nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE="; }; diff --git a/modules/nixos/tools/direnv/default.nix b/modules/nixos/tools/direnv/default.nix index f09398c..c6c6066 100644 --- a/modules/nixos/tools/direnv/default.nix +++ b/modules/nixos/tools/direnv/default.nix @@ -1,16 +1,16 @@ { options, config, lib, pkgs, ... }: with lib; -with lib.plusultra; -let cfg = config.plusultra.tools.direnv; +with lib.metacfg; +let cfg = config.metacfg.tools.direnv; in { - options.plusultra.tools.direnv = with types; { + options.metacfg.tools.direnv = with types; { enable = mkBoolOpt false "Whether or not to enable direnv."; }; config = mkIf cfg.enable { - plusultra.home.extraOptions = { + metacfg.home.extraOptions = { programs.direnv = { enable = true; nix-direnv = enabled; diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix index 7e01008..7bdafa4 100644 --- a/modules/nixos/tools/git/default.nix +++ b/modules/nixos/tools/git/default.nix @@ -1,14 +1,14 @@ { options, config, pkgs, lib, ... }: with lib; -with lib.plusultra; +with lib.metacfg; let - cfg = config.plusultra.tools.git; - gpg = config.plusultra.security.gpg; - user = config.plusultra.user; + cfg = config.metacfg.tools.git; + gpg = config.metacfg.security.gpg; + user = config.metacfg.user; in { - options.plusultra.tools.git = with types; { + options.metacfg.tools.git = with types; { enable = mkBoolOpt false "Whether or not to install and configure git."; userName = mkOpt types.str user.fullName "The name to configure git with."; userEmail = mkOpt types.str user.email "The email to configure git with."; @@ -19,7 +19,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ git ]; - plusultra.home.extraOptions = { + metacfg.home.extraOptions = { programs.git = { enable = true; inherit (cfg) userName userEmail; diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix index 6e30c93..3d0d65f 100644 --- a/modules/nixos/user/default.nix +++ b/modules/nixos/user/default.nix @@ -5,8 +5,8 @@ , ... }: with lib; -with lib.plusultra; let - cfg = config.plusultra.user; +with lib.metacfg; let + cfg = config.metacfg.user; defaultIconFileName = "profile.jpg"; defaultIcon = pkgs.stdenvNoCC.mkDerivation { name = "default-icon"; @@ -24,14 +24,14 @@ with lib.plusultra; let pkgs.runCommandNoCC "propagated-icon" { passthru = { fileName = cfg.icon.fileName; }; } '' - local target="$out/share/plusultra-icons/user/${cfg.name}" + local target="$out/share/metacfg-icons/user/${cfg.name}" mkdir -p "$target" cp ${cfg.icon} "$target/${cfg.icon.fileName}" ''; in { - options.plusultra.user = with types; { + options.metacfg.user = with types; { name = mkOpt str "harald" "The name to use for the user account."; fullName = mkOpt str "Harald Hoyer" "The full name of the user."; email = mkOpt str "harald@hoyer.xyz" "The email of the user."; @@ -58,7 +58,7 @@ in environment.systemPackages = with pkgs; [ ]; - plusultra.home = { + metacfg.home = { file = { "Desktop/.keep".text = ""; "Documents/.keep".text = ""; diff --git a/packages/nixos-hosts/default.nix b/packages/nixos-hosts/default.nix index a070435..432ba36 100644 --- a/packages/nixos-hosts/default.nix +++ b/packages/nixos-hosts/default.nix @@ -10,7 +10,7 @@ let inherit (lib) mapAttrsToList concatStringsSep; - inherit (lib.plusultra) override-meta; + inherit (lib.metacfg) override-meta; substitute = args: builtins.readFile (substituteAll args); diff --git a/packages/nixos-revision/default.nix b/packages/nixos-revision/default.nix index 6c9ce9c..9168b01 100644 --- a/packages/nixos-revision/default.nix +++ b/packages/nixos-revision/default.nix @@ -5,7 +5,7 @@ }: let - inherit (lib.plusultra) override-meta; + inherit (lib.metacfg) override-meta; new-meta = with lib; { description = "A helper show the current git revision of the system configuration."; diff --git a/systems/x86_64-darwin/mpro/default.nix b/systems/x86_64-darwin/mpro/default.nix index f2a9844..76d034b 100644 --- a/systems/x86_64-darwin/mpro/default.nix +++ b/systems/x86_64-darwin/mpro/default.nix @@ -1,8 +1,8 @@ { lib, pkgs, ... }: -with lib.plusultra; +with lib.metacfg; { - plusultra = { + metacfg = { suites = { common = enabled; }; diff --git a/systems/x86_64-linux/sgx-nixos/default.nix b/systems/x86_64-linux/sgx-nixos/default.nix index 64ce7d5..c7e2046 100644 --- a/systems/x86_64-linux/sgx-nixos/default.nix +++ b/systems/x86_64-linux/sgx-nixos/default.nix @@ -1,10 +1,10 @@ { pkgs, lib, config, ... }: with lib; -with lib.plusultra; +with lib.metacfg; { imports = [ ./hardware-configuration.nix ]; - plusultra = { + metacfg = { base.enable = true; nix-ld.enable = true; nix.enable = true; diff --git a/systems/x86_64-linux/sgx/default.nix b/systems/x86_64-linux/sgx/default.nix index 569998f..bfffeb8 100644 --- a/systems/x86_64-linux/sgx/default.nix +++ b/systems/x86_64-linux/sgx/default.nix @@ -9,7 +9,7 @@ in sops.secrets.pccs.sopsFile = ../../../.secrets/sgx/pccs.yaml; sops.secrets.backup-pw.sopsFile = ../../../.secrets/sgx/backup-s3.yaml; - plusultra = { + metacfg = { base.enable = true; gui.enable = false; nix-ld.enable = true; diff --git a/systems/x86_64-linux/t15/default.nix b/systems/x86_64-linux/t15/default.nix index 6046a61..78c0b3b 100644 --- a/systems/x86_64-linux/t15/default.nix +++ b/systems/x86_64-linux/t15/default.nix @@ -2,7 +2,7 @@ { imports = [ ./hardware-configuration.nix ]; - plusultra = { + metacfg = { base.enable = true; gui.enable = true; nix-ld.enable = true; diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix index f9a19d8..35ea6b9 100644 --- a/systems/x86_64-linux/x1/default.nix +++ b/systems/x86_64-linux/x1/default.nix @@ -1,10 +1,10 @@ { pkgs, lib, ... }: with lib; -with lib.plusultra; +with lib.metacfg; { imports = [ ./hardware-configuration.nix ]; - plusultra = { + metacfg = { base.enable = true; gui.enable = true; nix-ld.enable = true;