From 2cf6f52c8bcfdfa72609098bccf96ed3dc3ec10a Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 21 Dec 2023 11:49:00 +0800 Subject: [PATCH] nixos: modules: move modules into ./myFlake --- nixos/modules/default.nix | 5 ++--- nixos/modules/{ => myFlake}/boot/boot.nix | 0 nixos/modules/{ => myFlake}/boot/default.nix | 0 nixos/modules/myFlake/default.nix | 7 +++++++ .../modules/{ => myFlake}/hardware/accessories/default.nix | 0 .../hardware/accessories/logitech-wireless.nix | 0 nixos/modules/{ => myFlake}/hardware/accessories/piper.nix | 0 .../hardware/accessories/xbox-one-controller.nix | 0 nixos/modules/{ => myFlake}/hardware/components/audio.nix | 0 .../{ => myFlake}/hardware/components/bluetooth.nix | 0 .../modules/{ => myFlake}/hardware/components/default.nix | 0 nixos/modules/{ => myFlake}/hardware/components/tpm.nix | 0 nixos/modules/{ => myFlake}/hardware/default.nix | 0 nixos/modules/{ => myFlake}/networking/default.nix | 0 nixos/modules/{ => myFlake}/networking/dns.nix | 0 .../networking/network-configuration-daemon.nix | 0 16 files changed, 9 insertions(+), 3 deletions(-) rename nixos/modules/{ => myFlake}/boot/boot.nix (100%) rename nixos/modules/{ => myFlake}/boot/default.nix (100%) create mode 100644 nixos/modules/myFlake/default.nix rename nixos/modules/{ => myFlake}/hardware/accessories/default.nix (100%) rename nixos/modules/{ => myFlake}/hardware/accessories/logitech-wireless.nix (100%) rename nixos/modules/{ => myFlake}/hardware/accessories/piper.nix (100%) rename nixos/modules/{ => myFlake}/hardware/accessories/xbox-one-controller.nix (100%) rename nixos/modules/{ => myFlake}/hardware/components/audio.nix (100%) rename nixos/modules/{ => myFlake}/hardware/components/bluetooth.nix (100%) rename nixos/modules/{ => myFlake}/hardware/components/default.nix (100%) rename nixos/modules/{ => myFlake}/hardware/components/tpm.nix (100%) rename nixos/modules/{ => myFlake}/hardware/default.nix (100%) rename nixos/modules/{ => myFlake}/networking/default.nix (100%) rename nixos/modules/{ => myFlake}/networking/dns.nix (100%) rename nixos/modules/{ => myFlake}/networking/network-configuration-daemon.nix (100%) diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 01ead29..e7097fa 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,7 +1,6 @@ {...}: { imports = [ - ./boot - ./hardware - ./networking + # utils that is used internally + ./myFlake ]; } diff --git a/nixos/modules/boot/boot.nix b/nixos/modules/myFlake/boot/boot.nix similarity index 100% rename from nixos/modules/boot/boot.nix rename to nixos/modules/myFlake/boot/boot.nix diff --git a/nixos/modules/boot/default.nix b/nixos/modules/myFlake/boot/default.nix similarity index 100% rename from nixos/modules/boot/default.nix rename to nixos/modules/myFlake/boot/default.nix diff --git a/nixos/modules/myFlake/default.nix b/nixos/modules/myFlake/default.nix new file mode 100644 index 0000000..01ead29 --- /dev/null +++ b/nixos/modules/myFlake/default.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [ + ./boot + ./hardware + ./networking + ]; +} diff --git a/nixos/modules/hardware/accessories/default.nix b/nixos/modules/myFlake/hardware/accessories/default.nix similarity index 100% rename from nixos/modules/hardware/accessories/default.nix rename to nixos/modules/myFlake/hardware/accessories/default.nix diff --git a/nixos/modules/hardware/accessories/logitech-wireless.nix b/nixos/modules/myFlake/hardware/accessories/logitech-wireless.nix similarity index 100% rename from nixos/modules/hardware/accessories/logitech-wireless.nix rename to nixos/modules/myFlake/hardware/accessories/logitech-wireless.nix diff --git a/nixos/modules/hardware/accessories/piper.nix b/nixos/modules/myFlake/hardware/accessories/piper.nix similarity index 100% rename from nixos/modules/hardware/accessories/piper.nix rename to nixos/modules/myFlake/hardware/accessories/piper.nix diff --git a/nixos/modules/hardware/accessories/xbox-one-controller.nix b/nixos/modules/myFlake/hardware/accessories/xbox-one-controller.nix similarity index 100% rename from nixos/modules/hardware/accessories/xbox-one-controller.nix rename to nixos/modules/myFlake/hardware/accessories/xbox-one-controller.nix diff --git a/nixos/modules/hardware/components/audio.nix b/nixos/modules/myFlake/hardware/components/audio.nix similarity index 100% rename from nixos/modules/hardware/components/audio.nix rename to nixos/modules/myFlake/hardware/components/audio.nix diff --git a/nixos/modules/hardware/components/bluetooth.nix b/nixos/modules/myFlake/hardware/components/bluetooth.nix similarity index 100% rename from nixos/modules/hardware/components/bluetooth.nix rename to nixos/modules/myFlake/hardware/components/bluetooth.nix diff --git a/nixos/modules/hardware/components/default.nix b/nixos/modules/myFlake/hardware/components/default.nix similarity index 100% rename from nixos/modules/hardware/components/default.nix rename to nixos/modules/myFlake/hardware/components/default.nix diff --git a/nixos/modules/hardware/components/tpm.nix b/nixos/modules/myFlake/hardware/components/tpm.nix similarity index 100% rename from nixos/modules/hardware/components/tpm.nix rename to nixos/modules/myFlake/hardware/components/tpm.nix diff --git a/nixos/modules/hardware/default.nix b/nixos/modules/myFlake/hardware/default.nix similarity index 100% rename from nixos/modules/hardware/default.nix rename to nixos/modules/myFlake/hardware/default.nix diff --git a/nixos/modules/networking/default.nix b/nixos/modules/myFlake/networking/default.nix similarity index 100% rename from nixos/modules/networking/default.nix rename to nixos/modules/myFlake/networking/default.nix diff --git a/nixos/modules/networking/dns.nix b/nixos/modules/myFlake/networking/dns.nix similarity index 100% rename from nixos/modules/networking/dns.nix rename to nixos/modules/myFlake/networking/dns.nix diff --git a/nixos/modules/networking/network-configuration-daemon.nix b/nixos/modules/myFlake/networking/network-configuration-daemon.nix similarity index 100% rename from nixos/modules/networking/network-configuration-daemon.nix rename to nixos/modules/myFlake/networking/network-configuration-daemon.nix