diff --git a/configs/home-manager/alice/default.nix b/configs/home-manager/alice/default.nix index 9dd788bc..f740dc2a 100644 --- a/configs/home-manager/alice/default.nix +++ b/configs/home-manager/alice/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - profiles = { + suites = { dev = { enable = true; shell.enable = true; diff --git a/configs/home-manager/foo-dogsquared/modules/programs/shell.nix b/configs/home-manager/foo-dogsquared/modules/programs/shell.nix index 5f155703..ef1ef769 100644 --- a/configs/home-manager/foo-dogsquared/modules/programs/shell.nix +++ b/configs/home-manager/foo-dogsquared/modules/programs/shell.nix @@ -10,7 +10,7 @@ in lib.mkEnableOption "configuration of foo-dogsquared's shell of choice and its toolbelt"; config = lib.mkIf cfg.enable { - profiles.dev.shell.enable = lib.mkDefault true; + suites.dev.shell.enable = lib.mkDefault true; programs.bash = { enable = true; diff --git a/configs/home-manager/foo-dogsquared/modules/setups/desktop.nix b/configs/home-manager/foo-dogsquared/modules/setups/desktop.nix index 2f49f2eb..18f4f8eb 100644 --- a/configs/home-manager/foo-dogsquared/modules/setups/desktop.nix +++ b/configs/home-manager/foo-dogsquared/modules/setups/desktop.nix @@ -11,7 +11,7 @@ in config = lib.mkIf cfg.enable { # Install all of the desktop stuff. - profiles.desktop = { + suites.desktop = { enable = true; audio.enable = true; audio.pipewire.enable = true; diff --git a/configs/home-manager/foo-dogsquared/modules/setups/development.nix b/configs/home-manager/foo-dogsquared/modules/setups/development.nix index 59a5bf0b..3bcba1cd 100644 --- a/configs/home-manager/foo-dogsquared/modules/setups/development.nix +++ b/configs/home-manager/foo-dogsquared/modules/setups/development.nix @@ -18,7 +18,7 @@ in terminal-multiplexer.enable = lib.mkDefault true; }; - profiles.dev = { + suites.dev = { enable = true; extras.enable = true; coreutils-replacement.enable = true; diff --git a/configs/home-manager/foo-dogsquared/modules/setups/music.nix b/configs/home-manager/foo-dogsquared/modules/setups/music.nix index a1d630f6..9308d759 100644 --- a/configs/home-manager/foo-dogsquared/modules/setups/music.nix +++ b/configs/home-manager/foo-dogsquared/modules/setups/music.nix @@ -26,7 +26,7 @@ in ]; # Enable the desktop audio profile for extra auditorial goodies. - profiles.desktop.audio = { + suites.desktop.audio = { enable = lib.mkDefault true; pipewire.enable = lib.mkDefault true; }; diff --git a/configs/home-manager/plover/default.nix b/configs/home-manager/plover/default.nix index 1a7618a8..cddea93d 100644 --- a/configs/home-manager/plover/default.nix +++ b/configs/home-manager/plover/default.nix @@ -21,7 +21,7 @@ ]; }; - profiles = { + suites = { dev = { enable = true; shell.enable = true; diff --git a/configs/nixos/graphical-installer/default.nix b/configs/nixos/graphical-installer/default.nix index 5d4668a4..a1b49901 100644 --- a/configs/nixos/graphical-installer/default.nix +++ b/configs/nixos/graphical-installer/default.nix @@ -30,7 +30,7 @@ }; # Some niceties. - profiles.desktop.enable = true; + suites.desktop.enable = true; services.xserver.displayManager = { gdm = { diff --git a/configs/nixos/ni/default.nix b/configs/nixos/ni/default.nix index e7aae3bd..6813bb82 100644 --- a/configs/nixos/ni/default.nix +++ b/configs/nixos/ni/default.nix @@ -39,7 +39,7 @@ sops.age.keyFile = "/var/lib/sops-nix/key.txt"; # My custom configuration with my custom modules starts here. - profiles = { + suites = { archiving.enable = true; browsers.chromium.enable = true; filesystem.setups.personal-webstorage.enable = true; diff --git a/configs/nixos/ni/modules/hardware/qol.nix b/configs/nixos/ni/modules/hardware/qol.nix index 152f68cd..834d9a38 100644 --- a/configs/nixos/ni/modules/hardware/qol.nix +++ b/configs/nixos/ni/modules/hardware/qol.nix @@ -11,7 +11,7 @@ in config = lib.mkIf cfg.enable { # Bring in some of them good tools. - profiles.filesystem.tools.enable = true; + suites.filesystem.tools.enable = true; # We're using some better filesystems so we're using it. boot.initrd.supportedFilesystems = [ "btrfs" ]; diff --git a/configs/nixos/ni/modules/networking/setup.nix b/configs/nixos/ni/modules/networking/setup.nix index be5800d6..e1888383 100644 --- a/configs/nixos/ni/modules/networking/setup.nix +++ b/configs/nixos/ni/modules/networking/setup.nix @@ -43,7 +43,7 @@ in ]; # Put on your cloak, kid. - profiles.vpn.personal.enable = true; + suites.vpn.personal.enable = true; # We'll go with a software firewall. We're mostly configuring it as if we're # using a server even though the chances of that is pretty slim. diff --git a/configs/nixos/ni/modules/services/backup/default.nix b/configs/nixos/ni/modules/services/backup/default.nix index 9cca4657..8de37dce 100644 --- a/configs/nixos/ni/modules/services/backup/default.nix +++ b/configs/nixos/ni/modules/services/backup/default.nix @@ -60,7 +60,7 @@ in "ssh-key" = { }; }); - profiles.filesystem.setups = { + suites.filesystem.setups = { archive.enable = true; external-hdd.enable = true; }; diff --git a/configs/nixos/ni/modules/services/download-media/default.nix b/configs/nixos/ni/modules/services/download-media/default.nix index 3e4d85b8..0074256d 100644 --- a/configs/nixos/ni/modules/services/download-media/default.nix +++ b/configs/nixos/ni/modules/services/download-media/default.nix @@ -100,7 +100,7 @@ in "secrets-config" = { }; }); - profiles.filesystem.setups.archive.enable = true; + suites.filesystem.setups.archive.enable = true; services.yt-dlp = { enable = true; diff --git a/configs/nixos/ni/modules/setups/desktop.nix b/configs/nixos/ni/modules/setups/desktop.nix index f04858a8..624aef51 100644 --- a/configs/nixos/ni/modules/setups/desktop.nix +++ b/configs/nixos/ni/modules/setups/desktop.nix @@ -14,7 +14,7 @@ in config = lib.mkIf cfg.enable (lib.mkMerge [ { # Bring all of the desktop goodies. - profiles.desktop = { + suites.desktop = { enable = true; audio.enable = true; fonts.enable = true; @@ -35,7 +35,7 @@ in # Make it in multiple languages. Take note the input method engine is set # up by the workflow module of choice... - profiles.i18n.enable = true; + suites.i18n.enable = true; # ...which is by the way is this one. workflows.workflows.a-happy-gnome.enable = true; @@ -43,7 +43,7 @@ in (lib.mkIf (hasAnyWorkflowEnabled [ "a-happy-gnome" "knome" "mosey-branch" ]) { hosts.ni.networking.setup = "networkmanager"; - profiles.i18n.setup = "ibus"; + suites.i18n.setup = "ibus"; }) ]); } diff --git a/configs/nixos/ni/modules/setups/development.nix b/configs/nixos/ni/modules/setups/development.nix index 1c517980..d479ca99 100644 --- a/configs/nixos/ni/modules/setups/development.nix +++ b/configs/nixos/ni/modules/setups/development.nix @@ -11,7 +11,7 @@ in config = lib.mkIf cfg.enable (lib.mkMerge [ { # Bring all of the software development goodies. - profiles.dev = { + suites.dev = { enable = true; extras.enable = true; hardware.enable = true; diff --git a/configs/nixos/ni/modules/setups/gaming.nix b/configs/nixos/ni/modules/setups/gaming.nix index a774cbf7..10e0eba5 100644 --- a/configs/nixos/ni/modules/setups/gaming.nix +++ b/configs/nixos/ni/modules/setups/gaming.nix @@ -10,7 +10,7 @@ in config = lib.mkIf cfg.enable { # Bring all of the goodies. - profiles.gaming = { + suites.gaming = { enable = true; emulators.enable = true; retro-computing.enable = true; @@ -28,7 +28,7 @@ in programs.steam.remotePlay.openFirewall = true; # Enable the Wine setup for Linux gaming with Windows games. - profiles.desktop.wine.enable = true; + suites.desktop.wine.enable = true; # Yes... Play your Brawl Stars and Clash Royale in NixOS. :) virtualisation.waydroid.enable = true; diff --git a/configs/nixos/plover/default.nix b/configs/nixos/plover/default.nix index a3777c48..9806fde8 100644 --- a/configs/nixos/plover/default.nix +++ b/configs/nixos/plover/default.nix @@ -53,7 +53,7 @@ # All of the keys required to deploy the secrets. sops.age.keyFile = "/var/lib/sops-nix/key.txt"; - profiles.server = { + suites.server = { enable = true; cleanup.enable = true; }; diff --git a/configs/nixos/winnowing/default.nix b/configs/nixos/winnowing/default.nix index e05eb193..08b76926 100644 --- a/configs/nixos/winnowing/default.nix +++ b/configs/nixos/winnowing/default.nix @@ -30,6 +30,6 @@ programs.git.package = lib.mkForce pkgs.git; # Setting the development environment mainly for container-related work. - profiles.dev.enable = true; - profiles.dev.containers.enable = true; + suites.dev.enable = true; + suites.dev.containers.enable = true; } diff --git a/modules/home-manager/_private/profiles/desktop.nix b/modules/home-manager/_private/profiles/desktop.nix index 5449025e..023dd373 100644 --- a/modules/home-manager/_private/profiles/desktop.nix +++ b/modules/home-manager/_private/profiles/desktop.nix @@ -2,10 +2,10 @@ { config, lib, pkgs, ... }@attrs: let - cfg = config.profiles.desktop; + cfg = config.suites.desktop; in { - options.profiles.desktop = { + options.suites.desktop = { enable = lib.mkEnableOption "installations of desktop apps"; graphics.enable = lib.mkEnableOption "installations of graphics-related apps"; diff --git a/modules/home-manager/_private/profiles/dev.nix b/modules/home-manager/_private/profiles/dev.nix index 646db5e8..52613db5 100644 --- a/modules/home-manager/_private/profiles/dev.nix +++ b/modules/home-manager/_private/profiles/dev.nix @@ -2,9 +2,9 @@ # If you're looking for text editors, go to `./editors.nix`. { config, lib, pkgs, ... }@attrs: -let cfg = config.profiles.dev; +let cfg = config.suites.dev; in { - options.profiles.dev = { + options.suites.dev = { enable = lib.mkEnableOption "basic set of programs for development setup"; shell.enable = diff --git a/modules/home-manager/_private/profiles/editors.nix b/modules/home-manager/_private/profiles/editors.nix index 8555de93..3ef66f8e 100644 --- a/modules/home-manager/_private/profiles/editors.nix +++ b/modules/home-manager/_private/profiles/editors.nix @@ -7,9 +7,9 @@ # for me is not worth to maintain. { config, lib, pkgs, ... }: -let cfg = config.profiles.editors; +let cfg = config.suites.editors; in { - options.profiles.editors = { + options.suites.editors = { neovim.enable = lib.mkEnableOption "basic Neovim setup"; vscode.enable = lib.mkEnableOption "basic Visual Studio Code setup"; }; diff --git a/modules/home-manager/_private/profiles/i18n.nix b/modules/home-manager/_private/profiles/i18n.nix index 05d89733..6abe6947 100644 --- a/modules/home-manager/_private/profiles/i18n.nix +++ b/modules/home-manager/_private/profiles/i18n.nix @@ -1,9 +1,9 @@ # Instant setup for using internationalized languages. { config, lib, pkgs, ... }: -let cfg = config.profiles.i18n; +let cfg = config.suites.i18n; in { - options.profiles.i18n.enable = + options.suites.i18n.enable = lib.mkEnableOption "fcitx5 as input method engine"; config = lib.mkIf cfg.enable { diff --git a/modules/nixos/_private/profiles/archiving.nix b/modules/nixos/_private/profiles/archiving.nix index 61ebb5bb..ecba9215 100644 --- a/modules/nixos/_private/profiles/archiving.nix +++ b/modules/nixos/_private/profiles/archiving.nix @@ -1,9 +1,9 @@ # All of your embarrassing moments, marked here forever. { config, lib, pkgs, ... }: -let cfg = config.profiles.archiving; +let cfg = config.suites.archiving; in { - options.profiles.archiving.enable = + options.suites.archiving.enable = lib.mkEnableOption "installation of various archiving tools"; # This is not going to set BorgBackup NixOS services for you. diff --git a/modules/nixos/_private/profiles/browsers.nix b/modules/nixos/_private/profiles/browsers.nix index 52d90fba..667d3205 100644 --- a/modules/nixos/_private/profiles/browsers.nix +++ b/modules/nixos/_private/profiles/browsers.nix @@ -4,10 +4,10 @@ { config, lib, pkgs, ... }: let - cfg = config.profiles.browsers; + cfg = config.suites.browsers; in { - options.profiles.browsers = { + options.suites.browsers = { firefox.enable = lib.mkEnableOption "Firefox and its fixed configuration"; chromium.enable = lib.mkEnableOption "Chromium and its fixed configuration"; }; diff --git a/modules/nixos/_private/profiles/desktop.nix b/modules/nixos/_private/profiles/desktop.nix index 55fa14de..bd4b8763 100644 --- a/modules/nixos/_private/profiles/desktop.nix +++ b/modules/nixos/_private/profiles/desktop.nix @@ -3,9 +3,9 @@ # That can be found in the `themes` module. { config, lib, pkgs, options, ... }: -let cfg = config.profiles.desktop; +let cfg = config.suites.desktop; in { - options.profiles.desktop = { + options.suites.desktop = { enable = lib.mkEnableOption "basic desktop-related services and default programs"; audio.enable = diff --git a/modules/nixos/_private/profiles/dev.nix b/modules/nixos/_private/profiles/dev.nix index f1ff46f4..b206a47c 100644 --- a/modules/nixos/_private/profiles/dev.nix +++ b/modules/nixos/_private/profiles/dev.nix @@ -1,9 +1,9 @@ # The module for anything dev-related. { config, lib, pkgs, ... }: -let cfg = config.profiles.dev; +let cfg = config.suites.dev; in { - options.profiles.dev = { + options.suites.dev = { enable = lib.mkEnableOption "basic configuration for software development"; extras.enable = lib.mkEnableOption "additional shell utilities"; hardware.enable = lib.mkEnableOption "additional hardware-related dev utilities"; diff --git a/modules/nixos/_private/profiles/filesystem.nix b/modules/nixos/_private/profiles/filesystem.nix index 01cc7192..ba2a495f 100644 --- a/modules/nixos/_private/profiles/filesystem.nix +++ b/modules/nixos/_private/profiles/filesystem.nix @@ -1,6 +1,6 @@ # A bunch of predefined filesystem configurations for several devices. This is # nice for setting up shop for certain tasks with the flick of the switch to ON -# (e.g., `config.profiles.filesystem.archive.enable = true`) and not have +# (e.g., `config.suites.filesystem.archive.enable = true`) and not have # conflicting settings all throughout the configuration. # # Much of the filesystem setups are taking advantage of systemd's fstab @@ -9,10 +9,10 @@ { config, lib, pkgs, ... }: let - cfg = config.profiles.filesystem; + cfg = config.suites.filesystem; in { - options.profiles.filesystem = { + options.suites.filesystem = { tools.enable = lib.mkEnableOption "filesystem-related settings"; setups = { archive.enable = lib.mkEnableOption "automounting offline archive"; diff --git a/modules/nixos/_private/profiles/gaming.nix b/modules/nixos/_private/profiles/gaming.nix index 9a0bd365..12ae7f77 100644 --- a/modules/nixos/_private/profiles/gaming.nix +++ b/modules/nixos/_private/profiles/gaming.nix @@ -2,10 +2,10 @@ { lib, config, pkgs, ... }: let - cfg = config.profiles.gaming; + cfg = config.suites.gaming; in { - options.profiles.gaming = { + options.suites.gaming = { enable = lib.mkEnableOption "basic gaming setup"; emulators.enable = lib.mkEnableOption "installation of individual game emulators"; retro-computing.enable = lib.mkEnableOption "installation of retro computer systems"; diff --git a/modules/nixos/_private/profiles/i18n.nix b/modules/nixos/_private/profiles/i18n.nix index db799ff0..8de4a2da 100644 --- a/modules/nixos/_private/profiles/i18n.nix +++ b/modules/nixos/_private/profiles/i18n.nix @@ -4,10 +4,10 @@ { config, lib, pkgs, ... }: let - cfg = config.profiles.i18n; + cfg = config.suites.i18n; in { - options.profiles.i18n = { + options.suites.i18n = { enable = lib.mkEnableOption "main i18n config"; setup = lib.mkOption { type = lib.types.enum [ "fcitx5" "ibus" ]; diff --git a/modules/nixos/_private/profiles/server.nix b/modules/nixos/_private/profiles/server.nix index 6e93ad2f..e88efaf6 100644 --- a/modules/nixos/_private/profiles/server.nix +++ b/modules/nixos/_private/profiles/server.nix @@ -4,10 +4,10 @@ { config, lib, pkgs, ... }: let - cfg = config.profiles.server; + cfg = config.suites.server; in { - options.profiles.server = { + options.suites.server = { enable = lib.mkEnableOption "server-related settings"; cleanup.enable = lib.mkEnableOption "cleanup service for the system"; auto-upgrade.enable = lib.mkEnableOption "unattended system upgrades"; @@ -17,7 +17,7 @@ in ({ assertions = [{ assertion = - !config.profiles.desktop.enable || !config.profiles.server.enable; + !config.suites.desktop.enable || !config.suites.server.enable; message = '' Desktop profile is also enabled. The profiles `desktop` and `server` are mutually exclusive. diff --git a/modules/nixos/_private/profiles/vpn.nix b/modules/nixos/_private/profiles/vpn.nix index 71168270..2d5291cf 100644 --- a/modules/nixos/_private/profiles/vpn.nix +++ b/modules/nixos/_private/profiles/vpn.nix @@ -1,10 +1,10 @@ { config, lib, pkgs, ... }: let - cfg = config.profiles.vpn; + cfg = config.suites.vpn; in { - options.profiles.vpn = { + options.suites.vpn = { personal.enable = lib.mkEnableOption "personal VPN configuration with Wireguard"; };