From 5a8634feb12859638df4cfa1673e5e1f149c5a1f Mon Sep 17 00:00:00 2001 From: Silas Schöffel Date: Tue, 23 Jun 2026 03:04:26 +0200 Subject: treewide: rename all options to jaki --- modules/nixos/jaki/apparmor.nix | 4 ++-- modules/nixos/jaki/basesystem.nix | 8 ++++---- modules/nixos/jaki/bluetooth.nix | 4 ++-- modules/nixos/jaki/bootloader.nix | 4 ++-- modules/nixos/jaki/disks.nix | 4 ++-- modules/nixos/jaki/docker.nix | 4 ++-- modules/nixos/jaki/environment.nix | 4 ++-- modules/nixos/jaki/firejail.nix | 6 +++--- modules/nixos/jaki/font.nix | 4 ++-- modules/nixos/jaki/fprintd.nix | 4 ++-- modules/nixos/jaki/gnome.nix | 4 ++-- modules/nixos/jaki/graphics.nix | 4 ++-- modules/nixos/jaki/hyprland.nix | 4 ++-- modules/nixos/jaki/impermanence.nix | 4 ++-- modules/nixos/jaki/meta.nix | 2 +- modules/nixos/jaki/networking.nix | 4 ++-- modules/nixos/jaki/nix.nix | 4 ++-- modules/nixos/jaki/pamconfig.nix | 4 ++-- modules/nixos/jaki/plasma.nix | 4 ++-- modules/nixos/jaki/plymouth.nix | 4 ++-- modules/nixos/jaki/printing.nix | 4 ++-- modules/nixos/jaki/roles.nix | 4 ++-- modules/nixos/jaki/sound.nix | 4 ++-- modules/nixos/jaki/steam.nix | 4 ++-- modules/nixos/jaki/sudo.nix | 6 +++--- modules/nixos/jaki/sway.nix | 4 ++-- modules/nixos/jaki/tailscale.nix | 4 ++-- modules/nixos/jaki/theming/default.nix | 4 ++-- modules/nixos/jaki/tor.nix | 4 ++-- modules/nixos/roles.nix | 2 +- 30 files changed, 62 insertions(+), 62 deletions(-) (limited to 'modules/nixos') diff --git a/modules/nixos/jaki/apparmor.nix b/modules/nixos/jaki/apparmor.nix index 69cec21..8076eea 100644 --- a/modules/nixos/jaki/apparmor.nix +++ b/modules/nixos/jaki/apparmor.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.apparmor; + cfg = config.jaki.apparmor; in { - options.sils.apparmor.enable = lib.mkEnableOption "apparmor"; + options.jaki.apparmor.enable = lib.mkEnableOption "apparmor"; config = lib.mkIf cfg.enable { security.apparmor = { enable = true; diff --git a/modules/nixos/jaki/basesystem.nix b/modules/nixos/jaki/basesystem.nix index 0e9f6de..319816e 100644 --- a/modules/nixos/jaki/basesystem.nix +++ b/modules/nixos/jaki/basesystem.nix @@ -5,12 +5,12 @@ modulesPath, ... }: let - cfg = config.sils.basesystem; + cfg = config.jaki.basesystem; in { - options.sils.basesystem.enable = lib.mkEnableOption "basesystem"; + options.jaki.basesystem.enable = lib.mkEnableOption "basesystem"; config = lib.mkIf cfg.enable { - networking.hostName = config.sils.meta.hostname; + networking.hostName = config.jaki.meta.hostname; boot = { initrd = { @@ -29,7 +29,7 @@ in { time.timeZone = "Europe/Berlin"; - nixpkgs.hostPlatform = config.sils.meta.system; + nixpkgs.hostPlatform = config.jaki.meta.system; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware = { cpu.intel.updateMicrocode = true; diff --git a/modules/nixos/jaki/bluetooth.nix b/modules/nixos/jaki/bluetooth.nix index 2d67717..ed7fd15 100644 --- a/modules/nixos/jaki/bluetooth.nix +++ b/modules/nixos/jaki/bluetooth.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.bluetooth; + cfg = config.jaki.bluetooth; in { - options.sils.bluetooth.enable = lib.mkEnableOption "bluetooth"; + options.jaki.bluetooth.enable = lib.mkEnableOption "bluetooth"; config = lib.mkIf cfg.enable { hardware.bluetooth.enable = true; }; diff --git a/modules/nixos/jaki/bootloader.nix b/modules/nixos/jaki/bootloader.nix index fc0e0f3..f90b0f7 100644 --- a/modules/nixos/jaki/bootloader.nix +++ b/modules/nixos/jaki/bootloader.nix @@ -3,9 +3,9 @@ lib, ... }: let - btl = config.sils.bootloader; + btl = config.jaki.bootloader; in { - options.sils.bootloader = lib.mkOption { + options.jaki.bootloader = lib.mkOption { type = lib.types.enum ["lanzaboote" "grub"]; default = "lanzaboote"; description = "Which bootloader to use."; diff --git a/modules/nixos/jaki/disks.nix b/modules/nixos/jaki/disks.nix index bf0e2b0..ac2214f 100644 --- a/modules/nixos/jaki/disks.nix +++ b/modules/nixos/jaki/disks.nix @@ -4,13 +4,13 @@ pkgs, ... }: let - cfg = config.sils.disks; + cfg = config.jaki.disks; defaultMountOptions = [ "noatime" # should have some performance upsides, and I don't use it anyways "lazytime" # make time changes in memory ]; in { - options.sils.disks = { + options.jaki.disks = { enable = lib.mkEnableOption "disk setup with disko"; disk = lib.mkOption { diff --git a/modules/nixos/jaki/docker.nix b/modules/nixos/jaki/docker.nix index 131b857..3b6c70a 100644 --- a/modules/nixos/jaki/docker.nix +++ b/modules/nixos/jaki/docker.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.docker; + cfg = config.jaki.docker; in { - options.sils.docker.enable = lib.mkEnableOption "docker"; + options.jaki.docker.enable = lib.mkEnableOption "docker"; config = lib.mkIf cfg.enable { virtualisation.docker = { enable = true; diff --git a/modules/nixos/jaki/environment.nix b/modules/nixos/jaki/environment.nix index 0ffa422..07649fd 100644 --- a/modules/nixos/jaki/environment.nix +++ b/modules/nixos/jaki/environment.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.environment; + cfg = config.jaki.environment; in { - options.sils.environment.enable = lib.mkEnableOption "custom env vars"; + options.jaki.environment.enable = lib.mkEnableOption "custom env vars"; config = lib.mkIf cfg.enable { environment = { sessionVariables = { diff --git a/modules/nixos/jaki/firejail.nix b/modules/nixos/jaki/firejail.nix index 5886918..9cbdb0b 100644 --- a/modules/nixos/jaki/firejail.nix +++ b/modules/nixos/jaki/firejail.nix @@ -4,11 +4,11 @@ pkgs, ... }: let - cfg = config.sils.firejail; + cfg = config.jaki.firejail; in { - options.sils.firejail.enable = lib.mkEnableOption "firejail"; + options.jaki.firejail.enable = lib.mkEnableOption "firejail"; config = lib.mkIf cfg.enable { - sils.apparmor.enable = true; + jaki.apparmor.enable = true; programs.firejail = { enable = true; wrappedBinaries = { diff --git a/modules/nixos/jaki/font.nix b/modules/nixos/jaki/font.nix index e079c99..6dd9b5c 100644 --- a/modules/nixos/jaki/font.nix +++ b/modules/nixos/jaki/font.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.font; + cfg = config.jaki.font; in { - options.sils.font.enable = lib.mkEnableOption "font config"; + options.jaki.font.enable = lib.mkEnableOption "font config"; config = lib.mkIf cfg.enable { fonts = { packages = with pkgs; [ diff --git a/modules/nixos/jaki/fprintd.nix b/modules/nixos/jaki/fprintd.nix index dd5c1cc..0894a9e 100644 --- a/modules/nixos/jaki/fprintd.nix +++ b/modules/nixos/jaki/fprintd.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.fingerprint; + cfg = config.jaki.fingerprint; in { - options.sils.fingerprint.enable = lib.mkEnableOption "fingerprint auth"; + options.jaki.fingerprint.enable = lib.mkEnableOption "fingerprint auth"; config = lib.mkIf cfg.enable { services.fprintd = { enable = true; diff --git a/modules/nixos/jaki/gnome.nix b/modules/nixos/jaki/gnome.nix index 7b798d9..6255956 100644 --- a/modules/nixos/jaki/gnome.nix +++ b/modules/nixos/jaki/gnome.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.gnome; + cfg = config.jaki.gnome; in { - options.sils.gnome.enable = lib.mkEnableOption "The Gnome DE"; + options.jaki.gnome.enable = lib.mkEnableOption "The Gnome DE"; config = lib.mkIf cfg.enable { services = { xserver.enable = true; diff --git a/modules/nixos/jaki/graphics.nix b/modules/nixos/jaki/graphics.nix index 77f58d8..0b21b33 100644 --- a/modules/nixos/jaki/graphics.nix +++ b/modules/nixos/jaki/graphics.nix @@ -3,9 +3,9 @@ config, ... }: let - cfg = config.sils.graphics; + cfg = config.jaki.graphics; in { - options.sils.graphics.enable = lib.mkEnableOption "graphics"; + options.jaki.graphics.enable = lib.mkEnableOption "graphics"; config = lib.mkIf cfg.enable { hardware.graphics.enable = true; }; diff --git a/modules/nixos/jaki/hyprland.nix b/modules/nixos/jaki/hyprland.nix index 73ba9c2..ad8ab15 100644 --- a/modules/nixos/jaki/hyprland.nix +++ b/modules/nixos/jaki/hyprland.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.hyprland; + cfg = config.jaki.hyprland; in { - options.sils.hyprland.enable = lib.mkEnableOption "hyprland"; + options.jaki.hyprland.enable = lib.mkEnableOption "hyprland"; config = lib.mkIf cfg.enable { programs.hyprland = { enable = true; diff --git a/modules/nixos/jaki/impermanence.nix b/modules/nixos/jaki/impermanence.nix index cf67a91..134e13e 100644 --- a/modules/nixos/jaki/impermanence.nix +++ b/modules/nixos/jaki/impermanence.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.impermanence; + cfg = config.jaki.impermanence; in { - options.sils.impermanence.enable = lib.mkEnableOption "impermanence to persist directories"; + options.jaki.impermanence.enable = lib.mkEnableOption "impermanence to persist directories"; config = lib.mkIf cfg.enable { environment.persistence."/srv".directories = [ { diff --git a/modules/nixos/jaki/meta.nix b/modules/nixos/jaki/meta.nix index 57ef081..4d6097f 100644 --- a/modules/nixos/jaki/meta.nix +++ b/modules/nixos/jaki/meta.nix @@ -1,7 +1,7 @@ {lib, ...}: let nullable = type: lib.types.nullOr type; in { - options.sils.meta = { + options.jaki.meta = { bootPart = lib.mkOption { type = nullable lib.types.str; default = null; diff --git a/modules/nixos/jaki/networking.nix b/modules/nixos/jaki/networking.nix index 9ec34ab..cf780df 100644 --- a/modules/nixos/jaki/networking.nix +++ b/modules/nixos/jaki/networking.nix @@ -4,9 +4,9 @@ lib, ... }: let - cfg = config.sils.networking; + cfg = config.jaki.networking; in { - options.sils.networking.enable = lib.mkEnableOption "networking"; + options.jaki.networking.enable = lib.mkEnableOption "networking"; config = lib.mkIf cfg.enable { services.resolved.enable = true; networking = { diff --git a/modules/nixos/jaki/nix.nix b/modules/nixos/jaki/nix.nix index 9d73fcd..d946453 100644 --- a/modules/nixos/jaki/nix.nix +++ b/modules/nixos/jaki/nix.nix @@ -5,9 +5,9 @@ lib, ... }: let - cfg = config.sils.nix-config; + cfg = config.jaki.nix-config; in { - options.sils.nix-config = { + options.jaki.nix-config = { enable = lib.mkEnableOption "nix config"; remoteBuild = lib.mkEnableOption "remote builds"; }; diff --git a/modules/nixos/jaki/pamconfig.nix b/modules/nixos/jaki/pamconfig.nix index 4e9f3eb..e05df6e 100644 --- a/modules/nixos/jaki/pamconfig.nix +++ b/modules/nixos/jaki/pamconfig.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.pamconfig; + cfg = config.jaki.pamconfig; in { - options.sils.pamconfig.enable = lib.mkEnableOption "custom pamconfig"; + options.jaki.pamconfig.enable = lib.mkEnableOption "custom pamconfig"; config = lib.mkIf cfg.enable { security.pam = { services = { diff --git a/modules/nixos/jaki/plasma.nix b/modules/nixos/jaki/plasma.nix index f196447..0fdcb39 100644 --- a/modules/nixos/jaki/plasma.nix +++ b/modules/nixos/jaki/plasma.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.plasma; + cfg = config.jaki.plasma; in { - options.sils.plasma.enable = lib.mkEnableOption "KDE Plasma"; + options.jaki.plasma.enable = lib.mkEnableOption "KDE Plasma"; config = lib.mkIf cfg.enable { services = { greetd.enable = lib.mkForce false; diff --git a/modules/nixos/jaki/plymouth.nix b/modules/nixos/jaki/plymouth.nix index 8e39220..3227187 100644 --- a/modules/nixos/jaki/plymouth.nix +++ b/modules/nixos/jaki/plymouth.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.plymouth; + cfg = config.jaki.plymouth; in { - options.sils.plymouth.enable = lib.mkEnableOption "Enable Plymouth"; + options.jaki.plymouth.enable = lib.mkEnableOption "Enable Plymouth"; config = lib.mkIf cfg.enable { boot.plymouth.enable = true; }; diff --git a/modules/nixos/jaki/printing.nix b/modules/nixos/jaki/printing.nix index 44b2a10..d011b45 100644 --- a/modules/nixos/jaki/printing.nix +++ b/modules/nixos/jaki/printing.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.printing; + cfg = config.jaki.printing; in { - options.sils.printing.enable = lib.mkEnableOption "printing configuration"; + options.jaki.printing.enable = lib.mkEnableOption "printing configuration"; config = lib.mkIf cfg.enable { services = { printing = { diff --git a/modules/nixos/jaki/roles.nix b/modules/nixos/jaki/roles.nix index 52bfb54..d05a144 100644 --- a/modules/nixos/jaki/roles.nix +++ b/modules/nixos/jaki/roles.nix @@ -3,9 +3,9 @@ lib, ... }: let - roleCmp = string: config.role.sils == string; + roleCmp = string: config.role.jaki == string; in { - config.sils = + config.jaki = if roleCmp "laptop" then { apparmor.enable = lib.mkDefault true; diff --git a/modules/nixos/jaki/sound.nix b/modules/nixos/jaki/sound.nix index 3ad26fb..b154854 100644 --- a/modules/nixos/jaki/sound.nix +++ b/modules/nixos/jaki/sound.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.sound; + cfg = config.jaki.sound; in { - options.sils.sound.enable = lib.mkEnableOption "sound config"; + options.jaki.sound.enable = lib.mkEnableOption "sound config"; config = lib.mkIf cfg.enable { services.pipewire = { enable = true; diff --git a/modules/nixos/jaki/steam.nix b/modules/nixos/jaki/steam.nix index 3c834a6..cd7a4fe 100644 --- a/modules/nixos/jaki/steam.nix +++ b/modules/nixos/jaki/steam.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.steam; + cfg = config.jaki.steam; in { - options.sils.steam.enable = lib.mkEnableOption "Steam"; + options.jaki.steam.enable = lib.mkEnableOption "Steam"; config = lib.mkIf cfg.enable { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ diff --git a/modules/nixos/jaki/sudo.nix b/modules/nixos/jaki/sudo.nix index 2ad117f..4027ca0 100644 --- a/modules/nixos/jaki/sudo.nix +++ b/modules/nixos/jaki/sudo.nix @@ -3,14 +3,14 @@ lib, ... }: let - persistentLecture = !config.sils.sudo.persistentLecture.disable; + persistentLecture = !config.jaki.sudo.persistentLecture.disable; in { - options.sils.sudo.persistentLecture.disable = lib.mkEnableOption "sudo lecture after every boot"; + options.jaki.sudo.persistentLecture.disable = lib.mkEnableOption "sudo lecture after every boot"; config = { security.sudo = { enable = true; }; - environment.persistence.${config.sils.meta.globalDataDir}.files = lib.mkIf persistentLecture [ + environment.persistence.${config.jaki.meta.globalDataDir}.files = lib.mkIf persistentLecture [ { file = "/var/db/sudo/lectured/${builtins.toString config.users.users.jaki.uid}"; parentDirectory = { diff --git a/modules/nixos/jaki/sway.nix b/modules/nixos/jaki/sway.nix index 4aac2f4..d58cfb9 100644 --- a/modules/nixos/jaki/sway.nix +++ b/modules/nixos/jaki/sway.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.sway; + cfg = config.jaki.sway; in { - options.sils.sway.enable = lib.mkEnableOption "sway"; + options.jaki.sway.enable = lib.mkEnableOption "sway"; config = lib.mkIf cfg.enable { programs.sway = { enable = true; diff --git a/modules/nixos/jaki/tailscale.nix b/modules/nixos/jaki/tailscale.nix index e1f49a4..0ebe9ea 100644 --- a/modules/nixos/jaki/tailscale.nix +++ b/modules/nixos/jaki/tailscale.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.tailscale; + cfg = config.jaki.tailscale; in { - options.sils.tailscale = { + options.jaki.tailscale = { enable = lib.mkEnableOption "Tailscale"; openFirewall = true; role = lib.mkOption { diff --git a/modules/nixos/jaki/theming/default.nix b/modules/nixos/jaki/theming/default.nix index 2d5d2fd..5288854 100644 --- a/modules/nixos/jaki/theming/default.nix +++ b/modules/nixos/jaki/theming/default.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.theming; + cfg = config.jaki.theming; in { - options.sils.theming.enable = lib.mkEnableOption "theming"; + options.jaki.theming.enable = lib.mkEnableOption "theming"; config = lib.mkIf cfg.enable { stylix = { enable = true; diff --git a/modules/nixos/jaki/tor.nix b/modules/nixos/jaki/tor.nix index 01fdc1f..06f2c24 100644 --- a/modules/nixos/jaki/tor.nix +++ b/modules/nixos/jaki/tor.nix @@ -4,9 +4,9 @@ lib, ... }: let - cfg = config.sils.tor; + cfg = config.jaki.tor; in { - options.sils.tor.enable = lib.mkEnableOption "tor"; + options.jaki.tor.enable = lib.mkEnableOption "tor"; config = lib.mkIf cfg.enable { services = { tor = { diff --git a/modules/nixos/roles.nix b/modules/nixos/roles.nix index 69b2819..0c7f3bd 100644 --- a/modules/nixos/roles.nix +++ b/modules/nixos/roles.nix @@ -1,5 +1,5 @@ {lib, ...}: { - options.role.sils = lib.mkOption { + options.role.jaki = lib.mkOption { type = lib.types.nullOr (lib.types.enum ["laptop" "laptop-light" "undefined" "vm" "workstation"]); default = null; description = "The role which should be applied to your configuration."; -- cgit v1.3.1