From 5c860a838859e7c96268a14b28ed90765920c258 Mon Sep 17 00:00:00 2001 From: specCon18 Date: Tue, 18 Apr 2023 01:29:01 -0400 Subject: [PATCH] rearranged modules/ --- flake.nix | 12 ++++++------ machines/framework.nix | 2 +- modules/home-manager/helix.nix | 0 .../gui => system/desktop-environments}/gnome.nix | 0 .../gui => system/desktop-environments}/wayfire.nix | 0 modules/{ => system}/disko/luks-lvm.nix | 0 modules/{ => system}/services/docker.nix | 0 modules/{ => system}/services/openssh.nix | 0 modules/{ => system}/services/pipewire.nix | 0 9 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 modules/home-manager/helix.nix rename modules/{desktop/gui => system/desktop-environments}/gnome.nix (100%) rename modules/{desktop/gui => system/desktop-environments}/wayfire.nix (100%) rename modules/{ => system}/disko/luks-lvm.nix (100%) rename modules/{ => system}/services/docker.nix (100%) rename modules/{ => system}/services/openssh.nix (100%) rename modules/{ => system}/services/pipewire.nix (100%) diff --git a/flake.nix b/flake.nix index d6be26a..c79c10e 100644 --- a/flake.nix +++ b/flake.nix @@ -69,9 +69,9 @@ "speccon18" #default user [ ./hosts/creatorforge.nix - ./modules/services/docker.nix - ./modules/services/openssh.nix - ./modules/desktop/gui/gnome.nix + ./modules/system/services/docker.nix + ./modules/system/services/openssh.nix + ./modules/system/desktop-environments/gnome.nix ] #extra modules to load []; #extra modules to be loaded by home-manager creatorforge-framework = mkComputer @@ -81,9 +81,9 @@ nixos-hardware.nixosModules.framework-12th-gen-intel disko.nixosModules.disko ./hosts/creatorforge.nix - ./modules/services/docker.nix - ./modules/services/openssh.nix - ./modules/desktop/gui/gnome.nix + ./modules/system/services/docker.nix + ./modules/system/services/openssh.nix + ./modules/system/desktop-environments/gnome.nix ] #extra modules to load []; #extra modules to be loaded by home-manager diff --git a/machines/framework.nix b/machines/framework.nix index c82590a..d466ed3 100644 --- a/machines/framework.nix +++ b/machines/framework.nix @@ -30,7 +30,7 @@ }; }; - disko.devices = import ../modules/disko/luks-lvm.nix { + disko.devices = import ../modules/system/disko/luks-lvm.nix { disks = [ "/dev/nvme0n1" ]; }; diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix new file mode 100644 index 0000000..e69de29 diff --git a/modules/desktop/gui/gnome.nix b/modules/system/desktop-environments/gnome.nix similarity index 100% rename from modules/desktop/gui/gnome.nix rename to modules/system/desktop-environments/gnome.nix diff --git a/modules/desktop/gui/wayfire.nix b/modules/system/desktop-environments/wayfire.nix similarity index 100% rename from modules/desktop/gui/wayfire.nix rename to modules/system/desktop-environments/wayfire.nix diff --git a/modules/disko/luks-lvm.nix b/modules/system/disko/luks-lvm.nix similarity index 100% rename from modules/disko/luks-lvm.nix rename to modules/system/disko/luks-lvm.nix diff --git a/modules/services/docker.nix b/modules/system/services/docker.nix similarity index 100% rename from modules/services/docker.nix rename to modules/system/services/docker.nix diff --git a/modules/services/openssh.nix b/modules/system/services/openssh.nix similarity index 100% rename from modules/services/openssh.nix rename to modules/system/services/openssh.nix diff --git a/modules/services/pipewire.nix b/modules/system/services/pipewire.nix similarity index 100% rename from modules/services/pipewire.nix rename to modules/system/services/pipewire.nix