christoph/flake-nixinator
1
Fork 0
Code Activity

Update systemmodules/homemodules paths to allow nixd to differentiate between the two

Browse Source
This commit is contained in:
Christoph Urlacher
2026-01-18 15:47:51 +01:00
parent 25ae0f4b85
commit b7e2bba8f0
63 changed files with 173 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/systemmodules/0_template/default.nix
View File

@ -4,9 +4,9 @@
mylib,
...
}: let
inherit (config.modules) TEMPLATE;
inherit (config.systemmodules) TEMPLATE;
in {
options.modules.TEMPLATE = import ./options.nix {inherit lib mylib;};
options.systemmodules.TEMPLATE = import ./options.nix {inherit lib mylib;};
config =
lib.mkIf TEMPLATE.enable {

8
system/systemmodules/1_deprecated/agenix/default.nix
View File

@ -7,9 +7,9 @@
publicKeys,
...
}: let
inherit (config.modules) agenix;
inherit (config.systemmodules) agenix;
in {
options.modules.agenix = import ./options.nix {inherit lib mylib;};
options.systemmodules.agenix = import ./options.nix {inherit lib mylib;};
config = {
# NOTE: Add below snippet to home/christoph/default.nix to generate the secrets.nix file
@ -23,13 +23,13 @@ in {
# {
# ${lib.optionalString
# # If this user defined any secrets...
# (builtins.hasAttr "${username}" nixosConfig.modules.agenix.secrets)
# (builtins.hasAttr "${username}" nixosconfig.systemmodules.agenix.secrets)
# # ...we will add them to the current secrets.nix,
# # s.t. agenix can be used to encrypt/access them.
# (builtins.concatStringsSep "\n"
# (builtins.map
# (mkSecret publicKeys.${username}.ssh)
# nixosConfig.modules.agenix.secrets.${username}))}
# nixosconfig.systemmodules.agenix.secrets.${username}))}
# }
# '';

4
system/systemmodules/1_deprecated/containers/default.nix
View File

@ -10,9 +10,9 @@
with lib;
with mylib.virtualisation;
with mylib.modules; let
cfg = config.modules.containers;
cfg = config.systemmodules.containers;
in {
options.modules.containers = import ./options.nix {inherit lib mylib;};
options.systemmodules.containers = import ./options.nix {inherit lib mylib;};
# TODO: These need config options exposed through the module,
# e.g. to set paths/volumes/binds differently per system...

4
system/systemmodules/bootloader/default.nix
View File

@ -5,9 +5,9 @@
mylib,
...
}: let
inherit (config.modules) bootloader;
inherit (config.systemmodules) bootloader;
in {
options.modules.bootloader = import ./options.nix {inherit lib mylib;};
options.systemmodules.bootloader = import ./options.nix {inherit lib mylib;};
config = lib.mkIf bootloader.enable (lib.mkMerge [
{

4
system/systemmodules/desktopportal/default.nix
View File

@ -5,9 +5,9 @@
pkgs,
...
}: let
inherit (config.modules) desktopportal;
inherit (config.systemmodules) desktopportal;
in {
options.modules.desktopportal = import ./options.nix {inherit lib mylib;};
options.systemmodules.desktopportal = import ./options.nix {inherit lib mylib;};
config = lib.mkIf desktopportal.enable {
xdg = {

4
system/systemmodules/docker/default.nix
View File

@ -5,9 +5,9 @@
pkgs,
...
}: let
inherit (config.modules) docker;
inherit (config.systemmodules) docker;
in {
options.modules.docker = import ./options.nix {inherit lib mylib;};
options.systemmodules.docker = import ./options.nix {inherit lib mylib;};
config = lib.mkIf docker.enable {
environment.variables = lib.mkMerge [

4
system/systemmodules/fonts/default.nix
View File

@ -5,9 +5,9 @@
pkgs,
...
}: let
inherit (config.modules) fonts;
inherit (config.systemmodules) fonts;
in {
options.modules.fonts = import ./options.nix {inherit lib mylib;};
options.systemmodules.fonts = import ./options.nix {inherit lib mylib;};
config = lib.mkIf fonts.enable {
fonts = {

4
system/systemmodules/impermanence/default.nix
View File

@ -6,9 +6,9 @@
pkgs,
...
}: let
inherit (config.modules) impermanence;
inherit (config.systemmodules) impermanence;
in {
options.modules.impermanence = import ./options.nix {inherit lib mylib;};
options.systemmodules.impermanence = import ./options.nix {inherit lib mylib;};
config = let
# NOTE: Setting user/group/mode only has an effect if the

4
system/systemmodules/mime/default.nix
View File

@ -4,9 +4,9 @@
mylib,
...
}: let
inherit (config.modules) mime;
inherit (config.systemmodules) mime;
in {
options.modules.mime = import ./options.nix {inherit lib mylib;};
options.systemmodules.mime = import ./options.nix {inherit lib mylib;};
config = lib.mkIf mime.enable {
xdg = {

6
system/systemmodules/network/default.nix
View File

@ -8,9 +8,9 @@
with lib;
with mylib.networking;
with mylib.modules; let
cfg = config.modules.network;
cfg = config.systemmodules.network;
in {
options.modules.network = import ./options.nix {inherit lib mylib;};
options.systemmodules.network = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable {
services.resolved = {
@ -59,7 +59,7 @@ in {
inherit (cfg) networks;
};
modules.polkit.allowedActions = mkIf cfg.useNetworkManager [
systemmodules.polkit.allowedActions = mkIf cfg.useNetworkManager [
# List NM permissions by running "nmcli general permissions"
"org.freedesktop.NetworkManager.settings.modify.system"
];

4
system/systemmodules/polkit/default.nix
View File

@ -7,9 +7,9 @@
}:
with lib;
with mylib.modules; let
cfg = config.modules.polkit;
cfg = config.systemmodules.polkit;
in {
options.modules.polkit = import ./options.nix {inherit lib mylib;};
options.systemmodules.polkit = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable {
security.polkit.enable = true;

4
system/systemmodules/sops-nix/default.nix
View File

@ -6,9 +6,9 @@
username,
...
}: let
inherit (config.modules) sops-nix;
inherit (config.systemmodules) sops-nix;
in {
options.modules.sops-nix = import ./options.nix {inherit lib mylib;};
options.systemmodules.sops-nix = import ./options.nix {inherit lib mylib;};
config = {
environment.systemPackages = with pkgs; [