From 3cef192a23eac798bc22f3fb1794db9680bb174a Mon Sep 17 00:00:00 2001 From: ooks-io Date: Fri, 10 Nov 2023 18:22:48 +1300 Subject: [PATCH] restructure: system modules --- system/common/{global => base}/auto-upgrade.nix | 0 system/common/{global => base}/default.nix | 0 system/common/{global => base}/fish.nix | 0 system/common/{global => base}/locale.nix | 0 system/common/{global => base}/nix.nix | 0 system/common/{global => base}/pipewire.nix | 0 system/common/{global => base}/security.nix | 0 system/common/{global => base}/systemdboot.nix | 0 system/common/{opt => features}/bluetooth.nix | 0 system/common/{opt => features}/greetd.nix | 0 system/common/{opt => features}/vm.nix | 0 system/ookst480s/ookst480s.nix | 13 ++++--------- system/ooksx1/ooksx1.nix | 10 +++------- 13 files changed, 7 insertions(+), 16 deletions(-) rename system/common/{global => base}/auto-upgrade.nix (100%) rename system/common/{global => base}/default.nix (100%) rename system/common/{global => base}/fish.nix (100%) rename system/common/{global => base}/locale.nix (100%) rename system/common/{global => base}/nix.nix (100%) rename system/common/{global => base}/pipewire.nix (100%) rename system/common/{global => base}/security.nix (100%) rename system/common/{global => base}/systemdboot.nix (100%) rename system/common/{opt => features}/bluetooth.nix (100%) rename system/common/{opt => features}/greetd.nix (100%) rename system/common/{opt => features}/vm.nix (100%) diff --git a/system/common/global/auto-upgrade.nix b/system/common/base/auto-upgrade.nix similarity index 100% rename from system/common/global/auto-upgrade.nix rename to system/common/base/auto-upgrade.nix diff --git a/system/common/global/default.nix b/system/common/base/default.nix similarity index 100% rename from system/common/global/default.nix rename to system/common/base/default.nix diff --git a/system/common/global/fish.nix b/system/common/base/fish.nix similarity index 100% rename from system/common/global/fish.nix rename to system/common/base/fish.nix diff --git a/system/common/global/locale.nix b/system/common/base/locale.nix similarity index 100% rename from system/common/global/locale.nix rename to system/common/base/locale.nix diff --git a/system/common/global/nix.nix b/system/common/base/nix.nix similarity index 100% rename from system/common/global/nix.nix rename to system/common/base/nix.nix diff --git a/system/common/global/pipewire.nix b/system/common/base/pipewire.nix similarity index 100% rename from system/common/global/pipewire.nix rename to system/common/base/pipewire.nix diff --git a/system/common/global/security.nix b/system/common/base/security.nix similarity index 100% rename from system/common/global/security.nix rename to system/common/base/security.nix diff --git a/system/common/global/systemdboot.nix b/system/common/base/systemdboot.nix similarity index 100% rename from system/common/global/systemdboot.nix rename to system/common/base/systemdboot.nix diff --git a/system/common/opt/bluetooth.nix b/system/common/features/bluetooth.nix similarity index 100% rename from system/common/opt/bluetooth.nix rename to system/common/features/bluetooth.nix diff --git a/system/common/opt/greetd.nix b/system/common/features/greetd.nix similarity index 100% rename from system/common/opt/greetd.nix rename to system/common/features/greetd.nix diff --git a/system/common/opt/vm.nix b/system/common/features/vm.nix similarity index 100% rename from system/common/opt/vm.nix rename to system/common/features/vm.nix diff --git a/system/ookst480s/ookst480s.nix b/system/ookst480s/ookst480s.nix index 0dddf71..a11b260 100644 --- a/system/ookst480s/ookst480s.nix +++ b/system/ookst480s/ookst480s.nix @@ -14,10 +14,10 @@ ./hardware-configuration.nix ../common/user/ooks - ../common/global - ../common/opt/bluetooth.nix - ../common/opt/vm.nix - ../common/opt/greetd.nix + ../common/base + ../common/features/bluetooth.nix + ../common/features/vm.nix + ../common/features/greetd.nix ]; @@ -106,11 +106,6 @@ # ------------------------------------------------------------------------------------------------- system = { - autoUpgrade = { - enable = false; - channel = "https://nixos.org/channels/nix-unstable"; - }; stateVersion = "22.05"; - copySystemConfiguration = false; }; } diff --git a/system/ooksx1/ooksx1.nix b/system/ooksx1/ooksx1.nix index adbd232..5bf84e2 100644 --- a/system/ooksx1/ooksx1.nix +++ b/system/ooksx1/ooksx1.nix @@ -16,8 +16,9 @@ ./hardware-configuration.nix ../common/user/ooks - ../common/global - ../common/opt/bluetooth.nix + ../common/base + ../common/features/bluetooth.nix + ../common/features/greetd.nix ]; @@ -129,11 +130,6 @@ # ------------------------------------------------------------------------------------------------- system = { - autoUpgrade = { - enable = false; - channel = "https://nixos.org/channels/nix-unstable"; - }; stateVersion = "22.05"; - copySystemConfiguration = false; }; }