From 473279d29581b25bad680109c00cb9ea07a64ae1 Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 9 Apr 2024 20:52:26 +0800 Subject: [PATCH] Revert "move devices into modules" This reverts commit cfb1e3e72779bc6c736531f38604997f1e8a3413. --- .sops.yaml | 16 ++++++++-------- {modules/devices => devices}/nas/default.nix | 0 {modules/devices => devices}/nas/secrets.yaml | 0 .../pc/color/TPLCD_161B_Default.icm | 0 .../pc/color/TPLCD_161B_Native.icm | 0 .../pc/color/TPLCD_161B_Native_HDR.icm | 0 .../pc/color/TPLCD_161B_REC709.icm | 0 .../pc/color/TPLCD_161B_sRGB.icm | 0 {modules/devices => devices}/pc/default.nix | 0 .../devices => devices}/pc/secrets/default.yaml | 0 .../devices => devices}/pc/secrets/munge.key | 0 {modules/devices => devices}/pcarm/default.nix | 0 {modules/devices => devices}/pi3b/default.nix | 0 {modules/devices => devices}/pi3b/secrets.yaml | 0 {modules/devices => devices}/surface/default.nix | 0 .../devices => devices}/surface/secrets.yaml | 0 {modules/devices => devices}/vps6/default.nix | 0 {modules/devices => devices}/vps6/secrets.yaml | 0 {modules/devices => devices}/vps7/default.nix | 0 {modules/devices => devices}/vps7/secrets.yaml | 0 {modules/devices => devices}/xmupc1/README.md | 0 {modules/devices => devices}/xmupc1/default.nix | 0 .../xmupc1/secrets/default.yaml | 0 .../devices => devices}/xmupc1/secrets/munge.key | 0 {modules/devices => devices}/xmupc2/README.md | 0 {modules/devices => devices}/xmupc2/default.nix | 0 .../xmupc2/secrets/default.yaml | 0 .../devices => devices}/xmupc2/secrets/munge.key | 0 flake.nix | 6 +++--- modules/system/sops.nix | 2 +- 30 files changed, 12 insertions(+), 12 deletions(-) rename {modules/devices => devices}/nas/default.nix (100%) rename {modules/devices => devices}/nas/secrets.yaml (100%) rename {modules/devices => devices}/pc/color/TPLCD_161B_Default.icm (100%) rename {modules/devices => devices}/pc/color/TPLCD_161B_Native.icm (100%) rename {modules/devices => devices}/pc/color/TPLCD_161B_Native_HDR.icm (100%) rename {modules/devices => devices}/pc/color/TPLCD_161B_REC709.icm (100%) rename {modules/devices => devices}/pc/color/TPLCD_161B_sRGB.icm (100%) rename {modules/devices => devices}/pc/default.nix (100%) rename {modules/devices => devices}/pc/secrets/default.yaml (100%) rename {modules/devices => devices}/pc/secrets/munge.key (100%) rename {modules/devices => devices}/pcarm/default.nix (100%) rename {modules/devices => devices}/pi3b/default.nix (100%) rename {modules/devices => devices}/pi3b/secrets.yaml (100%) rename {modules/devices => devices}/surface/default.nix (100%) rename {modules/devices => devices}/surface/secrets.yaml (100%) rename {modules/devices => devices}/vps6/default.nix (100%) rename {modules/devices => devices}/vps6/secrets.yaml (100%) rename {modules/devices => devices}/vps7/default.nix (100%) rename {modules/devices => devices}/vps7/secrets.yaml (100%) rename {modules/devices => devices}/xmupc1/README.md (100%) rename {modules/devices => devices}/xmupc1/default.nix (100%) rename {modules/devices => devices}/xmupc1/secrets/default.yaml (100%) rename {modules/devices => devices}/xmupc1/secrets/munge.key (100%) rename {modules/devices => devices}/xmupc2/README.md (100%) rename {modules/devices => devices}/xmupc2/default.nix (100%) rename {modules/devices => devices}/xmupc2/secrets/default.yaml (100%) rename {modules/devices => devices}/xmupc2/secrets/munge.key (100%) diff --git a/.sops.yaml b/.sops.yaml index 733423f7..e2e4e754 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -9,42 +9,42 @@ keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age - &xmupc2 age1l4stuz0vr7gs7pqwjrmezam44702jp2vmqaqyxw0l0r42kf9updq4dfhrw - &pi3b age1yjgswvexp0x0de0sw4u6hamruzeluxccmx2enxazl6pwhhsr2s9qlxdemq creation_rules: - - path_regex: modules/devices/pc/.*$ + - path_regex: devices/pc/.*$ key_groups: - age: - *chn - *pc - - path_regex: modules/devices/vps6/.*$ + - path_regex: devices/vps6/.*$ key_groups: - age: - *chn - *vps6 - - path_regex: modules/devices/vps7/.*$ + - path_regex: devices/vps7/.*$ key_groups: - age: - *chn - *vps7 - - path_regex: modules/devices/nas/.*$ + - path_regex: devices/nas/.*$ key_groups: - age: - *chn - *nas - - path_regex: modules/devices/surface/.*$ + - path_regex: devices/surface/.*$ key_groups: - age: - *chn - *surface - - path_regex: modules/devices/xmupc1/.*$ + - path_regex: devices/xmupc1/.*$ key_groups: - age: - *chn - *xmupc1 - - path_regex: modules/devices/xmupc2/.*$ + - path_regex: devices/xmupc2/.*$ key_groups: - age: - *chn - *xmupc2 - - path_regex: modules/devices/pi3b/.*$ + - path_regex: devices/pi3b/.*$ key_groups: - age: - *chn diff --git a/modules/devices/nas/default.nix b/devices/nas/default.nix similarity index 100% rename from modules/devices/nas/default.nix rename to devices/nas/default.nix diff --git a/modules/devices/nas/secrets.yaml b/devices/nas/secrets.yaml similarity index 100% rename from modules/devices/nas/secrets.yaml rename to devices/nas/secrets.yaml diff --git a/modules/devices/pc/color/TPLCD_161B_Default.icm b/devices/pc/color/TPLCD_161B_Default.icm similarity index 100% rename from modules/devices/pc/color/TPLCD_161B_Default.icm rename to devices/pc/color/TPLCD_161B_Default.icm diff --git a/modules/devices/pc/color/TPLCD_161B_Native.icm b/devices/pc/color/TPLCD_161B_Native.icm similarity index 100% rename from modules/devices/pc/color/TPLCD_161B_Native.icm rename to devices/pc/color/TPLCD_161B_Native.icm diff --git a/modules/devices/pc/color/TPLCD_161B_Native_HDR.icm b/devices/pc/color/TPLCD_161B_Native_HDR.icm similarity index 100% rename from modules/devices/pc/color/TPLCD_161B_Native_HDR.icm rename to devices/pc/color/TPLCD_161B_Native_HDR.icm diff --git a/modules/devices/pc/color/TPLCD_161B_REC709.icm b/devices/pc/color/TPLCD_161B_REC709.icm similarity index 100% rename from modules/devices/pc/color/TPLCD_161B_REC709.icm rename to devices/pc/color/TPLCD_161B_REC709.icm diff --git a/modules/devices/pc/color/TPLCD_161B_sRGB.icm b/devices/pc/color/TPLCD_161B_sRGB.icm similarity index 100% rename from modules/devices/pc/color/TPLCD_161B_sRGB.icm rename to devices/pc/color/TPLCD_161B_sRGB.icm diff --git a/modules/devices/pc/default.nix b/devices/pc/default.nix similarity index 100% rename from modules/devices/pc/default.nix rename to devices/pc/default.nix diff --git a/modules/devices/pc/secrets/default.yaml b/devices/pc/secrets/default.yaml similarity index 100% rename from modules/devices/pc/secrets/default.yaml rename to devices/pc/secrets/default.yaml diff --git a/modules/devices/pc/secrets/munge.key b/devices/pc/secrets/munge.key similarity index 100% rename from modules/devices/pc/secrets/munge.key rename to devices/pc/secrets/munge.key diff --git a/modules/devices/pcarm/default.nix b/devices/pcarm/default.nix similarity index 100% rename from modules/devices/pcarm/default.nix rename to devices/pcarm/default.nix diff --git a/modules/devices/pi3b/default.nix b/devices/pi3b/default.nix similarity index 100% rename from modules/devices/pi3b/default.nix rename to devices/pi3b/default.nix diff --git a/modules/devices/pi3b/secrets.yaml b/devices/pi3b/secrets.yaml similarity index 100% rename from modules/devices/pi3b/secrets.yaml rename to devices/pi3b/secrets.yaml diff --git a/modules/devices/surface/default.nix b/devices/surface/default.nix similarity index 100% rename from modules/devices/surface/default.nix rename to devices/surface/default.nix diff --git a/modules/devices/surface/secrets.yaml b/devices/surface/secrets.yaml similarity index 100% rename from modules/devices/surface/secrets.yaml rename to devices/surface/secrets.yaml diff --git a/modules/devices/vps6/default.nix b/devices/vps6/default.nix similarity index 100% rename from modules/devices/vps6/default.nix rename to devices/vps6/default.nix diff --git a/modules/devices/vps6/secrets.yaml b/devices/vps6/secrets.yaml similarity index 100% rename from modules/devices/vps6/secrets.yaml rename to devices/vps6/secrets.yaml diff --git a/modules/devices/vps7/default.nix b/devices/vps7/default.nix similarity index 100% rename from modules/devices/vps7/default.nix rename to devices/vps7/default.nix diff --git a/modules/devices/vps7/secrets.yaml b/devices/vps7/secrets.yaml similarity index 100% rename from modules/devices/vps7/secrets.yaml rename to devices/vps7/secrets.yaml diff --git a/modules/devices/xmupc1/README.md b/devices/xmupc1/README.md similarity index 100% rename from modules/devices/xmupc1/README.md rename to devices/xmupc1/README.md diff --git a/modules/devices/xmupc1/default.nix b/devices/xmupc1/default.nix similarity index 100% rename from modules/devices/xmupc1/default.nix rename to devices/xmupc1/default.nix diff --git a/modules/devices/xmupc1/secrets/default.yaml b/devices/xmupc1/secrets/default.yaml similarity index 100% rename from modules/devices/xmupc1/secrets/default.yaml rename to devices/xmupc1/secrets/default.yaml diff --git a/modules/devices/xmupc1/secrets/munge.key b/devices/xmupc1/secrets/munge.key similarity index 100% rename from modules/devices/xmupc1/secrets/munge.key rename to devices/xmupc1/secrets/munge.key diff --git a/modules/devices/xmupc2/README.md b/devices/xmupc2/README.md similarity index 100% rename from modules/devices/xmupc2/README.md rename to devices/xmupc2/README.md diff --git a/modules/devices/xmupc2/default.nix b/devices/xmupc2/default.nix similarity index 100% rename from modules/devices/xmupc2/default.nix rename to devices/xmupc2/default.nix diff --git a/modules/devices/xmupc2/secrets/default.yaml b/devices/xmupc2/secrets/default.yaml similarity index 100% rename from modules/devices/xmupc2/secrets/default.yaml rename to devices/xmupc2/secrets/default.yaml diff --git a/modules/devices/xmupc2/secrets/munge.key b/devices/xmupc2/secrets/munge.key similarity index 100% rename from modules/devices/xmupc2/secrets/munge.key rename to devices/xmupc2/secrets/munge.key diff --git a/flake.nix b/flake.nix index e3b45263..27a4bb32 100644 --- a/flake.nix +++ b/flake.nix @@ -73,7 +73,7 @@ outputs = inputs: let localLib = import ./local/lib inputs.nixpkgs.lib; - devices = builtins.attrNames (builtins.readDir ./modules/devices); + devices = builtins.attrNames (builtins.readDir ./devices); in { packages.x86_64-linux = @@ -111,7 +111,7 @@ # replace pkgs with final to avoid infinite recursion { localPackages = import ./local/pkgs (moduleInputs // { pkgs = final; }); })]; }) ./modules - ./modules/devices/${system} + ./devices/${system} ]; }; }) @@ -127,7 +127,7 @@ # replace pkgs with final to avoid infinite recursion { localPackages = import ./local/pkgs (moduleInputs // { pkgs = final; }); })]; }) ./modules - ./modules/devices/pi3b + ./devices/pi3b ]; }; } diff --git a/modules/system/sops.nix b/modules/system/sops.nix index 5b9303bc..96563eac 100644 --- a/modules/system/sops.nix +++ b/modules/system/sops.nix @@ -14,7 +14,7 @@ inputs: sops = { defaultSopsFile = - let deviceDir = "${inputs.topInputs.self}/modules/devices/${inputs.config.nixos.system.networking.hostname}"; + let deviceDir = "${inputs.topInputs.self}/devices/${inputs.config.nixos.system.networking.hostname}"; in mkIf ( builtins.pathExists "${deviceDir}/secrets.yaml"