From 2bafb420287615e033a12f8573d0320462511182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Sat, 4 Jan 2025 19:21:28 +0100 Subject: [PATCH] treewide: rename common modules to settei --- hosts/hijiri/default.nix | 4 ++-- hosts/kogata/default.nix | 2 +- hosts/legion/default.nix | 2 +- hosts/legion/desktop.nix | 2 +- hosts/ude/default.nix | 2 +- modules/home/default.nix | 2 +- modules/home/desktop/default.nix | 4 ++-- modules/system/settei/github-runner.nix | 6 +++--- modules/system/settei/hercules.nix | 4 ++-- modules/system/settei/incus.nix | 6 +++--- modules/system/settei/sane-defaults.nix | 1 - 11 files changed, 17 insertions(+), 18 deletions(-) diff --git a/hosts/hijiri/default.nix b/hosts/hijiri/default.nix index 3b75f42..bb7db92 100644 --- a/hosts/hijiri/default.nix +++ b/hosts/hijiri/default.nix @@ -15,7 +15,7 @@ nixpkgs.system = "aarch64-darwin"; settei.user.config = { - common.desktop.enable = true; + settei.desktop.enable = true; home.packages = with pkgs; [ utm qemu @@ -28,7 +28,7 @@ }; # TODO: Declarative syncthing config }; - common.incus.enable = true; + settei.incus.enable = true; # TODO: Setup podman remote system.defaults = { diff --git a/hosts/kogata/default.nix b/hosts/kogata/default.nix index ca479dc..6bf9e2f 100644 --- a/hosts/kogata/default.nix +++ b/hosts/kogata/default.nix @@ -4,7 +4,7 @@ { nixpkgs.system = "aarch64-darwin"; - settei.user.config.common.desktop.enable = true; + settei.user.config.settei.desktop.enable = true; settei.unfree.allowedPackages = [ "teams" ]; environment.systemPackages = with pkgs; [ diff --git a/hosts/legion/default.nix b/hosts/legion/default.nix index baa53f4..b6669c4 100644 --- a/hosts/legion/default.nix +++ b/hosts/legion/default.nix @@ -41,7 +41,7 @@ age.secrets.niko-pass.file = ../../secrets/legion-niko-pass.age; users.users.${username}.hashedPasswordFile = config.age.secrets.niko-pass.path; - common.incus.enable = true; + settei.incus.enable = true; virtualisation.podman.enable = true; }; } diff --git a/hosts/legion/desktop.nix b/hosts/legion/desktop.nix index a3704cb..7d80cd9 100644 --- a/hosts/legion/desktop.nix +++ b/hosts/legion/desktop.nix @@ -11,7 +11,7 @@ nixpkgs.config.allowUnfree = true; settei.user.config = { - common.desktop.enable = true; + settei.desktop.enable = true; home.packages = with pkgs; [ brightnessctl dmenu diff --git a/hosts/ude/default.nix b/hosts/ude/default.nix index bbf8506..d395fbd 100644 --- a/hosts/ude/default.nix +++ b/hosts/ude/default.nix @@ -25,7 +25,7 @@ ipv6 = "fd7a:115c:a1e0:ab12:4843:cd96:6276:2a8b"; }; - common.incus.enable = true; + settei.incus.enable = true; virtualisation.podman.enable = true; services.nginx = { diff --git a/modules/home/default.nix b/modules/home/default.nix index 550d089..2fb39a6 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -10,7 +10,7 @@ let # TODO: Conditionally define based on whether we're in a system configuration or not fishOverlayModule = lib.mkIf (!args ? osConfig) { - # See modules/system/common/default.nix for reasoning. + # See modules/system/settei/default.nix for reasoning. nixpkgs.overlays = [ (_: _: { inherit (inputs'.settei.packages) fish; }) ]; }; in diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix index eb76412..d02c80b 100644 --- a/modules/home/desktop/default.nix +++ b/modules/home/desktop/default.nix @@ -11,11 +11,11 @@ imports = [ ./zellij.nix ]; - options.common.desktop = { + options.settei.desktop = { enable = lib.mkEnableOption "Common configuration for desktop machines"; }; - config = lib.mkIf config.common.desktop.enable { + config = lib.mkIf config.settei.desktop.enable { home.packages = with pkgs; [ inputs'.settei.packages.wezterm nerd-fonts.iosevka diff --git a/modules/system/settei/github-runner.nix b/modules/system/settei/github-runner.nix index 5af703e..890c5f9 100644 --- a/modules/system/settei/github-runner.nix +++ b/modules/system/settei/github-runner.nix @@ -8,7 +8,7 @@ let inherit (lib) mkOption types; github-runner-user = "github-runner"; - cfg = config.common.github-runner; + cfg = config.settei.github-runner; sharedConfig = { age.secrets.github-token = { @@ -50,13 +50,13 @@ let }; darwinConfig = lib.optionalAttrs (!isLinux) { - warnings = lib.singleton "common.github-runner doesn't do anything on darwin yet"; + warnings = lib.singleton "settei.github-runner doesn't do anything on darwin yet"; }; in { _file = ./github-runner.nix; - options.common.github-runner = { + options.settei.github-runner = { enable = lib.mkEnableOption "using this machine as a self-hosted github runner"; runners = mkOption { type = diff --git a/modules/system/settei/hercules.nix b/modules/system/settei/hercules.nix index ff18f00..a5fba52 100644 --- a/modules/system/settei/hercules.nix +++ b/modules/system/settei/hercules.nix @@ -6,7 +6,7 @@ }: let options = { - common.hercules.enable = lib.mkEnableOption "Enables hercules-ci-agent with my configuration"; + settei.hercules.enable = lib.mkEnableOption "Enables hercules-ci-agent with my configuration"; }; herculesUser = @@ -20,7 +20,7 @@ in inherit options; - config = lib.mkIf config.common.hercules.enable { + config = lib.mkIf config.settei.hercules.enable { age.secrets.hercules-token = { file = ../../../secrets/hercules-token.age; owner = herculesUser; diff --git a/modules/system/settei/incus.nix b/modules/system/settei/incus.nix index 6a0ee35..4313573 100644 --- a/modules/system/settei/incus.nix +++ b/modules/system/settei/incus.nix @@ -9,7 +9,7 @@ let inherit (lib) mkOption types; - cfg = config.common.incus; + cfg = config.settei.incus; sharedConfig = { environment.systemPackages = [ @@ -71,7 +71,7 @@ in { _file = ./incus.nix; - options.common.incus = { + options.settei.incus = { enable = lib.mkEnableOption "incus, the VM and container manager"; clientOnly = mkOption { type = types.bool; @@ -81,7 +81,7 @@ in clientPackage = lib.mkOption { type = types.package; default = cfg.package.client; - defaultText = lib.literalExpression "config.common.incus.package.client"; + defaultText = lib.literalExpression "config.settei.incus.package.client"; description = "The incus client package to use. This package is added to PATH."; }; }; diff --git a/modules/system/settei/sane-defaults.nix b/modules/system/settei/sane-defaults.nix index 3c44e89..502eab5 100644 --- a/modules/system/settei/sane-defaults.nix +++ b/modules/system/settei/sane-defaults.nix @@ -38,7 +38,6 @@ let # Flakes are unusable without git present so pull it into the environment by default settei.user.config.programs.git.enable = lib.mkDefault true; - # FIXME: Move to common users.users.${username}.openssh.authorizedKeys.keys = let configName' =