nrabulinski/settei
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

treewide: rename common modules to settei

Browse source
This commit is contained in:
Nikodem Rabuliński 2025-01-04 19:21:28 +01:00
parent c182071080
commit 2bafb42028
11 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/hijiri/default.nix
View file

@ -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 = {

2
hosts/kogata/default.nix
View file

@ -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; [

2
hosts/legion/default.nix
View file

@ -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;
};
}

2
hosts/legion/desktop.nix
View file

@ -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

2
hosts/ude/default.nix
View file

@ -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 = {

2
modules/home/default.nix
View file

@ -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

4
modules/home/desktop/default.nix
View file

@ -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

6
modules/system/settei/github-runner.nix
View file

@ -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 =

4
modules/system/settei/hercules.nix
View file

@ -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;

6
modules/system/settei/incus.nix
View file

@ -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.";
};
};

1
modules/system/settei/sane-defaults.nix
View file

@ -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' =